aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00.h11
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00pci.c7
2 files changed, 3 insertions, 15 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 696513113d9..7661e4f60dd 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -512,11 +512,6 @@ struct rt2x00lib_ops {
512 irq_handler_t irq_handler; 512 irq_handler_t irq_handler;
513 513
514 /* 514 /*
515 * Threaded Interrupt handlers.
516 */
517 irq_handler_t irq_handler_thread;
518
519 /*
520 * TX status tasklet handler. 515 * TX status tasklet handler.
521 */ 516 */
522 void (*txstatus_tasklet) (unsigned long data); 517 void (*txstatus_tasklet) (unsigned long data);
@@ -895,12 +890,6 @@ struct rt2x00_dev {
895 const struct firmware *fw; 890 const struct firmware *fw;
896 891
897 /* 892 /*
898 * Interrupt values, stored between interrupt service routine
899 * and interrupt thread routine.
900 */
901 u32 irqvalue[2];
902
903 /*
904 * FIFO for storing tx status reports between isr and tasklet. 893 * FIFO for storing tx status reports between isr and tasklet.
905 */ 894 */
906 DECLARE_KFIFO_PTR(txstatus_fifo, u32); 895 DECLARE_KFIFO_PTR(txstatus_fifo, u32);
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index ace0b668c04..4dd82b0b052 100644
--- 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)
160 /* 160 /*
161 * Register interrupt handler. 161 * Register interrupt handler.
162 */ 162 */
163 status = request_threaded_irq(rt2x00dev->irq, 163 status = request_irq(rt2x00dev->irq,
164 rt2x00dev->ops->lib->irq_handler, 164 rt2x00dev->ops->lib->irq_handler,
165 rt2x00dev->ops->lib->irq_handler_thread, 165 IRQF_SHARED, rt2x00dev->name, rt2x00dev);
166 IRQF_SHARED, rt2x00dev->name, rt2x00dev);
167 if (status) { 166 if (status) {
168 ERROR(rt2x00dev, "IRQ %d allocation failed (error %d).\n", 167 ERROR(rt2x00dev, "IRQ %d allocation failed (error %d).\n",
169 rt2x00dev->irq, status); 168 rt2x00dev->irq, status);