From 10bc86976bf7eaf2e453fb82cdd9e085a78d51ac Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 16 May 2012 08:39:56 -0700 Subject: [PATCH] --- yaml --- r: 303969 b: refs/heads/master c: 0b623f871d7c993fac8ad7aaaa8f5f3cdb8ed480 h: refs/heads/master i: 303967: db07ea6992f84341f0a3d4a6ab3e0e8fc18e7693 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/sierra.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index ecebf24b8a4e..9cdb30a31640 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcd82cd1c249fb85bad3da5d2a07a116cd65a22b +refs/heads/master: 0b623f871d7c993fac8ad7aaaa8f5f3cdb8ed480 diff --git a/trunk/drivers/usb/serial/sierra.c b/trunk/drivers/usb/serial/sierra.c index 90b985df681b..ba54a0a8235c 100644 --- a/trunk/drivers/usb/serial/sierra.c +++ b/trunk/drivers/usb/serial/sierra.c @@ -1039,16 +1039,9 @@ static int sierra_resume(struct usb_serial *serial) return ec ? -EIO : 0; } -static int sierra_reset_resume(struct usb_serial *serial) -{ - dev_err(&serial->dev->dev, "%s\n", __func__); - return usb_serial_resume(serial->interface); -} - #else #define sierra_suspend NULL #define sierra_resume NULL -#define sierra_reset_resume NULL #endif static struct usb_serial_driver sierra_device = { @@ -1072,7 +1065,6 @@ static struct usb_serial_driver sierra_device = { .release = sierra_release, .suspend = sierra_suspend, .resume = sierra_resume, - .reset_resume = sierra_reset_resume, .read_int_callback = sierra_instat_callback, };