USB: renesas_usbhs: drop unused legacy-phy support

Drop support for legacy phys for rcar2 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.

Note that the legacy-phy API is still being used in gadget mode to bind
the peripheral controller.

Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h
index f619afe..6137f79 100644 (file)
--- 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 85a0e09..0027092 100644 (file)
--- 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;
 }