wl1271: take irq info from private board data
PATCH v6 4/7 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 <[email protected]>
--- drivers/net/wireless/wl12xx/wl1271_sdio.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-)
drivers/net/wireless/wl12xx/wl1271_sdio.c +8 -7
@@ -29,14 +29,12 @@#include <linux/mmc/sdio_ids.h> #include <linux/mmc/card.h> #include <linux/gpio.h> +#include <linux/wl12xx.h> #include "wl1271.h" #include "wl12xx_80211.h" #include "wl1271_io.h" - -#define RX71_WL1271_IRQ_GPIO 42 -#ifndef SDIO_VENDOR_ID_TI #define SDIO_VENDOR_ID_TI 0x0097#endif
@@ -208,6 +206,7 @@ static int __devinit wl1271_probe(struct sdio_func *func, const struct sdio_device_id *id) {struct ieee80211_hw *hw; +const struct wl12xx_platform_data *wlan_data;struct wl1271 *wl;int ret;
@@ -227,13 +226,15 @@ static int __devinit wl1271_probe(struct sdio_func *func,/* Grab access to FN0 for ELP reg. */ func->card->quirks |=MMC_QUIRK_LENIENT_FN0 ; - wl->irq =gpio_to_irq (RX71_WL1271_IRQ_GPIO ); -if (wl->irq <0 ) { - ret = wl->irq; -wl1271_error ("could not get irq!" ); + wlan_data =wl12xx_get_platform_data (); +if (IS_ERR (wlan_data)) { + ret =PTR_ERR (wlan_data); +wl1271_error ("missing wlan platform data: %d" , ret); goto out_free; } + wl->irq = wlan_data->irq; + ret =request_irq (wl->irq, wl1271_irq,0 ,DRIVER_NAME , wl);if (ret <0 ) {wl1271_error ("request_irq() failed: %d" , ret);
Signature · 1 line
1.7.0.4
PATCH v6 4/7 wl1271: take irq info from private board data
Quoted 5 lines · ext Ohad Ben-Cohen
Remove the hard coded irq information, and instead take the irq information from the board's platform data.
Signed-off-by Ohad Ben-Cohen <[email protected]>---
Acked-by Luciano Coelho <[email protected]>
Signature · 2 lines
Cheers, Luca.