usb/io_edgeport: replace
Subsystems (3)
PATCH 33/33 usb/io_edgeport: replace
Hi,
Please consider applying.
Description: Use wait_event_timeout() instead of deprecated interruptible_sleep_on_timeout(). Signals are not checked in the current code, so interruptible should not be necessary. Patch is compile-tested.
Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/usb/serial/io_edgeport.c +2 -5
@@ -261,6 +261,7 @@#include <linux/spinlock.h> #include <linux/serial.h> #include <linux/ioctl.h> +#include <linux/wait.h> #include <asm/uaccess.h> #include <linux/usb.h> #include "usb-serial.h"
@@ -991,7 +992,6 @@ static int edge_open (struct usb_serial_struct usb_serial *serial;struct edgeport_serial *edge_serial;int response; -int timeout;dbg ("%s - port %d" , __FUNCTION__, port->number);
@@ -1073,10 +1073,7 @@ static int edge_open (struct usb_serial_ }/* now wait for the port to be completely opened */ - timeout =OPEN_TIMEOUT ; -while (timeout && edge_port->openPending == TRUE) { - timeout =interruptible_sleep_on_timeout (&edge_port->wait_open, timeout); - } +wait_event_timeout (edge_port->wait_open, (edge_port->openPending != TRUE),OPEN_TIMEOUT );if (edge_port->open == FALSE) {/* open timed out */
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors