Drop support for legacy phys which hasn't been used with a mainline
kernel since commit 9080b8dc761a ("ARM: OMAP2+: Remove legacy usb-host.c
platform init code"). Specifically, since that commit usb_get_phy_dev()
have always returned -ENODEV and consequently this code has not been
used.

Signed-off-by: Johan Hovold <jo...@kernel.org>
---
 drivers/usb/renesas_usbhs/common.h |  1 -
 drivers/usb/renesas_usbhs/rcar2.c  | 29 -----------------------------
 2 files changed, 30 deletions(-)

diff --git a/drivers/usb/renesas_usbhs/common.h 
b/drivers/usb/renesas_usbhs/common.h
index f619afeae2b8..6137f7942c05 100644
--- a/drivers/usb/renesas_usbhs/common.h
+++ b/drivers/usb/renesas_usbhs/common.h
@@ -276,7 +276,6 @@ struct usbhs_priv {
         */
        struct usbhs_fifo_info fifo_info;
 
-       struct usb_phy *usb_phy;
        struct phy *phy;
 };
 
diff --git a/drivers/usb/renesas_usbhs/rcar2.c 
b/drivers/usb/renesas_usbhs/rcar2.c
index 85a0e0933917..0027092b1118 100644
--- a/drivers/usb/renesas_usbhs/rcar2.c
+++ b/drivers/usb/renesas_usbhs/rcar2.c
@@ -8,7 +8,6 @@
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
 #include <linux/phy/phy.h>
-#include <linux/usb/phy.h>
 #include "common.h"
 #include "rcar2.h"
 
@@ -26,16 +25,6 @@ static int usbhs_rcar2_hardware_init(struct platform_device 
*pdev)
                return 0;
        }
 
-       if (IS_ENABLED(CONFIG_USB_PHY)) {
-               struct usb_phy *usb_phy = usb_get_phy_dev(&pdev->dev, 0);
-
-               if (IS_ERR(usb_phy))
-                       return PTR_ERR(usb_phy);
-
-               priv->usb_phy = usb_phy;
-               return 0;
-       }
-
        return -ENXIO;
 }
 
@@ -48,11 +37,6 @@ static int usbhs_rcar2_hardware_exit(struct platform_device 
*pdev)
                priv->phy = NULL;
        }
 
-       if (priv->usb_phy) {
-               usb_put_phy(priv->usb_phy);
-               priv->usb_phy = NULL;
-       }
-
        return 0;
 }
 
@@ -75,19 +59,6 @@ static int usbhs_rcar2_power_ctrl(struct platform_device 
*pdev,
                }
        }
 
-       if (priv->usb_phy) {
-               if (enable) {
-                       retval = usb_phy_init(priv->usb_phy);
-
-                       if (!retval)
-                               retval = usb_phy_set_suspend(priv->usb_phy, 0);
-               } else {
-                       usb_phy_set_suspend(priv->usb_phy, 1);
-                       usb_phy_shutdown(priv->usb_phy);
-                       retval = 0;
-               }
-       }
-
        return retval;
 }
 
-- 
2.17.0

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to