| Message ID | 1398677132-30600-2-git-send-email-gautam.vivek@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Monday, April 28, 2014 6:25 PM, Vivek Gautam wrote: > > Change to use struct device instead of struct platform_device > for some static functions. > > Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com> > Cc: Jingoo Han <jg1.han@samsung.com> Acked-by: Jingoo Han <jg1.han@samsung.com> Best regards, Jingoo Han > Cc: Alan Stern <stern@rowland.harvard.edu> > --- > drivers/usb/host/ohci-exynos.c | 20 +++++++++----------- > 1 file changed, 9 insertions(+), 11 deletions(-) > > diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c > index 9cf80cb..05f00e3 100644 > --- a/drivers/usb/host/ohci-exynos.c > +++ b/drivers/usb/host/ohci-exynos.c > @@ -39,18 +39,18 @@ struct exynos_ohci_hcd { > struct usb_otg *otg; > }; > > -static void exynos_ohci_phy_enable(struct platform_device *pdev) > +static void exynos_ohci_phy_enable(struct device *dev) > { > - struct usb_hcd *hcd = platform_get_drvdata(pdev); > + struct usb_hcd *hcd = dev_get_drvdata(dev); > struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd); > > if (exynos_ohci->phy) > usb_phy_init(exynos_ohci->phy); > } > > -static void exynos_ohci_phy_disable(struct platform_device *pdev) > +static void exynos_ohci_phy_disable(struct device *dev) > { > - struct usb_hcd *hcd = platform_get_drvdata(pdev); > + struct usb_hcd *hcd = dev_get_drvdata(dev); > struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd); > > if (exynos_ohci->phy) > @@ -139,7 +139,7 @@ skip_phy: > > platform_set_drvdata(pdev, hcd); > > - exynos_ohci_phy_enable(pdev); > + exynos_ohci_phy_enable(&pdev->dev); > > err = usb_add_hcd(hcd, irq, IRQF_SHARED); > if (err) { > @@ -150,7 +150,7 @@ skip_phy: > return 0; > > fail_add_hcd: > - exynos_ohci_phy_disable(pdev); > + exynos_ohci_phy_disable(&pdev->dev); > fail_io: > clk_disable_unprepare(exynos_ohci->clk); > fail_clk: > @@ -168,7 +168,7 @@ static int exynos_ohci_remove(struct platform_device *pdev) > if (exynos_ohci->otg) > exynos_ohci->otg->set_host(exynos_ohci->otg, &hcd->self); > > - exynos_ohci_phy_disable(pdev); > + exynos_ohci_phy_disable(&pdev->dev); > > clk_disable_unprepare(exynos_ohci->clk); > > @@ -190,7 +190,6 @@ static int exynos_ohci_suspend(struct device *dev) > { > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd); > - struct platform_device *pdev = to_platform_device(dev); > bool do_wakeup = device_may_wakeup(dev); > int rc = ohci_suspend(hcd, do_wakeup); > > @@ -200,7 +199,7 @@ static int exynos_ohci_suspend(struct device *dev) > if (exynos_ohci->otg) > exynos_ohci->otg->set_host(exynos_ohci->otg, &hcd->self); > > - exynos_ohci_phy_disable(pdev); > + exynos_ohci_phy_disable(dev); > > clk_disable_unprepare(exynos_ohci->clk); > > @@ -211,14 +210,13 @@ static int exynos_ohci_resume(struct device *dev) > { > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd); > - struct platform_device *pdev = to_platform_device(dev); > > clk_prepare_enable(exynos_ohci->clk); > > if (exynos_ohci->otg) > exynos_ohci->otg->set_host(exynos_ohci->otg, &hcd->self); > > - exynos_ohci_phy_enable(pdev); > + exynos_ohci_phy_enable(dev); > > ohci_resume(hcd, false); > > -- > 1.7.10.4
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c index 9cf80cb..05f00e3 100644 --- a/drivers/usb/host/ohci-exynos.c +++ b/drivers/usb/host/ohci-exynos.c @@ -39,18 +39,18 @@ struct exynos_ohci_hcd { struct usb_otg *otg; }; -static void exynos_ohci_phy_enable(struct platform_device *pdev) +static void exynos_ohci_phy_enable(struct device *dev) { - struct usb_hcd *hcd = platform_get_drvdata(pdev); + struct usb_hcd *hcd = dev_get_drvdata(dev); struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd); if (exynos_ohci->phy) usb_phy_init(exynos_ohci->phy); } -static void exynos_ohci_phy_disable(struct platform_device *pdev) +static void exynos_ohci_phy_disable(struct device *dev) { - struct usb_hcd *hcd = platform_get_drvdata(pdev); + struct usb_hcd *hcd = dev_get_drvdata(dev); struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd); if (exynos_ohci->phy) @@ -139,7 +139,7 @@ skip_phy: platform_set_drvdata(pdev, hcd); - exynos_ohci_phy_enable(pdev); + exynos_ohci_phy_enable(&pdev->dev); err = usb_add_hcd(hcd, irq, IRQF_SHARED); if (err) { @@ -150,7 +150,7 @@ skip_phy: return 0; fail_add_hcd: - exynos_ohci_phy_disable(pdev); + exynos_ohci_phy_disable(&pdev->dev); fail_io: clk_disable_unprepare(exynos_ohci->clk); fail_clk: @@ -168,7 +168,7 @@ static int exynos_ohci_remove(struct platform_device *pdev) if (exynos_ohci->otg) exynos_ohci->otg->set_host(exynos_ohci->otg, &hcd->self); - exynos_ohci_phy_disable(pdev); + exynos_ohci_phy_disable(&pdev->dev); clk_disable_unprepare(exynos_ohci->clk); @@ -190,7 +190,6 @@ static int exynos_ohci_suspend(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd); - struct platform_device *pdev = to_platform_device(dev); bool do_wakeup = device_may_wakeup(dev); int rc = ohci_suspend(hcd, do_wakeup); @@ -200,7 +199,7 @@ static int exynos_ohci_suspend(struct device *dev) if (exynos_ohci->otg) exynos_ohci->otg->set_host(exynos_ohci->otg, &hcd->self); - exynos_ohci_phy_disable(pdev); + exynos_ohci_phy_disable(dev); clk_disable_unprepare(exynos_ohci->clk); @@ -211,14 +210,13 @@ static int exynos_ohci_resume(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd); - struct platform_device *pdev = to_platform_device(dev); clk_prepare_enable(exynos_ohci->clk); if (exynos_ohci->otg) exynos_ohci->otg->set_host(exynos_ohci->otg, &hcd->self); - exynos_ohci_phy_enable(pdev); + exynos_ohci_phy_enable(dev); ohci_resume(hcd, false);
Change to use struct device instead of struct platform_device for some static functions. Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com> Cc: Jingoo Han <jg1.han@samsung.com> Cc: Alan Stern <stern@rowland.harvard.edu> --- drivers/usb/host/ohci-exynos.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)