From patchwork Wed Mar 21 06:23:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 147917 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 4B0C9B6ED0 for ; Wed, 21 Mar 2012 17:20:06 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9ED89280E4; Wed, 21 Mar 2012 07:20:04 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6MzdEE3HIUqo; Wed, 21 Mar 2012 07:20:04 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 091FB280D6; Wed, 21 Mar 2012 07:20:03 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DB59E280D6 for ; Wed, 21 Mar 2012 07:20:00 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id opf2xpX4n7ru for ; Wed, 21 Mar 2012 07:20:00 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pz0-f44.google.com (mail-pz0-f44.google.com [209.85.210.44]) by theia.denx.de (Postfix) with ESMTPS id 0746A280D5 for ; Wed, 21 Mar 2012 07:19:58 +0100 (CET) Received: by dakl33 with SMTP id l33so1073936dak.3 for ; Tue, 20 Mar 2012 23:19:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=PhGDILjXGX9SMTZp/NdZ3iZjzSUhxbnGlaFxLiwsb40=; b=bqoXK7xg78YH/OU2ehhheC/ZqBQskYp8P1Kiqt1Hn3TUeVcbvZuq53s0wmoZdMBWKx zhPwvnrtWZtebm00g4tzbqfCoAeCX/+KLtUKw9VAXkbKBUJf1OUHGW3lggMWSt+VW7dm T7mcecyvGccKvZHgRoVKj07+2oWoLdvE53HPOIeR9N2U3daZlN9Gyh/dMjcfS3A77Xf5 Uoa6VeZ74Tci00So81t50yEfiy34W2+rXwJ3gcbUZV9e7KUomtgWhLRdSPl/9jNsy4Aj 9b5TD2nr0FogTwvMXWytKVDYe0NxFgNevBzRvsFLRvgIN7TPPJHW+QpB/3oA2OziZ/IW +2eQ== Received: by 10.68.223.193 with SMTP id qw1mr7975752pbc.61.1332310797339; Tue, 20 Mar 2012 23:19:57 -0700 (PDT) Received: from chimagu (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPS id g4sm647337pbt.58.2012.03.20.23.19.55 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 20 Mar 2012 23:19:56 -0700 (PDT) Received: from iwamatsu by chimagu with local (Exim 4.77) (envelope-from ) id 1SAExG-0005fR-K0; Wed, 21 Mar 2012 15:23:30 +0900 From: Nobuhiro Iwamatsu To: u-boot@lists.denx.de, Marek Vasut Date: Wed, 21 Mar 2012 15:23:29 +0900 Message-Id: <1332311009-21753-1-git-send-email-iwamatsu@nigauri.org> X-Mailer: git-send-email 1.7.9.1 X-Gm-Message-State: ALoCoQlC1ClhfEhz1DkoHt21+QNwxXcH7JjoRVOQXjuwQiUE5hpQu4HXQ/NyKRYpteCVEgeum0jk Subject: [U-Boot] [PATCH 2/2] usb: r8a66597: Switched from variable to only macro X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Some variables are initialized with a value defined by macro. This was changed to use the macro directly. And the variable not to use deleted it. Signed-off-by: Nobuhiro Iwamatsu --- drivers/usb/host/r8a66597-hcd.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index ab1b8d0..f5a7e30 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c @@ -31,9 +31,6 @@ #endif static const char hcd_name[] = "r8a66597_hcd"; -static unsigned short clock = CONFIG_R8A66597_XTAL; -static unsigned short vif = CONFIG_R8A66597_LDRV; -static unsigned short endian = CONFIG_R8A66597_ENDIAN; static struct r8a66597 gr8a66597; static void get_hub_data(struct usb_device *dev, u16 *hub_devnum, u16 *hubport) @@ -96,7 +93,7 @@ static int r8a66597_clock_enable(struct r8a66597 *r8a66597) } } while ((tmp & USBE) != USBE); r8a66597_bclr(r8a66597, USBE, SYSCFG0); - r8a66597_mdfy(r8a66597, clock, XTAL, SYSCFG0); + r8a66597_mdfy(r8a66597, CONFIG_R8A66597_XTAL, XTAL, SYSCFG0); i = 0; r8a66597_bset(r8a66597, XCKE, SYSCFG0); @@ -162,7 +159,7 @@ static int enable_controller(struct r8a66597 *r8a66597) if (ret < 0) return ret; - r8a66597_bset(r8a66597, vif & LDRV, PINCFG); + r8a66597_bset(r8a66597, CONFIG_R8A66597_LDRV & LDRV, PINCFG); r8a66597_bset(r8a66597, USBE, SYSCFG0); r8a66597_bset(r8a66597, INTL, SOFCFG); @@ -170,9 +167,9 @@ static int enable_controller(struct r8a66597 *r8a66597) r8a66597_write(r8a66597, 0, INTENB1); r8a66597_write(r8a66597, 0, INTENB2); - r8a66597_bset(r8a66597, endian & BIGEND, CFIFOSEL); - r8a66597_bset(r8a66597, endian & BIGEND, D0FIFOSEL); - r8a66597_bset(r8a66597, endian & BIGEND, D1FIFOSEL); + r8a66597_bset(r8a66597, CONFIG_R8A66597_ENDIAN & BIGEND, CFIFOSEL); + r8a66597_bset(r8a66597, CONFIG_R8A66597_ENDIAN & BIGEND, D0FIFOSEL); + r8a66597_bset(r8a66597, CONFIG_R8A66597_ENDIAN & BIGEND, D1FIFOSEL); r8a66597_bset(r8a66597, TRNENSEL, SOFCFG); for (port = 0; port < R8A66597_MAX_ROOT_HUB; port++) @@ -673,7 +670,6 @@ static int r8a66597_submit_rh_msg(struct usb_device *dev, unsigned long pipe, int stat = 0; __u16 bmRType_bReq; __u16 wValue; - __u16 wIndex; __u16 wLength; unsigned char data[32]; @@ -686,7 +682,6 @@ static int r8a66597_submit_rh_msg(struct usb_device *dev, unsigned long pipe, bmRType_bReq = cmd->requesttype | (cmd->request << 8); wValue = cpu_to_le16 (cmd->value); - wIndex = cpu_to_le16 (cmd->index); wLength = cpu_to_le16 (cmd->length); switch (bmRType_bReq) {