From patchwork Mon Feb 23 18:55:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 8455 X-Patchwork-Delegate: me@felipebalbi.com 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 n1NIuBJU028025 for ; Mon, 23 Feb 2009 18:56:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754676AbZBWSzx (ORCPT ); Mon, 23 Feb 2009 13:55:53 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754744AbZBWSzx (ORCPT ); Mon, 23 Feb 2009 13:55:53 -0500 Received: from ns1.siteground211.com ([209.62.36.12]:42417 "EHLO serv01.siteground211.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754676AbZBWSzw (ORCPT ); Mon, 23 Feb 2009 13:55:52 -0500 Received: from [91.154.126.168] (port=23095 helo=localhost.localdomain) by serv01.siteground211.com with esmtpa (Exim 4.69) (envelope-from ) id 1Lbfxz-0001at-L4; Mon, 23 Feb 2009 12:55:48 -0600 From: Felipe Balbi To: linux-omap@vger.kernel.org Cc: Steve Sakoman , Anand Gadiyar , Felipe Balbi Subject: [rft/rfc/patch-v2.6.29-rc5+ 03/23] usb: host: ehci: standardize variables Date: Mon, 23 Feb 2009 20:55:15 +0200 Message-Id: <1235415335-17408-4-git-send-email-me@felipebalbi.com> X-Mailer: git-send-email 1.6.1.3 In-Reply-To: <1235415335-17408-3-git-send-email-me@felipebalbi.com> References: <1235415335-17408-1-git-send-email-me@felipebalbi.com> <1235415335-17408-2-git-send-email-me@felipebalbi.com> <1235415335-17408-3-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 Style only, normally we use pdev as the platform_device's pointer name. Signed-off-by: Felipe Balbi --- drivers/usb/host/ehci-omap.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 3dd4a68..a4f5f16 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -412,39 +412,39 @@ static const struct hc_driver ehci_omap_hc_driver; * through the hotplug entry's driver_data. * */ -static int ehci_hcd_omap_drv_probe(struct platform_device *dev) +static int ehci_hcd_omap_drv_probe(struct platform_device *pdev) { int retval = 0; struct usb_hcd *hcd; struct ehci_hcd *ehci; - dev_dbg(&dev->dev, "ehci_hcd_omap_drv_probe()\n"); + dev_dbg(&pdev->dev, "ehci_hcd_omap_drv_probe()\n"); if (usb_disabled()) return -ENODEV; - if (dev->resource[1].flags != IORESOURCE_IRQ) { - dev_dbg(&dev->dev, "resource[1] is not IORESOURCE_IRQ\n"); + if (pdev->resource[1].flags != IORESOURCE_IRQ) { + dev_dbg(&pdev->dev, "resource[1] is not IORESOURCE_IRQ\n"); retval = -ENOMEM; } - hcd = usb_create_hcd(&ehci_omap_hc_driver, &dev->dev, - dev_name(&dev->dev)); + hcd = usb_create_hcd(&ehci_omap_hc_driver, &pdev->dev, + dev_name(&pdev->dev)); if (!hcd) return -ENOMEM; - retval = omap_start_ehc(dev, hcd); + retval = omap_start_ehc(pdev, hcd); if (retval) return retval; hcd->rsrc_start = 0; hcd->rsrc_len = 0; - hcd->rsrc_start = dev->resource[0].start; - hcd->rsrc_len = dev->resource[0].end - dev->resource[0].start + 1; + hcd->rsrc_start = pdev->resource[0].start; + hcd->rsrc_len = pdev->resource[0].end - pdev->resource[0].start + 1; hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); if (!hcd->regs) { - dev_err(&dev->dev, "ioremap failed\n"); + dev_err(&pdev->dev, "ioremap failed\n"); return -ENOMEM; } @@ -460,13 +460,13 @@ static int ehci_hcd_omap_drv_probe(struct platform_device *dev) /* SET 1 micro-frame Interrupt interval */ writel(readl(&ehci->regs->command) | (1 << 16), &ehci->regs->command); - retval = usb_add_hcd(hcd, dev->resource[1].start, + retval = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_DISABLED | IRQF_SHARED); if (retval == 0) return retval; - dev_dbg(hcd->self.controller, "ERR: add_hcd\n"); - omap_stop_ehc(dev, hcd); + dev_dbg(&pdev->dev, "ERR: add_hcd\n"); + omap_stop_ehc(pdev, hcd); iounmap(hcd->regs); usb_put_hcd(hcd); @@ -480,7 +480,7 @@ static int ehci_hcd_omap_drv_probe(struct platform_device *dev) /** * ehci_hcd_omap_drv_remove - shutdown processing for EHCI HCDs - * @dev: USB Host Controller being removed + * @pdev: USB Host Controller being removed * Context: !in_interrupt() * * Reverses the effect of usb_ehci_hcd_omap_probe(), first invoking @@ -488,16 +488,16 @@ static int ehci_hcd_omap_drv_probe(struct platform_device *dev) * context, normally "rmmod", "apmd", or something similar. * */ -static int ehci_hcd_omap_drv_remove(struct platform_device *dev) +static int ehci_hcd_omap_drv_remove(struct platform_device *pdev) { - struct usb_hcd *hcd = platform_get_drvdata(dev); + struct usb_hcd *hcd = platform_get_drvdata(pdev); - dev_dbg(&dev->dev, "ehci_hcd_omap_drv_remove()\n"); + dev_dbg(&pdev->dev, "ehci_hcd_omap_drv_remove()\n"); iounmap(hcd->regs); usb_remove_hcd(hcd); usb_put_hcd(hcd); - omap_stop_ehc(dev, hcd); + omap_stop_ehc(pdev, hcd); return 0; }