hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Ohad Ben-Cohen 2010-09-16 01:31:35 +02:00 committed by John W. Linville
parent 61ee7007a5
commit 09cecc340b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/wireless/wl12xx/wl1271_sdio.c
View File

@ -29,14 +29,12 @@
#include <linux/mmc/sdio_ids.h> #include <linux/mmc/sdio_ids.h>
#include <linux/mmc/card.h> #include <linux/mmc/card.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/wl12xx.h>
#include "wl1271.h" #include "wl1271.h"
#include "wl12xx_80211.h" #include "wl12xx_80211.h"
#include "wl1271_io.h" #include "wl1271_io.h"
#define RX71_WL1271_IRQ_GPIO 42
#ifndef SDIO_VENDOR_ID_TI #ifndef SDIO_VENDOR_ID_TI
#define SDIO_VENDOR_ID_TI 0x0097 #define SDIO_VENDOR_ID_TI 0x0097
#endif #endif
@ -208,6 +206,7 @@ static int __devinit wl1271_probe(struct sdio_func *func,
const struct sdio_device_id *id) const struct sdio_device_id *id)
{ {
struct ieee80211_hw *hw; struct ieee80211_hw *hw;
const struct wl12xx_platform_data *wlan_data;
struct wl1271 *wl; struct wl1271 *wl;
int ret; int ret;
@ -227,13 +226,15 @@ static int __devinit wl1271_probe(struct sdio_func *func,
/* Grab access to FN0 for ELP reg. */ /* Grab access to FN0 for ELP reg. */
func->card->quirks |= MMC_QUIRK_LENIENT_FN0; func->card->quirks |= MMC_QUIRK_LENIENT_FN0;
wl->irq = gpio_to_irq(RX71_WL1271_IRQ_GPIO); wlan_data = wl12xx_get_platform_data();
if (wl->irq < 0) { if (IS_ERR(wlan_data)) {
ret = wl->irq; ret = PTR_ERR(wlan_data);
wl1271_error("could not get irq!"); wl1271_error("missing wlan platform data: %d", ret);
goto out_free; goto out_free;
} }
wl->irq = wlan_data->irq;
ret = request_irq(wl->irq, wl1271_irq, 0, DRIVER_NAME, wl); ret = request_irq(wl->irq, wl1271_irq, 0, DRIVER_NAME, wl);
if (ret < 0) { if (ret < 0) {
wl1271_error("request_irq() failed: %d", ret); wl1271_error("request_irq() failed: %d", ret);