UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: serial: drop unused suspending flag 

The suspending flag was added back in 2009 but no users ever followed.
Remove it.

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold 2021-03-30 16:38:17 +02:00
parent ea7ada4de2
commit 53366a9f91
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/serial/usb-serial.c
View File

@ -1114,8 +1114,6 @@ int usb_serial_suspend(struct usb_interface *intf, pm_message_t message)
struct usb_serial *serial = usb_get_intfdata(intf); struct usb_serial *serial = usb_get_intfdata(intf);
int i, r = 0; int i, r = 0;
serial->suspending = 1;
/* /*
* serial->type->suspend() MUST return 0 in system sleep context, * serial->type->suspend() MUST return 0 in system sleep context,
* otherwise, the resume callback has to recover device from * otherwise, the resume callback has to recover device from
@ -1123,10 +1121,8 @@ int usb_serial_suspend(struct usb_interface *intf, pm_message_t message)
*/ */
if (serial->type->suspend) { if (serial->type->suspend) {
r = serial->type->suspend(serial, message); r = serial->type->suspend(serial, message);
if (r < 0) { if (r < 0)
serial->suspending = 0;
goto err_out; goto err_out;
}
} }
for (i = 0; i < serial->num_ports; ++i) for (i = 0; i < serial->num_ports; ++i)
@ -1151,7 +1147,6 @@ int usb_serial_resume(struct usb_interface *intf)
usb_serial_unpoison_port_urbs(serial); usb_serial_unpoison_port_urbs(serial);
serial->suspending = 0;
if (serial->type->resume) if (serial->type->resume)
rv = serial->type->resume(serial); rv = serial->type->resume(serial);
else else
@ -1168,7 +1163,6 @@ static int usb_serial_reset_resume(struct usb_interface *intf)
usb_serial_unpoison_port_urbs(serial); usb_serial_unpoison_port_urbs(serial);
serial->suspending = 0;
if (serial->type->reset_resume) { if (serial->type->reset_resume) {
rv = serial->type->reset_resume(serial); rv = serial->type->reset_resume(serial);
} else { } else {

1
include/linux/usb/serial.h
View File

@ -146,7 +146,6 @@ struct usb_serial {
struct usb_serial_driver *type; struct usb_serial_driver *type;
struct usb_interface *interface; struct usb_interface *interface;
unsigned char disconnected:1; unsigned char disconnected:1;
unsigned char suspending:1;
unsigned char attached:1; unsigned char attached:1;
unsigned char minors_reserved:1; unsigned char minors_reserved:1;
unsigned char num_ports; unsigned char num_ports;