From 3abee859c13ec6a0f49a7234eef011f5d45136f1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 7 May 2012 14:11:40 -0700 Subject: [PATCH] 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 Cc: Rusty Russell Cc: Johan Hovold Cc: Anton Samokhvalov Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/sierra.c | 8 -------- 1 file changed, 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, };