diff options
author | Ohad Ben-Cohen <ohad@wizery.com> | 2010-09-15 19:31:35 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-09-21 11:04:59 -0400 |
commit | 09cecc340b3b4d9960b039c0f576548bbf857f5a (patch) | |
tree | edae6862d48eafb93d04632336261bdf83629d72 /drivers/net/wireless | |
parent | 61ee7007a5d61aa066076da578e8e8084e122d7d (diff) |
wl1271: take irq info from private board data
Remove the hard coded irq information, and instead take
the irq information from the board's platform data.
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_sdio.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c index 1d5dc727167d..987ecdc9406d 100644 --- a/drivers/net/wireless/wl12xx/wl1271_sdio.c +++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c | |||
@@ -29,14 +29,12 @@ | |||
29 | #include <linux/mmc/sdio_ids.h> | 29 | #include <linux/mmc/sdio_ids.h> |
30 | #include <linux/mmc/card.h> | 30 | #include <linux/mmc/card.h> |
31 | #include <linux/gpio.h> | 31 | #include <linux/gpio.h> |
32 | #include <linux/wl12xx.h> | ||
32 | 33 | ||
33 | #include "wl1271.h" | 34 | #include "wl1271.h" |
34 | #include "wl12xx_80211.h" | 35 | #include "wl12xx_80211.h" |
35 | #include "wl1271_io.h" | 36 | #include "wl1271_io.h" |
36 | 37 | ||
37 | |||
38 | #define RX71_WL1271_IRQ_GPIO 42 | ||
39 | |||
40 | #ifndef SDIO_VENDOR_ID_TI | 38 | #ifndef SDIO_VENDOR_ID_TI |
41 | #define SDIO_VENDOR_ID_TI 0x0097 | 39 | #define SDIO_VENDOR_ID_TI 0x0097 |
42 | #endif | 40 | #endif |
@@ -208,6 +206,7 @@ static int __devinit wl1271_probe(struct sdio_func *func, | |||
208 | const struct sdio_device_id *id) | 206 | const struct sdio_device_id *id) |
209 | { | 207 | { |
210 | struct ieee80211_hw *hw; | 208 | struct ieee80211_hw *hw; |
209 | const struct wl12xx_platform_data *wlan_data; | ||
211 | struct wl1271 *wl; | 210 | struct wl1271 *wl; |
212 | int ret; | 211 | int ret; |
213 | 212 | ||
@@ -227,13 +226,15 @@ static int __devinit wl1271_probe(struct sdio_func *func, | |||
227 | /* Grab access to FN0 for ELP reg. */ | 226 | /* Grab access to FN0 for ELP reg. */ |
228 | func->card->quirks |= MMC_QUIRK_LENIENT_FN0; | 227 | func->card->quirks |= MMC_QUIRK_LENIENT_FN0; |
229 | 228 | ||
230 | wl->irq = gpio_to_irq(RX71_WL1271_IRQ_GPIO); | 229 | wlan_data = wl12xx_get_platform_data(); |
231 | if (wl->irq < 0) { | 230 | if (IS_ERR(wlan_data)) { |
232 | ret = wl->irq; | 231 | ret = PTR_ERR(wlan_data); |
233 | wl1271_error("could not get irq!"); | 232 | wl1271_error("missing wlan platform data: %d", ret); |
234 | goto out_free; | 233 | goto out_free; |
235 | } | 234 | } |
236 | 235 | ||
236 | wl->irq = wlan_data->irq; | ||
237 | |||
237 | ret = request_irq(wl->irq, wl1271_irq, 0, DRIVER_NAME, wl); | 238 | ret = request_irq(wl->irq, wl1271_irq, 0, DRIVER_NAME, wl); |
238 | if (ret < 0) { | 239 | if (ret < 0) { |
239 | wl1271_error("request_irq() failed: %d", ret); | 240 | wl1271_error("request_irq() failed: %d", ret); |