USB: sierra: refactor delayed-urb submission

Refactor and clean up delayed-urb submission at resume.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/serial/sierra.c

@@ -981,43 +981,66 @@ static int sierra_suspend(struct usb_serial *serial, pm_message_t message)
 	return 0;
 }
 
-static int sierra_resume(struct usb_serial *serial)
+/* Caller must hold susp_lock. */
+static int sierra_submit_delayed_urbs(struct usb_serial_port *port)
 {
-	struct usb_serial_port *port;
-	struct sierra_intf_private *intfdata = usb_get_serial_data(serial);
-	struct sierra_port_private *portdata;
+	struct sierra_port_private *portdata = usb_get_serial_port_data(port);
+	struct sierra_intf_private *intfdata;
 	struct urb *urb;
 	int ec = 0;
-	int i, err;
+	int err;
 
-	spin_lock_irq(&intfdata->susp_lock);
-	for (i = 0; i < serial->num_ports; i++) {
-		port = serial->port[i];
-		portdata = usb_get_serial_port_data(port);
+	intfdata = usb_get_serial_data(port->serial);
 
-		if (!portdata || !portdata->opened)
-			continue;
+	for (;;) {
+		urb = usb_get_from_anchor(&portdata->delayed);
+		if (!urb)
+			break;
 
-		while ((urb = usb_get_from_anchor(&portdata->delayed))) {
 		usb_anchor_urb(urb, &portdata->active);
 		intfdata->in_flight++;
 		err = usb_submit_urb(urb, GFP_ATOMIC);
-			if (err < 0) {
-				dev_err(&port->dev,
-					"%s - submit urb failed: %d",
+		if (err) {
+			dev_err(&port->dev, "%s - submit urb failed: %d",
 					__func__, err);
 			ec++;
 			intfdata->in_flight--;
 			usb_unanchor_urb(urb);
 			kfree(urb->transfer_buffer);
 			usb_free_urb(urb);
+
 			spin_lock(&portdata->lock);
 			portdata->outstanding_urbs--;
 			spin_unlock(&portdata->lock);
-				continue;
 		}
 	}
 
+	if (ec)
+		return -EIO;
+
+	return 0;
+}
+
+static int sierra_resume(struct usb_serial *serial)
+{
+	struct usb_serial_port *port;
+	struct sierra_intf_private *intfdata = usb_get_serial_data(serial);
+	struct sierra_port_private *portdata;
+	int ec = 0;
+	int i, err;
+
+	spin_lock_irq(&intfdata->susp_lock);
+	for (i = 0; i < serial->num_ports; i++) {
+		port = serial->port[i];
+		portdata = usb_get_serial_port_data(port);
+
+		if (!portdata || !portdata->opened)
+			continue;
+
+		err = sierra_submit_delayed_urbs(port);
+		if (err)
+			ec++;
+
 		err = sierra_submit_rx_urbs(port, GFP_ATOMIC);
 		if (err)
 			ec++;