diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2012-05-07 15:24:05 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-07 20:05:51 (GMT) |
commit | c7f3619b90fc4c43ed326ec8b3f0299374763c92 (patch) | |
tree | 1568da7543af6b538cff54cbf61527b80a5369b0 /drivers | |
parent | 5cbe61c5aff0a8ada691eb8b07dbfb55c303f640 (diff) | |
download | linux-fsl-qoriq-c7f3619b90fc4c43ed326ec8b3f0299374763c92.tar.xz |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/serial/ch341.c | 3 | ||||
-rw-r--r-- | drivers/usb/serial/f81232.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/option.c | 5 | ||||
-rw-r--r-- | drivers/usb/serial/pl2303.c | 3 | ||||
-rw-r--r-- | drivers/usb/serial/qcserial.c | 3 | ||||
-rw-r--r-- | drivers/usb/serial/sierra.c | 3 | ||||
-rw-r--r-- | drivers/usb/serial/ssu100.c | 3 |
7 files changed, 0 insertions, 24 deletions
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index 70c46b0..ba4f067 100644 --- 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 46aee85..c32486d 100644 --- 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 ae0b4aa..d1674bc 100644 --- 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 9eec2c3..34e51a0 100644 --- 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 201f281..3696924 100644 --- 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 f298dda..7b77714 100644 --- 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 cda513b..9820492 100644 --- 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 { |