From 0b9bc59d0b16b7bc6d09c1a6ca1dbc8b1342caa4 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 7 May 2012 14:11:40 -0700
Subject: [PATCH] --- yaml --- r: 303855 b: refs/heads/master c:
 3abee859c13ec6a0f49a7234eef011f5d45136f1 h: refs/heads/master i:   303853:
 93f6b4f89648ec6c3e2ddccf1bfc3aa707b408ba   303851:
 692c500c31c9d978d669dfb95fc3b89d1481f25f   303847:
 dbbbeabca3517ad7e41c8d71818d849ca7cdf84d   303839:
 d93e8b68fa5abd199b29557af7905dadedb2bbb8 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 23539babb2d3..ec542c4d42ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bfd1c96a9fb9b547db9a2ad8428dc8de5526e92
+refs/heads/master: 3abee859c13ec6a0f49a7234eef011f5d45136f1
diff --git a/trunk/drivers/usb/serial/sierra.c b/trunk/drivers/usb/serial/sierra.c
index 11be3c6c958c..1040f9d50451 100644
--- a/trunk/drivers/usb/serial/sierra.c
+++ b/trunk/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,
 };