summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-07 14:11:40 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-07 14:12:11 -0700
commit3abee859c13ec6a0f49a7234eef011f5d45136f1 (patch)
treec6843c41cbe7a53c7311e8101ceb50cb558a8378 /drivers/usb/serial
parent2bfd1c96a9fb9b547db9a2ad8428dc8de5526e92 (diff)
downloadlinux-3abee859c13ec6a0f49a7234eef011f5d45136f1.tar.gz
linux-3abee859c13ec6a0f49a7234eef011f5d45136f1.tar.bz2
linux-3abee859c13ec6a0f49a7234eef011f5d45136f1.zip
USB: serial: sierra: remove reset_resume callback
This really just is the resume callback for the device, so use that, especially as the usb-serial core just overrode this callback so it wasn't being made anyway. Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Johan Hovold <jhovold@gmail.com> Cc: Anton Samokhvalov <pg83@yandex.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/sierra.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 11be3c6c958c..1040f9d50451 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -1039,21 +1039,13 @@ static int sierra_resume(struct usb_serial *serial)
return ec ? -EIO : 0;
}
-static int sierra_reset_resume(struct usb_interface *intf)
-{
- struct usb_serial *serial = usb_get_intfdata(intf);
- dev_err(&serial->dev->dev, "%s\n", __func__);
- return usb_serial_resume(intf);
-}
#else
#define sierra_suspend NULL
#define sierra_resume NULL
-#define sierra_reset_resume NULL
#endif
static struct usb_driver sierra_driver = {
.name = "sierra",
- .reset_resume = sierra_reset_resume,
.id_table = id_table,
};