diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-02-01 22:13:46 +0100 |
|---|---|---|
| committer | Luis R. Rodriguez <lrodriguez@atheros.com> | 2011-02-07 16:42:22 -0800 |
| commit | 63bb2c58a0686a4863783cdcaa01dad5b58aac6f (patch) | |
| tree | b18b1538b4ac743e85e91e88301907e519a9bf68 /patches/09-threaded-irq.patch | |
| parent | 92e443f253187a431b150e2fdfd54c09c4e91c5d (diff) | |
compat-wireless: remove compat for threaded_irq in rt2x00
rt2x00 does not use threaded_irq any more.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/09-threaded-irq.patch')
| -rw-r--r-- | patches/09-threaded-irq.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch index 059e58e2..df164e95 100644 --- a/patches/09-threaded-irq.patch +++ b/patches/09-threaded-irq.patch @@ -61,59 +61,3 @@ thread in process context as well. }; /* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */ ---- a/drivers/net/wireless/rt2x00/rt2x00.h -+++ b/drivers/net/wireless/rt2x00/rt2x00.h -@@ -901,6 +901,10 @@ struct rt2x00_dev { - * Tasklet for processing tx status reports (rt2800pci). - */ - struct tasklet_struct txstatus_tasklet; -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) -+ struct compat_threaded_irq irq_compat; -+#endif - }; - - /* ---- a/drivers/net/wireless/rt2x00/rt2x00pci.c -+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c -@@ -160,10 +160,18 @@ int rt2x00pci_initialize(struct rt2x00_d - /* - * Register interrupt handler. - */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) -+ status = compat_request_threaded_irq(&rt2x00dev->irq_compat, -+ rt2x00dev->irq, -+ rt2x00dev->ops->lib->irq_handler, -+ rt2x00dev->ops->lib->irq_handler_thread, -+ IRQF_SHARED, rt2x00dev->name, rt2x00dev); -+#else - status = request_threaded_irq(rt2x00dev->irq, - rt2x00dev->ops->lib->irq_handler, - rt2x00dev->ops->lib->irq_handler_thread, - IRQF_SHARED, rt2x00dev->name, rt2x00dev); -+#endif - if (status) { - ERROR(rt2x00dev, "IRQ %d allocation failed (error %d).\n", - rt2x00dev->irq, status); -@@ -187,7 +195,11 @@ void rt2x00pci_uninitialize(struct rt2x0 - /* - * Free irq line. - */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) -+ compat_free_threaded_irq(&rt2x00dev->irq_compat); -+#else - free_irq(rt2x00dev->irq, rt2x00dev); -+#endif - - /* - * Free DMA -@@ -202,6 +214,9 @@ EXPORT_SYMBOL_GPL(rt2x00pci_uninitialize - */ - static void rt2x00pci_free_reg(struct rt2x00_dev *rt2x00dev) - { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) -+ compat_destroy_threaded_irq(&rt2x00dev->irq_compat); -+#endif - kfree(rt2x00dev->rf); - rt2x00dev->rf = NULL; - |