Skip to content

Commit

Permalink
usb: ohci-exynos: Use struct device instead of platform_device
Browse files Browse the repository at this point in the history 
Change to use struct device instead of struct platform_device
for some static functions.

Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Vivek Gautam authored and Greg Kroah-Hartman committed May 27, 2014
1 parent efccd24 commit 54969ed
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions drivers/usb/host/ohci-exynos.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -139,7 +139,7 @@ static int exynos_ohci_probe(struct platform_device *pdev)

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) {
Expand All @@ -150,7 +150,7 @@ static int exynos_ohci_probe(struct platform_device *pdev)
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:
Expand All @@ -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);

Expand All @@ -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);

Expand All @@ -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);

Expand All @@ -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);

Expand Down

0 comments on commit 54969ed

Please sign in to comment.