From f8471917a6ac4956cbb688a6d39ccedf6ebfa3a4 Mon Sep 17 00:00:00 2001
From: Helmut Schaa <helmut.schaa@googlemail.com>
Date: Sun, 30 Jan 2011 13:20:29 +0100
Subject: [PATCH] --- yaml --- r: 236953 b: refs/heads/master c:
 e88399bcdb71f2cdb195410151edf9c04980adbd h: refs/heads/master i:   236951:
 56eac2831a729c3da3aeca1679b5425a11ca92be v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/net/wireless/rt2x00/rt2x00.h    | 11 -----------
 trunk/drivers/net/wireless/rt2x00/rt2x00pci.c |  7 +++----
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 3a2562e93f7c..c8e496bf8efc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcf3cfd047d599cd0e6758c422bd7a4835c00d4a
+refs/heads/master: e88399bcdb71f2cdb195410151edf9c04980adbd
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00.h b/trunk/drivers/net/wireless/rt2x00/rt2x00.h
index 696513113d9f..7661e4f60ddc 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/trunk/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/trunk/drivers/net/wireless/rt2x00/rt2x00pci.c b/trunk/drivers/net/wireless/rt2x00/rt2x00pci.c
index ace0b668c04e..4dd82b0b0520 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/trunk/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);