Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7f3619b authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

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: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5cbe61c5

drivers/usb/serial/ch341.c

+0 −3
Original line number Diff line number Diff line
@@ -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 = {

drivers/usb/serial/f81232.c

+0 −4
Original line number Diff line number Diff line
@@ -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 = {

drivers/usb/serial/option.c

+0 −5
Original line number Diff line number Diff line
@@ -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,

};

drivers/usb/serial/pl2303.c

+0 −3
Original line number Diff line number Diff line
@@ -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

drivers/usb/serial/qcserial.c

+0 −3
Original line number Diff line number Diff line
@@ -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)