From patchwork Mon Feb 23 18:52:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 8444 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n1NIrEbh027763 for ; Mon, 23 Feb 2009 18:53:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754338AbZBWSxT (ORCPT ); Mon, 23 Feb 2009 13:53:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754465AbZBWSxT (ORCPT ); Mon, 23 Feb 2009 13:53:19 -0500 Received: from ns1.siteground211.com ([209.62.36.12]:46615 "EHLO serv01.siteground211.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754338AbZBWSxS (ORCPT ); Mon, 23 Feb 2009 13:53:18 -0500 Received: from [91.154.126.168] (port=23085 helo=localhost.localdomain) by serv01.siteground211.com with esmtpa (Exim 4.69) (envelope-from ) id 1LbfvU-0008HW-4z; Mon, 23 Feb 2009 12:53:12 -0600 From: Felipe Balbi To: linux-omap@vger.kernel.org Cc: Steve Sakoman , Anand Gadiyar , Syed Mohammed Khasim , Felipe Balbi Subject: [rft/rfc/patch-v2.6.29-rc5+ 01/23] usb: host: ehci: make checkpatch.pl happy with ehci-omap Date: Mon, 23 Feb 2009 20:52:29 +0200 Message-Id: <1235415171-17376-2-git-send-email-me@felipebalbi.com> X-Mailer: git-send-email 1.6.1.3 In-Reply-To: <1235415171-17376-1-git-send-email-me@felipebalbi.com> References: <1235415171-17376-1-git-send-email-me@felipebalbi.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - serv01.siteground211.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - felipebalbi.com Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Trivial cleanup patch, no functional changes. Just adding a few spaces here and there. Signed-off-by: Felipe Balbi --- drivers/usb/host/ehci-omap.c | 50 +++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 27 deletions(-) diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 1b3266c..88ed500 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -31,7 +31,6 @@ #include "ehci-omap.h" - #ifdef CONFIG_OMAP_EHCI_PHY_MODE /* EHCI connected to External PHY */ @@ -80,7 +79,6 @@ struct ehci_omap_clock_defs { #define USBHOST_TLL_FCLK "usbtll_fck" /*-------------------------------------------------------------------------*/ - #ifndef CONFIG_OMAP_EHCI_PHY_MODE static void omap_usb_utmi_init(struct usb_hcd *hcd, u8 tll_channel_mask) @@ -89,17 +87,17 @@ static void omap_usb_utmi_init(struct usb_hcd *hcd, u8 tll_channel_mask) /* Use UTMI Ports of TLL */ omap_writel((1 << OMAP_UHH_HOSTCONFIG_ULPI_BYPASS_SHIFT)| - (1<self.controller, "\nEntered UTMI MODE: success\n"); + dev_dbg(hcd->self.controller, "Entered UTMI MODE: success\n"); /* Program the 3 TLL channels upfront */ @@ -107,15 +105,15 @@ static void omap_usb_utmi_init(struct usb_hcd *hcd, u8 tll_channel_mask) /* Disable AutoIdle */ omap_writel(omap_readl(OMAP_TLL_CHANNEL_CONF(i)) & - ~(1<self.controller, "\nULPI_SCRATCH_REG[ch=%d]" + dev_dbg(hcd->self.controller, "ULPI_SCRATCH_REG[ch=%d]" "= 0x%02x\n", i+1, omap_readb(OMAP_TLL_ULPI_SCRATCH_REGISTER(i))); } @@ -209,7 +207,6 @@ static int omap_start_ehc(struct platform_device *dev, struct usb_hcd *hcd) return PTR_ERR(ehci_clocks->usbhost_ick_clk); clk_enable(ehci_clocks->usbhost_ick_clk); - ehci_clocks->usbhost2_120m_fck_clk = clk_get(&dev->dev, USBHOST_120M_FCLK); if (IS_ERR(ehci_clocks->usbhost2_120m_fck_clk)) @@ -281,10 +278,10 @@ static int omap_start_ehc(struct platform_device *dev, struct usb_hcd *hcd) #ifdef CONFIG_OMAP_EHCI_PHY_MODE /* Bypass the TLL module for PHY mode operation */ omap_writel((0 << OMAP_UHH_HOSTCONFIG_ULPI_BYPASS_SHIFT)| - (1<self.controller, "stopping TI EHCI USB Controller\n"); /* Reset OMAP modules for insmod/rmmod to work */ - omap_writel((1<<1), OMAP_UHH_SYSCONFIG); - while (!(omap_readl(OMAP_UHH_SYSSTATUS) & (1<<0))) + omap_writel((1 << 1), OMAP_UHH_SYSCONFIG); + while (!(omap_readl(OMAP_UHH_SYSSTATUS) & (1 << 0))) cpu_relax(); - while (!(omap_readl(OMAP_UHH_SYSSTATUS) & (1<<1))) + while (!(omap_readl(OMAP_UHH_SYSSTATUS) & (1 << 1))) cpu_relax(); - while (!(omap_readl(OMAP_UHH_SYSSTATUS) & (1<<2))) + while (!(omap_readl(OMAP_UHH_SYSSTATUS) & (1 << 2))) cpu_relax(); dev_dbg(hcd->self.controller, "UHH RESET DONE OMAP_UHH_SYSSTATUS %x !!\n", omap_readl(OMAP_UHH_SYSSTATUS)); - omap_writel((1<<1), OMAP_USBTLL_SYSCONFIG); - while (!(omap_readl(OMAP_USBTLL_SYSSTATUS) & (1<<0))) + omap_writel((1 << 1), OMAP_USBTLL_SYSCONFIG); + while (!(omap_readl(OMAP_USBTLL_SYSSTATUS) & (1 << 0))) cpu_relax(); dev_dbg(hcd->self.controller, "TLL RESET DONE\n"); @@ -391,7 +388,6 @@ static void omap_stop_ehc(struct platform_device *dev, struct usb_hcd *hcd) ehci_clocks->usbtll_ick_clk = NULL; } - #ifdef EXTERNAL_PHY_RESET gpio_free(EXT_PHY_RESET_GPIO_PORT1); gpio_free(EXT_PHY_RESET_GPIO_PORT2); @@ -461,7 +457,7 @@ static int ehci_hcd_omap_drv_probe(struct platform_device *dev) ehci->hcs_params = readl(&ehci->caps->hcs_params); /* SET 1 micro-frame Interrupt interval */ - writel(readl(&ehci->regs->command) | (1<<16), &ehci->regs->command); + writel(readl(&ehci->regs->command) | (1 << 16), &ehci->regs->command); retval = usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED | IRQF_SHARED); @@ -562,8 +558,8 @@ static const struct hc_driver ehci_omap_hc_driver = { #endif }; -/*-------------------------------------------------------------------------*/ MODULE_ALIAS("platform:omap-ehci"); + static struct platform_driver ehci_hcd_omap_driver = { .probe = ehci_hcd_omap_drv_probe, .remove = ehci_hcd_omap_drv_remove,