Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaf6b52d authored by Roger Quadros's avatar Roger Quadros Committed by Greg Kroah-Hartman
Browse files

USB: host: Use usb_hcd_platform_shutdown() wherever possible 



Most HCD drivers are doing the same thing in their ".shutdown" callback
so it makes sense to use the generic usb_hcd_platform_shutdown()
handler there.

Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c4b51a43

drivers/usb/host/ehci-grlib.c

+1 −10
Original line number Diff line number Diff line
@@ -167,15 +167,6 @@ static int ehci_hcd_grlib_remove(struct platform_device *op) 
}





static void ehci_hcd_grlib_shutdown(struct platform_device *op)

{

	struct usb_hcd *hcd = platform_get_drvdata(op);



	if (hcd->driver->shutdown)

		hcd->driver->shutdown(hcd);

}





static const struct of_device_id ehci_hcd_grlib_of_match[] = {

	{

		.name = "GAISLER_EHCI",
@@ -191,7 +182,7 @@ MODULE_DEVICE_TABLE(of, ehci_hcd_grlib_of_match); 
static struct platform_driver ehci_grlib_driver = {

	.probe		= ehci_hcd_grlib_probe,

	.remove		= ehci_hcd_grlib_remove,

	.shutdown	= ehci_hcd_grlib_shutdown,

	.shutdown	= usb_hcd_platform_shutdown,

	.driver = {

		.name = "grlib-ehci",

		.owner = THIS_MODULE,

drivers/usb/host/ehci-mxc.c

+1 −9
Original line number Diff line number Diff line
@@ -197,20 +197,12 @@ static int ehci_mxc_drv_remove(struct platform_device *pdev) 
	return 0;

}



static void ehci_mxc_drv_shutdown(struct platform_device *pdev)

{

	struct usb_hcd *hcd = platform_get_drvdata(pdev);



	if (hcd->driver->shutdown)

		hcd->driver->shutdown(hcd);

}



MODULE_ALIAS("platform:mxc-ehci");



static struct platform_driver ehci_mxc_driver = {

	.probe = ehci_mxc_drv_probe,

	.remove = ehci_mxc_drv_remove,

	.shutdown = ehci_mxc_drv_shutdown,

	.shutdown = usb_hcd_platform_shutdown,

	.driver = {

		   .name = "mxc-ehci",

	},

drivers/usb/host/ehci-omap.c

+1 −9
Original line number Diff line number Diff line
@@ -278,14 +278,6 @@ static int ehci_hcd_omap_remove(struct platform_device *pdev) 
	return 0;

}



static void ehci_hcd_omap_shutdown(struct platform_device *pdev)

{

	struct usb_hcd *hcd = dev_get_drvdata(&pdev->dev);



	if (hcd->driver->shutdown)

		hcd->driver->shutdown(hcd);

}



static const struct of_device_id omap_ehci_dt_ids[] = {

	{ .compatible = "ti,ehci-omap" },

	{ }
@@ -296,7 +288,7 @@ MODULE_DEVICE_TABLE(of, omap_ehci_dt_ids); 
static struct platform_driver ehci_hcd_omap_driver = {

	.probe			= ehci_hcd_omap_probe,

	.remove			= ehci_hcd_omap_remove,

	.shutdown		= ehci_hcd_omap_shutdown,

	.shutdown		= usb_hcd_platform_shutdown,

	/*.suspend		= ehci_hcd_omap_suspend, */

	/*.resume		= ehci_hcd_omap_resume, */

	.driver = {

drivers/usb/host/ehci-ppc-of.c

+1 −10
Original line number Diff line number Diff line
@@ -215,15 +215,6 @@ static int ehci_hcd_ppc_of_remove(struct platform_device *op) 
}





static void ehci_hcd_ppc_of_shutdown(struct platform_device *op)

{

	struct usb_hcd *hcd = platform_get_drvdata(op);



	if (hcd->driver->shutdown)

		hcd->driver->shutdown(hcd);

}





static const struct of_device_id ehci_hcd_ppc_of_match[] = {

	{

		.compatible = "usb-ehci",
@@ -236,7 +227,7 @@ MODULE_DEVICE_TABLE(of, ehci_hcd_ppc_of_match); 
static struct platform_driver ehci_hcd_ppc_of_driver = {

	.probe		= ehci_hcd_ppc_of_probe,

	.remove		= ehci_hcd_ppc_of_remove,

	.shutdown	= ehci_hcd_ppc_of_shutdown,

	.shutdown	= usb_hcd_platform_shutdown,

	.driver = {

		.name = "ppc-of-ehci",

		.owner = THIS_MODULE,

drivers/usb/host/ehci-s5p.c

+1 −9
Original line number Diff line number Diff line
@@ -220,14 +220,6 @@ static int s5p_ehci_remove(struct platform_device *pdev) 
	return 0;

}



static void s5p_ehci_shutdown(struct platform_device *pdev)

{

	struct usb_hcd *hcd = platform_get_drvdata(pdev);



	if (hcd->driver->shutdown)

		hcd->driver->shutdown(hcd);

}



#ifdef CONFIG_PM

static int s5p_ehci_suspend(struct device *dev)

{
@@ -297,7 +289,7 @@ MODULE_DEVICE_TABLE(of, exynos_ehci_match); 
static struct platform_driver s5p_ehci_driver = {

	.probe		= s5p_ehci_probe,

	.remove		= s5p_ehci_remove,

	.shutdown	= s5p_ehci_shutdown,

	.shutdown	= usb_hcd_platform_shutdown,

	.driver = {

		.name	= "s5p-ehci",

		.owner	= THIS_MODULE,