diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-07 17:11:40 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-07 17:12:11 -0400 |
commit | 3abee859c13ec6a0f49a7234eef011f5d45136f1 (patch) | |
tree | c6843c41cbe7a53c7311e8101ceb50cb558a8378 | |
parent | 2bfd1c96a9fb9b547db9a2ad8428dc8de5526e92 (diff) |
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>
-rw-r--r-- | drivers/usb/serial/sierra.c | 8 |
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) | |||
1039 | return ec ? -EIO : 0; | 1039 | return ec ? -EIO : 0; |
1040 | } | 1040 | } |
1041 | 1041 | ||
1042 | static int sierra_reset_resume(struct usb_interface *intf) | ||
1043 | { | ||
1044 | struct usb_serial *serial = usb_get_intfdata(intf); | ||
1045 | dev_err(&serial->dev->dev, "%s\n", __func__); | ||
1046 | return usb_serial_resume(intf); | ||
1047 | } | ||
1048 | #else | 1042 | #else |
1049 | #define sierra_suspend NULL | 1043 | #define sierra_suspend NULL |
1050 | #define sierra_resume NULL | 1044 | #define sierra_resume NULL |
1051 | #define sierra_reset_resume NULL | ||
1052 | #endif | 1045 | #endif |
1053 | 1046 | ||
1054 | static struct usb_driver sierra_driver = { | 1047 | static struct usb_driver sierra_driver = { |
1055 | .name = "sierra", | 1048 | .name = "sierra", |
1056 | .reset_resume = sierra_reset_resume, | ||
1057 | .id_table = id_table, | 1049 | .id_table = id_table, |
1058 | }; | 1050 | }; |
1059 | 1051 | ||