cleanup after merge of FSL 3.10.17 tree

[karo-tx-linux.git] / drivers / usb / phy / phy-generic.c

diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c
index 47233d47d18c16f8171b0ce489ee46d0bfbee05f..7594e5069ae59d2f621054ff7f6cd7331022f5a2 100644 (file)
--- a/drivers/usb/phy/phy-generic.c
+++ b/drivers/usb/phy/phy-generic.c
@@ -56,16 +56,6 @@ EXPORT_SYMBOL_GPL(usb_phy_generic_unregister);
 
 static int nop_set_suspend(struct usb_phy *x, int suspend)
 {
-       struct nop_usb_xceiv *nop = dev_get_drvdata(x->dev);
-
-       if (IS_ERR(nop->clk))
-               return 0;
-
-       if (suspend)
-               clk_disable_unprepare(nop->clk);
-       else
-               clk_prepare_enable(nop->clk);
-
        return 0;
 }