summary refs log tree commit diff
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-09-26 11:12:39 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-04 09:58:42 +0200
commit6c771d30a1b839402a37435a307496de5a33b212 (patch)
tree4f9f8ae90646085dc693a71895d65a22f3c22333 /drivers/usb/host
parent78655197eb09bb877857cac3db030123ae5d0f52 (diff)
downloadlinux-6c771d30a1b839402a37435a307496de5a33b212.tar.gz
usb: ohci-sa1111: convert shutdown method to native device_driver
Convert the shutdown method to use the device_driver shutdown function
pointer rather than a private bus-type shutdown.  This is the only user
for SA1111 bus types, so having the support code in the bus doesn't
make any sense.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/ohci-sa1111.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c
index 9aa4fe1800b9..82842918cb0c 100644
--- a/drivers/usb/host/ohci-sa1111.c
+++ b/drivers/usb/host/ohci-sa1111.c
@@ -247,8 +247,9 @@ static int ohci_hcd_sa1111_remove(struct sa1111_dev *dev)
 	return 0;
 }
 
-static void ohci_hcd_sa1111_shutdown(struct sa1111_dev *dev)
+static void ohci_hcd_sa1111_shutdown(struct device *_dev)
 {
+	struct sa1111_dev *dev = to_sa1111_device(_dev);
 	struct usb_hcd *hcd = sa1111_get_drvdata(dev);
 
 	if (test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)) {
@@ -261,9 +262,9 @@ static struct sa1111_driver ohci_hcd_sa1111_driver = {
 	.drv = {
 		.name	= "sa1111-ohci",
 		.owner	= THIS_MODULE,
+		.shutdown = ohci_hcd_sa1111_shutdown,
 	},
 	.devid		= SA1111_DEVID_USB,
 	.probe		= ohci_hcd_sa1111_probe,
 	.remove		= ohci_hcd_sa1111_remove,
-	.shutdown	= ohci_hcd_sa1111_shutdown,
 };