Skip to content

Commit

Permalink
USB: serial: sierra: remove reset_resume callback
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed May 7, 2012
1 parent 2bfd1c9 commit 3abee85
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions drivers/usb/serial/sierra.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down

0 comments on commit 3abee85

Please sign in to comment.