USB: queue_task() fixups

diff --git a/drivers/usb/class/bluetty.c b/drivers/usb/class/bluetty.c
index b2c09767630748ba97ad041685caeca09fbdedb3..e4e02db81f75c13362bde4cdba5074f41877f51e 100644 (file)
--- a/drivers/usb/class/bluetty.c
+++ b/drivers/usb/class/bluetty.c
@@ -1006,9 +1006,7 @@ static void bluetooth_write_bulk_callback (struct urb *urb)
        }
 
        /* wake up our little function to let the tty layer know that something happened */
-       queue_task(&bluetooth->tqueue, &tq_immediate);
-       mark_bh(IMMEDIATE_BH);
-       return;
+       schedule_task(&bluetooth->tqueue);
 }
 
 

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 022ef711e81a54acf1884bb2eb3cdc2280e129b5..a048f123abd2e3bd749933e550f1824da077f3ba 100644 (file)
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -272,8 +272,7 @@ static void acm_write_bulk(struct urb *urb)
        if (urb->status)
                dbg("nonzero write bulk status received: %d", urb->status);
 
-       queue_task(&acm->tqueue, &tq_immediate);
-       mark_bh(IMMEDIATE_BH);
+       schedule_task(&acm->tqueue);
 }
 
 static void acm_softint(void *private)

diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 2bed78c39ab2b82540efd7ec03af7523c12beebf..c728a7420d165acdb3677de1006f4eb5b032b228 100644 (file)
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -437,9 +437,7 @@ static void cyberjack_write_bulk_callback (struct urb *urb)
                        /* Throw away data. No better idea what to do with it. */
                        priv->wrfilled=0;
                        priv->wrsent=0;
-                       queue_task(&port->tqueue, &tq_immediate);
-                       mark_bh(IMMEDIATE_BH);
-                       return;
+                       goto exit;
                }
 
                dbg("%s - priv->wrsent=%d", __FUNCTION__,priv->wrsent);
@@ -453,16 +451,10 @@ static void cyberjack_write_bulk_callback (struct urb *urb)
                        priv->wrfilled=0;
                        priv->wrsent=0;
                }
-
-               queue_task(&port->tqueue, &tq_immediate);
-               mark_bh(IMMEDIATE_BH);
-               return;
        }
 
-       queue_task(&port->tqueue, &tq_immediate);
-       mark_bh(IMMEDIATE_BH);
-       
-       return;
+exit:
+       schedule_task(&port->tqueue);
 }
 
 static int __init cyberjack_init (void)

diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index 12bf572660e6e794cc7699170f0c9b04b92b949f..8db192f94e94b32df885d8875c831df3a368ccff 100644 (file)
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -362,11 +362,7 @@ static void empeg_write_bulk_callback (struct urb *urb)
                return;
        }
 
-       queue_task(&port->tqueue, &tq_immediate);
-       mark_bh(IMMEDIATE_BH);
-
-       return;
-
+       schedule_task(&port->tqueue);
 }
 
 

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 1707de33b2deb78633a629e81e11c84eb9697a8d..8f5e0887f22874cc89258b4baacf1d8ff4f12bec 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -484,10 +484,8 @@ static void ftdi_sio_write_bulk_callback (struct urb *urb)
                dbg("nonzero write bulk status received: %d", urb->status);
                return;
        }
-       queue_task(&port->tqueue, &tq_immediate);
-       mark_bh(IMMEDIATE_BH);
 
-       return;
+       schedule_task(&port->tqueue);
 } /* ftdi_sio_write_bulk_callback */
 
 

diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index d4eda82398b23c9896da27dc45238f9da05da651..2999a4a7b5504f1fbfed90e65254b4b4a0eea75c 100644 (file)
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -465,10 +465,8 @@ static void ipaq_write_bulk_callback(struct urb *urb)
                priv->active = 0;
                spin_unlock_irqrestore(&write_list_lock, flags);
        }
-       queue_task(&port->tqueue, &tq_immediate);
-       mark_bh(IMMEDIATE_BH);
-       
-       return;
+
+       schedule_task(&port->tqueue);
 }
 
 static int ipaq_write_room(struct usb_serial_port *port)

diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index d576176aa492b33b00fc2f70271a1628332f6b4c..bda8a7866b4f0e2e8a6e01cfefc29c707fba9433 100644 (file)
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -426,10 +426,7 @@ static void ir_write_bulk_callback (struct urb *urb)
                urb->actual_length,
                urb->transfer_buffer);
 
-       queue_task(&port->tqueue, &tq_immediate);
-       mark_bh(IMMEDIATE_BH);
-       
-       return;
+       schedule_task(&port->tqueue);
 }
 
 static void ir_read_bulk_callback (struct urb *urb)

diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index b7a94800bf62bc8629dcf1573e0e15071f37d854..6a052412725c6524af499f4936e13ffcec738887 100644 (file)
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -447,10 +447,8 @@ static void        usa2x_outdat_callback(struct urb *urb)
        p_priv = (struct keyspan_port_private *)(port->private);
        dbg ("%s - urb %d", __FUNCTION__, urb == p_priv->out_urbs[1]); 
 
-       if (port->open_count) {
-               queue_task(&port->tqueue, &tq_immediate);
-               mark_bh(IMMEDIATE_BH);
-       }
+       if (port->open_count)
+               schedule_task(&port->tqueue);
 }
 
 static void    usa26_inack_callback(struct urb *urb)

diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index 1974edc727e7c80c266d72f1f81cbfb39183f364..776806b5b2cad9443f6d8ab86a86487beeda6647 100644 (file)
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -577,10 +577,7 @@ static void klsi_105_write_bulk_callback ( struct urb *urb)
        }
 
        /* from generic_write_bulk_callback */
-       queue_task(&port->tqueue, &tq_immediate);
-       mark_bh(IMMEDIATE_BH);
-
-       return;
+       schedule_task(&port->tqueue);
 } /* klsi_105_write_bulk_completion_callback */
 
 

diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 9fe49a3b591f38ff0f3297eb1c6aeadfcb00be8e..d01271a7f06a3132b5d631c94b3f25fc5668e1db 100644 (file)
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -507,8 +507,7 @@ static void mct_u232_write_bulk_callback (struct urb *urb)
                
        } else {
                /* from generic_write_bulk_callback */
-               queue_task(&port->tqueue, &tq_immediate);
-               mark_bh(IMMEDIATE_BH);
+               schedule_task(&port->tqueue);
        }
 
        return;

diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 6fbad950b224eaa6db1c61bac73f5d5973f33a94..e675964d592b8c79d0807aecb8ca3dbc02398406 100644 (file)
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -359,12 +359,9 @@ static void omninet_write_bulk_callback (struct urb *urb)
                return;
        }
 
-       queue_task(&port->tqueue, &tq_immediate);
-       mark_bh(IMMEDIATE_BH);
+       schedule_task(&port->tqueue);
 
 //     dbg("omninet_write_bulk_callback, tty %0x\n", tty);
-
-       return;
 }
 
 

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 45251e51d95f916a91e81c663d5981c2c668d109..3f1a2b50ecf9aff2b792837342bf5716bdbd385f 100644 (file)
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -705,10 +705,7 @@ static void pl2303_write_bulk_callback (struct urb *urb)
                return;
        }
 
-       queue_task(&port->tqueue, &tq_immediate);
-       mark_bh(IMMEDIATE_BH);
-
-       return;
+       schedule_task(&port->tqueue);
 }
 
 

diff --git a/drivers/usb/serial/usbserial.c b/drivers/usb/serial/usbserial.c
index b0b3ca548d0bd4bcce09e08bc5b79f9c41eb0ddd..c49c285f3863b240d9dd0ab0112a4377f72732a4 100644 (file)
--- a/drivers/usb/serial/usbserial.c
+++ b/drivers/usb/serial/usbserial.c
@@ -1092,10 +1092,7 @@ static void generic_write_bulk_callback (struct urb *urb)
 
        usb_serial_port_softint((void *)port);
 
-       queue_task(&port->tqueue, &tq_immediate);
-       mark_bh(IMMEDIATE_BH);
-
-       return;
+       schedule_tasks(&port->tqueue);
 }
 
 static void generic_shutdown (struct usb_serial *serial)

diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index 1e6bb41459b8cc034de9e64826e7993e5bff5e3d..0441325154dff9a7ee4f365db83318a7a0fe9c91 100644 (file)
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -458,10 +458,7 @@ static void visor_write_bulk_callback (struct urb *urb)
        /* free up the transfer buffer, as usb_free_urb() does not do this */
        kfree (urb->transfer_buffer);
 
-       queue_task(&port->tqueue, &tq_immediate);
-       mark_bh(IMMEDIATE_BH);
-
-       return;
+       schedule_task(&port->tqueue);
 }
 
 

diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index cadff24042e03f702f48c91c9fe4c7c766645f06..67c931eed0d26e2d697284ca42fd064f7e7b7663 100644 (file)
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -918,10 +918,7 @@ static void whiteheat_write_callback(struct urb *urb)
 
        usb_serial_port_softint((void *)port);
 
-       queue_task(&port->tqueue, &tq_immediate);
-       mark_bh(IMMEDIATE_BH);
-
-       return;
+       schedule_task(&port->tqueue);
 }