]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2
authorKishon Vijay Abraham I <kishon@ti.com>
Mon, 3 Mar 2014 11:38:13 +0000 (17:08 +0530)
committerKishon Vijay Abraham I <kishon@ti.com>
Thu, 6 Mar 2014 09:19:33 +0000 (14:49 +0530)
Now that omap-usb2 is adapted to the new generic PHY framework,
*set_suspend* ops can be removed from omap-usb2 driver.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
drivers/phy/phy-omap-usb2.c

index 7699752fba11bfbfa8acff589d794262d2882cc4..705af5a11fb9809f33fbed3769ebb2bac32eafb9 100644 (file)
@@ -98,28 +98,6 @@ static int omap_usb_set_peripheral(struct usb_otg *otg,
        return 0;
 }
 
-static int omap_usb2_suspend(struct usb_phy *x, int suspend)
-{
-       struct omap_usb *phy = phy_to_omapusb(x);
-       int ret;
-
-       if (suspend && !phy->is_suspended) {
-               omap_control_usb_phy_power(phy->control_dev, 0);
-               pm_runtime_put_sync(phy->dev);
-               phy->is_suspended = 1;
-       } else if (!suspend && phy->is_suspended) {
-               ret = pm_runtime_get_sync(phy->dev);
-               if (ret < 0) {
-                       dev_err(phy->dev, "get_sync failed with err %d\n", ret);
-                       return ret;
-               }
-               omap_control_usb_phy_power(phy->control_dev, 1);
-               phy->is_suspended = 0;
-       }
-
-       return 0;
-}
-
 static int omap_usb_power_off(struct phy *x)
 {
        struct omap_usb *phy = phy_get_drvdata(x);
@@ -173,7 +151,6 @@ static int omap_usb2_probe(struct platform_device *pdev)
 
        phy->phy.dev            = phy->dev;
        phy->phy.label          = "omap-usb2";
-       phy->phy.set_suspend    = omap_usb2_suspend;
        phy->phy.otg            = otg;
        phy->phy.type           = USB_PHY_TYPE_USB2;
 
@@ -190,8 +167,6 @@ static int omap_usb2_probe(struct platform_device *pdev)
        }
 
        phy->control_dev = &control_pdev->dev;
-
-       phy->is_suspended       = 1;
        omap_control_usb_phy_power(phy->control_dev, 0);
 
        otg->set_host           = omap_usb_set_host;