Skip to content

Commit 4920d37

Browse files
kekrbygregkh
authored andcommitted
USB: uas: Implement the new shutdown callback
A standard implementation of shutdown callback has been implemented for USB drivers. Since the UAS driver implements a shutdown callback this patch enables it to use the new standard implementation. Signed-off-by: Kerem Karabay <[email protected]> Signed-off-by: Aditya Garg <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent a5f8164 commit 4920d37

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/usb/storage/uas.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,9 +1233,8 @@ static void uas_disconnect(struct usb_interface *intf)
12331233
* hang on reboot when the device is still in uas mode. Note the reset is
12341234
* necessary as some devices won't revert to usb-storage mode without it.
12351235
*/
1236-
static void uas_shutdown(struct device *dev)
1236+
static void uas_shutdown(struct usb_interface *intf)
12371237
{
1238-
struct usb_interface *intf = to_usb_interface(dev);
12391238
struct usb_device *udev = interface_to_usbdev(intf);
12401239
struct Scsi_Host *shost = usb_get_intfdata(intf);
12411240
struct uas_dev_info *devinfo = (struct uas_dev_info *)shost->hostdata;
@@ -1258,7 +1257,7 @@ static struct usb_driver uas_driver = {
12581257
.suspend = uas_suspend,
12591258
.resume = uas_resume,
12601259
.reset_resume = uas_reset_resume,
1261-
.driver.shutdown = uas_shutdown,
1260+
.shutdown = uas_shutdown,
12621261
.id_table = uas_usb_ids,
12631262
};
12641263

0 commit comments

Comments
 (0)