rt2x00: Remove interrupt thread registration

No driver uses interrupt threads anymore. Remove the remaining interrupt
thread artifacts.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 6965131..7661e4f 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -511,11 +511,6 @@ struct rt2x00lib_ops {
         */
        irq_handler_t irq_handler;
 
-       /*
-        * Threaded Interrupt handlers.
-        */
-       irq_handler_t irq_handler_thread;
-
        /*
         * TX status tasklet handler.
         */
@@ -894,12 +889,6 @@ struct rt2x00_dev {
         */
        const struct firmware *fw;
 
-       /*
-        * Interrupt values, stored between interrupt service routine
-        * and interrupt thread routine.
-        */
-       u32 irqvalue[2];
-
        /*
         * FIFO for storing tx status reports between isr and tasklet.
         */

diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index ace0b66..4dd82b0 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -160,10 +160,9 @@ int rt2x00pci_initialize(struct rt2x00_dev *rt2x00dev)
        /*
         * Register interrupt handler.
         */
-       status = request_threaded_irq(rt2x00dev->irq,
-                                     rt2x00dev->ops->lib->irq_handler,
-                                     rt2x00dev->ops->lib->irq_handler_thread,
-                                     IRQF_SHARED, rt2x00dev->name, rt2x00dev);
+       status = request_irq(rt2x00dev->irq,
+                            rt2x00dev->ops->lib->irq_handler,
+                            IRQF_SHARED, rt2x00dev->name, rt2x00dev);
        if (status) {
                ERROR(rt2x00dev, "IRQ %d allocation failed (error %d).\n",
                      rt2x00dev->irq, status);