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>

diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 11be3c6c958c71ff37b2085ace1d3e37e91910c3..1040f9d5045193547cd6f8d57b6dde72b454f418 100644 (file)
--- 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,
 };