usb-serial: clean up unneeded PM-related fields

This patch (as1551) cleans up the PM-related entries in the usb_driver
structures of the various USB serial driver modules.  Those entries
are now filled in by the usb-serial core during driver registration,
so they don't need to be initialized explicitly in the source code.

The same is true of the one remaining no_dynamic_id entry.

reset_resume remains a small problem, because the serial core doesn't
support it.  The patch ignores these entries.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 70c46b0426ff34c1e22022ab913ffff77d0aadab..ba4f067cf277aa85a9e3c5ada039907429ed36dd 100644 (file)
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -599,11 +599,8 @@ static struct usb_driver ch341_driver = {
        .name           = "ch341",
        .probe          = usb_serial_probe,
        .disconnect     = usb_serial_disconnect,
-       .suspend        = usb_serial_suspend,
-       .resume         = usb_serial_resume,
        .reset_resume   = ch341_reset_resume,
        .id_table       = id_table,
-       .supports_autosuspend = 1,
 };
 
 static struct usb_serial_driver ch341_device = {

diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index 46aee85210e217a4db2fd6dc875d431fd5e227ad..c32486d73a76d539b72e1fc8cb02fdb929e52842 100644 (file)
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -355,10 +355,6 @@ static struct usb_driver f81232_driver = {
        .probe =        usb_serial_probe,
        .disconnect =   usb_serial_disconnect,
        .id_table =     id_table,
-       .suspend =      usb_serial_suspend,
-       .resume =       usb_serial_resume,
-       .no_dynamic_id =        1,
-       .supports_autosuspend = 1,
 };
 
 static struct usb_serial_driver f81232_device = {

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index ae0b4aa9aa597b672f6529d419191526711cdb98..d1674bc3d4fafb9e8c24fca86e5f169955be7a61 100644 (file)
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1224,11 +1224,6 @@ static struct usb_driver option_driver = {
        .name       = "option",
        .probe      = usb_serial_probe,
        .disconnect = usb_serial_disconnect,
-#ifdef CONFIG_PM
-       .suspend    = usb_serial_suspend,
-       .resume     = usb_serial_resume,
-       .supports_autosuspend = 1,
-#endif
        .id_table   = option_ids,
 };
 

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 9eec2c3574d810036ae55b802cdbbc6c7b34347f..34e51a04dde07f3118a21ab3ec0fbc901569d50c 100644 (file)
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -100,9 +100,6 @@ static struct usb_driver pl2303_driver = {
        .probe =        usb_serial_probe,
        .disconnect =   usb_serial_disconnect,
        .id_table =     id_table,
-       .suspend =      usb_serial_suspend,
-       .resume =       usb_serial_resume,
-       .supports_autosuspend = 1,
 };
 
 #define SET_LINE_REQUEST_TYPE          0x21

diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
index 201f2810d50371e86c938a9055cd9d206acb0369..3696924c1eb3a5272d767ed0b973ae6ca1605ac0 100644 (file)
--- a/drivers/usb/serial/qcserial.c
+++ b/drivers/usb/serial/qcserial.c
@@ -117,9 +117,6 @@ static struct usb_driver qcdriver = {
        .probe                  = usb_serial_probe,
        .disconnect             = usb_serial_disconnect,
        .id_table               = id_table,
-       .suspend                = usb_serial_suspend,
-       .resume                 = usb_serial_resume,
-       .supports_autosuspend   = true,
 };
 
 static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)

diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index f298ddaac68414b573285ef3d48d97881b1e7002..7b7771491a64318ad92a0d862d96171a89fb806f 100644 (file)
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -1055,11 +1055,8 @@ static struct usb_driver sierra_driver = {
        .name       = "sierra",
        .probe      = usb_serial_probe,
        .disconnect = usb_serial_disconnect,
-       .suspend    = usb_serial_suspend,
-       .resume     = usb_serial_resume,
        .reset_resume = sierra_reset_resume,
        .id_table   = id_table,
-       .supports_autosuspend = 1,
 };
 
 static struct usb_serial_driver sierra_device = {

diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
index cda513bb01c752ee0ca5ff90f35e5828505d2e06..9820492cf885ced3a35b747db31e013c35275b7f 100644 (file)
--- a/drivers/usb/serial/ssu100.c
+++ b/drivers/usb/serial/ssu100.c
@@ -68,9 +68,6 @@ static struct usb_driver ssu100_driver = {
        .probe                         = usb_serial_probe,
        .disconnect                    = usb_serial_disconnect,
        .id_table                      = id_table,
-       .suspend                       = usb_serial_suspend,
-       .resume                        = usb_serial_resume,
-       .supports_autosuspend          = 1,
 };
 
 struct ssu100_port_private {