luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: renesas_usbhs: drop unused legacy-phy support

Browse Source 
Drop support for legacy phys for rcar2 which hasn't been used with a
mainline kernel since commit 9080b8dc76 ("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>
This commit is contained in:
Johan Hovold 2018-04-18 11:26:23 +02:00 committed by Greg Kroah-Hartman
parent 5ee1787e5e
commit d8351953fb
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/usb/renesas_usbhs/common.h
View File

@ -276,7 +276,6 @@ struct usbhs_priv {
*/
struct usbhs_fifo_info fifo_info;
struct usb_phy *usb_phy;
struct phy *phy;
};

29
drivers/usb/renesas_usbhs/rcar2.c
View File

@ -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;
}