diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-08 11:24:46 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-28 12:03:14 -0500 |
commit | 5fa9167a1bf5f5a4b7282f5e7ac56a4a5a1fa044 (patch) | |
tree | 2bf23e13308ef683302ff5a92af0ae8bc37c1b60 /drivers/net/wireless | |
parent | dd2e5a156525f11754d9b1e0583f6bb49c253d62 (diff) |
pcmcia: rework the irq_req_t typedef
Most of the irq_req_t typedef'd struct can be re-worked quite
easily:
(1) IRQInfo2 was unused in any case, so drop it.
(2) IRQInfo1 was used write-only, so drop it.
(3) Instance (private data to be passed to the IRQ handler):
Most PCMCIA drivers using pcmcia_request_irq() to actually
register an IRQ handler set the "dev_id" to the same pointer
as the "priv" pointer in struct pcmcia_device. Modify the two
exceptions (ipwireless, ibmtr_cs) to also work this waym and
set the IRQ handler's "dev_id" to p_dev->priv unconditionally.
(4) Handler is to be of type irq_handler_t.
(5) Handler != NULL already tells whether an IRQ handler is present.
Therefore, we do not need the IRQ_HANDLER_PRESENT flag in
irq_req_t.Attributes.
CC: netdev@vger.kernel.org
CC: linux-bluetooth@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-scsi@vger.kernel.org
CC: alsa-devel@alsa-project.org
CC: Jaroslav Kysela <perex@perex.cz>
CC: Jiri Kosina <jkosina@suse.cz>
CC: Karsten Keil <isdn@linux-pingi.de>
for the Bluetooth parts: Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/airo_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/atmel_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/b43/pcmcia.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_cs.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/if_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/netwave_cs.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco/orinoco_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco/spectrum_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/wavelan_cs.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/wl3501_cs.c | 5 |
11 files changed, 9 insertions, 28 deletions
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c index 7d3a96fdf5a3..f6036fb42319 100644 --- a/drivers/net/wireless/airo_cs.c +++ b/drivers/net/wireless/airo_cs.c | |||
@@ -134,7 +134,6 @@ static int airo_probe(struct pcmcia_device *p_dev) | |||
134 | 134 | ||
135 | /* Interrupt setup */ | 135 | /* Interrupt setup */ |
136 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 136 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
137 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
138 | p_dev->irq.Handler = NULL; | 137 | p_dev->irq.Handler = NULL; |
139 | 138 | ||
140 | /* | 139 | /* |
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c index 18a58b859223..32407911842f 100644 --- a/drivers/net/wireless/atmel_cs.c +++ b/drivers/net/wireless/atmel_cs.c | |||
@@ -143,7 +143,6 @@ static int atmel_probe(struct pcmcia_device *p_dev) | |||
143 | 143 | ||
144 | /* Interrupt setup */ | 144 | /* Interrupt setup */ |
145 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 145 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
146 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
147 | p_dev->irq.Handler = NULL; | 146 | p_dev->irq.Handler = NULL; |
148 | 147 | ||
149 | /* | 148 | /* |
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c index 2588358294be..984174bc7b0f 100644 --- a/drivers/net/wireless/b43/pcmcia.c +++ b/drivers/net/wireless/b43/pcmcia.c | |||
@@ -98,9 +98,7 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev) | |||
98 | goto err_disable; | 98 | goto err_disable; |
99 | 99 | ||
100 | dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 100 | dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
101 | dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
102 | dev->irq.Handler = NULL; /* The handler is registered later. */ | 101 | dev->irq.Handler = NULL; /* The handler is registered later. */ |
103 | dev->irq.Instance = NULL; | ||
104 | res = pcmcia_request_irq(dev, &dev->irq); | 102 | res = pcmcia_request_irq(dev, &dev->irq); |
105 | if (res != 0) | 103 | if (res != 0) |
106 | goto err_disable; | 104 | goto err_disable; |
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index 243e912729b9..c9640a3e02c9 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c | |||
@@ -641,11 +641,8 @@ static int prism2_config(struct pcmcia_device *link) | |||
641 | * irq structure is initialized. | 641 | * irq structure is initialized. |
642 | */ | 642 | */ |
643 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { | 643 | if (link->conf.Attributes & CONF_ENABLE_IRQ) { |
644 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | | 644 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
645 | IRQ_HANDLE_PRESENT; | ||
646 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
647 | link->irq.Handler = prism2_interrupt; | 645 | link->irq.Handler = prism2_interrupt; |
648 | link->irq.Instance = dev; | ||
649 | ret = pcmcia_request_irq(link, &link->irq); | 646 | ret = pcmcia_request_irq(link, &link->irq); |
650 | if (ret) | 647 | if (ret) |
651 | goto failed; | 648 | goto failed; |
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index f2b16559b686..b1d84592b959 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c | |||
@@ -837,7 +837,6 @@ static int if_cs_probe(struct pcmcia_device *p_dev) | |||
837 | 837 | ||
838 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; | 838 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
839 | p_dev->irq.Handler = NULL; | 839 | p_dev->irq.Handler = NULL; |
840 | p_dev->irq.IRQInfo1 = IRQ_INFO2_VALID | IRQ_LEVEL_ID; | ||
841 | 840 | ||
842 | p_dev->conf.Attributes = 0; | 841 | p_dev->conf.Attributes = 0; |
843 | p_dev->conf.IntType = INT_MEMORY_AND_IO; | 842 | p_dev->conf.IntType = INT_MEMORY_AND_IO; |
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index f5333b7d2226..e61e6b9440ab 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c | |||
@@ -384,8 +384,7 @@ static int netwave_probe(struct pcmcia_device *link) | |||
384 | link->io.IOAddrLines = 5; | 384 | link->io.IOAddrLines = 5; |
385 | 385 | ||
386 | /* Interrupt setup */ | 386 | /* Interrupt setup */ |
387 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 387 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
388 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
389 | link->irq.Handler = &netwave_interrupt; | 388 | link->irq.Handler = &netwave_interrupt; |
390 | 389 | ||
391 | /* General socket configuration */ | 390 | /* General socket configuration */ |
@@ -404,8 +403,6 @@ static int netwave_probe(struct pcmcia_device *link) | |||
404 | 403 | ||
405 | dev->watchdog_timeo = TX_TIMEOUT; | 404 | dev->watchdog_timeo = TX_TIMEOUT; |
406 | 405 | ||
407 | link->irq.Instance = dev; | ||
408 | |||
409 | return netwave_pcmcia_config( link); | 406 | return netwave_pcmcia_config( link); |
410 | } /* netwave_attach */ | 407 | } /* netwave_attach */ |
411 | 408 | ||
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c index 688b39823459..f27bb8367c98 100644 --- a/drivers/net/wireless/orinoco/orinoco_cs.c +++ b/drivers/net/wireless/orinoco/orinoco_cs.c | |||
@@ -120,10 +120,8 @@ orinoco_cs_probe(struct pcmcia_device *link) | |||
120 | link->priv = priv; | 120 | link->priv = priv; |
121 | 121 | ||
122 | /* Interrupt setup */ | 122 | /* Interrupt setup */ |
123 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 123 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
124 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
125 | link->irq.Handler = orinoco_interrupt; | 124 | link->irq.Handler = orinoco_interrupt; |
126 | link->irq.Instance = priv; | ||
127 | 125 | ||
128 | /* General socket configuration defaults can go here. In this | 126 | /* General socket configuration defaults can go here. In this |
129 | * client, we assume very little, and rely on the CIS for | 127 | * client, we assume very little, and rely on the CIS for |
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c index c609371d1525..59bda240fdc2 100644 --- a/drivers/net/wireless/orinoco/spectrum_cs.c +++ b/drivers/net/wireless/orinoco/spectrum_cs.c | |||
@@ -194,10 +194,8 @@ spectrum_cs_probe(struct pcmcia_device *link) | |||
194 | link->priv = priv; | 194 | link->priv = priv; |
195 | 195 | ||
196 | /* Interrupt setup */ | 196 | /* Interrupt setup */ |
197 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 197 | link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
198 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
199 | link->irq.Handler = orinoco_interrupt; | 198 | link->irq.Handler = orinoco_interrupt; |
200 | link->irq.Instance = priv; | ||
201 | 199 | ||
202 | /* General socket configuration defaults can go here. In this | 200 | /* General socket configuration defaults can go here. In this |
203 | * client, we assume very little, and rely on the CIS for | 201 | * client, we assume very little, and rely on the CIS for |
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 5e0f4c3eac38..91213f9e2c4f 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -323,8 +323,7 @@ static int ray_probe(struct pcmcia_device *p_dev) | |||
323 | p_dev->io.IOAddrLines = 5; | 323 | p_dev->io.IOAddrLines = 5; |
324 | 324 | ||
325 | /* Interrupt setup. For PCMCIA, driver takes what's given */ | 325 | /* Interrupt setup. For PCMCIA, driver takes what's given */ |
326 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 326 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
327 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
328 | p_dev->irq.Handler = &ray_interrupt; | 327 | p_dev->irq.Handler = &ray_interrupt; |
329 | 328 | ||
330 | /* General socket configuration */ | 329 | /* General socket configuration */ |
@@ -333,7 +332,6 @@ static int ray_probe(struct pcmcia_device *p_dev) | |||
333 | p_dev->conf.ConfigIndex = 1; | 332 | p_dev->conf.ConfigIndex = 1; |
334 | 333 | ||
335 | p_dev->priv = dev; | 334 | p_dev->priv = dev; |
336 | p_dev->irq.Instance = dev; | ||
337 | 335 | ||
338 | local->finder = p_dev; | 336 | local->finder = p_dev; |
339 | local->card_status = CARD_INSERTED; | 337 | local->card_status = CARD_INSERTED; |
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index df3579aef505..33918fd5b231 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c | |||
@@ -4438,8 +4438,7 @@ wavelan_probe(struct pcmcia_device *p_dev) | |||
4438 | p_dev->io.IOAddrLines = 3; | 4438 | p_dev->io.IOAddrLines = 3; |
4439 | 4439 | ||
4440 | /* Interrupt setup */ | 4440 | /* Interrupt setup */ |
4441 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 4441 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
4442 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
4443 | p_dev->irq.Handler = wavelan_interrupt; | 4442 | p_dev->irq.Handler = wavelan_interrupt; |
4444 | 4443 | ||
4445 | /* General socket configuration */ | 4444 | /* General socket configuration */ |
@@ -4451,7 +4450,7 @@ wavelan_probe(struct pcmcia_device *p_dev) | |||
4451 | if (!dev) | 4450 | if (!dev) |
4452 | return -ENOMEM; | 4451 | return -ENOMEM; |
4453 | 4452 | ||
4454 | p_dev->priv = p_dev->irq.Instance = dev; | 4453 | p_dev->priv = dev; |
4455 | 4454 | ||
4456 | lp = netdev_priv(dev); | 4455 | lp = netdev_priv(dev); |
4457 | 4456 | ||
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index 9a956c786738..5f0401a52cff 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c | |||
@@ -1898,8 +1898,7 @@ static int wl3501_probe(struct pcmcia_device *p_dev) | |||
1898 | p_dev->io.IOAddrLines = 5; | 1898 | p_dev->io.IOAddrLines = 5; |
1899 | 1899 | ||
1900 | /* Interrupt setup */ | 1900 | /* Interrupt setup */ |
1901 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; | 1901 | p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; |
1902 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | ||
1903 | p_dev->irq.Handler = wl3501_interrupt; | 1902 | p_dev->irq.Handler = wl3501_interrupt; |
1904 | 1903 | ||
1905 | /* General socket configuration */ | 1904 | /* General socket configuration */ |
@@ -1922,7 +1921,7 @@ static int wl3501_probe(struct pcmcia_device *p_dev) | |||
1922 | dev->wireless_handlers = &wl3501_handler_def; | 1921 | dev->wireless_handlers = &wl3501_handler_def; |
1923 | SET_ETHTOOL_OPS(dev, &ops); | 1922 | SET_ETHTOOL_OPS(dev, &ops); |
1924 | netif_stop_queue(dev); | 1923 | netif_stop_queue(dev); |
1925 | p_dev->priv = p_dev->irq.Instance = dev; | 1924 | p_dev->priv = dev; |
1926 | 1925 | ||
1927 | return wl3501_config(p_dev); | 1926 | return wl3501_config(p_dev); |
1928 | out_link: | 1927 | out_link: |