From 1da8a738d9b9aea2308222929f57469f9f3550ef Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 10 May 2012 14:35:21 -0700
Subject: [PATCH] --- yaml --- r: 303895 b: refs/heads/master c:
 d530296f63c039a5683db665acc5ecdb3b593eb2 h: refs/heads/master i:   303893:
 98f8e780cff6fd23d162eaa22d37d31c8097ef28   303891:
 ac061a14afe5e48517399165847558357e205d2c   303887:
 c675aee017d59a8fdfa4ec088f04ea107f9b4829 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/usb/serial/opticon.c | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 5b5353419d14..eb720aace754 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08dfa5c5323c81a960d77c3752bd6df235094ac3
+refs/heads/master: d530296f63c039a5683db665acc5ecdb3b593eb2
diff --git a/trunk/drivers/usb/serial/opticon.c b/trunk/drivers/usb/serial/opticon.c
index 91f89044e08d..02cb1b7f6559 100644
--- a/trunk/drivers/usb/serial/opticon.c
+++ b/trunk/drivers/usb/serial/opticon.c
@@ -557,18 +557,16 @@ static void opticon_release(struct usb_serial *serial)
 	kfree(priv);
 }
 
-static int opticon_suspend(struct usb_interface *intf, pm_message_t message)
+static int opticon_suspend(struct usb_serial *serial, pm_message_t message)
 {
-	struct usb_serial *serial = usb_get_intfdata(intf);
 	struct opticon_private *priv = usb_get_serial_data(serial);
 
 	usb_kill_urb(priv->bulk_read_urb);
 	return 0;
 }
 
-static int opticon_resume(struct usb_interface *intf)
+static int opticon_resume(struct usb_serial *serial)
 {
-	struct usb_serial *serial = usb_get_intfdata(intf);
 	struct opticon_private *priv = usb_get_serial_data(serial);
 	struct usb_serial_port *port = serial->port[0];
 	int result;
@@ -583,13 +581,6 @@ static int opticon_resume(struct usb_interface *intf)
 	return result;
 }
 
-static struct usb_driver opticon_driver = {
-	.name =		"opticon",
-	.suspend =	opticon_suspend,
-	.resume =	opticon_resume,
-	.id_table =	id_table,
-};
-
 static struct usb_serial_driver opticon_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
@@ -609,6 +600,8 @@ static struct usb_serial_driver opticon_device = {
 	.ioctl =		opticon_ioctl,
 	.tiocmget =		opticon_tiocmget,
 	.tiocmset =		opticon_tiocmset,
+	.suspend = 		opticon_suspend,
+	.resume =		opticon_resume,
 };
 
 static struct usb_serial_driver * const serial_drivers[] = {