aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1271_main.c
diff options
context:
space:
mode:
authorTeemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>2010-02-22 01:38:23 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-03-09 15:02:57 -0500
commit8197b7118add28f9aaa99c1fb73c0e201c8cde52 (patch)
treece6c7c4cb5cdb8113b19d17b98d04929eef5030e /drivers/net/wireless/wl12xx/wl1271_main.c
parent54f7e5037c95f2beff0252bfcf288f711c185799 (diff)
wl1271: Implemented abstraction of IO functions.
Changed the driver to use if_ops structure to abstract access to the IO layer (SPI or SDIO). Signed-off-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com> Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_main.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 18347c3a5e19..6b3fd0005ce0 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -480,7 +480,7 @@ static int wl1271_fetch_firmware(struct wl1271 *wl)
480 const struct firmware *fw; 480 const struct firmware *fw;
481 int ret; 481 int ret;
482 482
483 ret = request_firmware(&fw, WL1271_FW_NAME, &wl->spi->dev); 483 ret = request_firmware(&fw, WL1271_FW_NAME, wl1271_wl_to_dev(wl));
484 484
485 if (ret < 0) { 485 if (ret < 0) {
486 wl1271_error("could not get firmware: %d", ret); 486 wl1271_error("could not get firmware: %d", ret);
@@ -552,7 +552,7 @@ static int wl1271_fetch_nvs(struct wl1271 *wl)
552 const struct firmware *fw; 552 const struct firmware *fw;
553 int ret; 553 int ret;
554 554
555 ret = request_firmware(&fw, WL1271_NVS_NAME, &wl->spi->dev); 555 ret = request_firmware(&fw, WL1271_NVS_NAME, wl1271_wl_to_dev(wl));
556 556
557 if (ret < 0) { 557 if (ret < 0) {
558 wl1271_error("could not get nvs file: %d", ret); 558 wl1271_error("could not get nvs file: %d", ret);
@@ -1973,7 +1973,7 @@ int wl1271_init_ieee80211(struct wl1271 *wl)
1973 if (wl1271_11a_enabled()) 1973 if (wl1271_11a_enabled())
1974 wl->hw->wiphy->bands[IEEE80211_BAND_5GHZ] = &wl1271_band_5ghz; 1974 wl->hw->wiphy->bands[IEEE80211_BAND_5GHZ] = &wl1271_band_5ghz;
1975 1975
1976 SET_IEEE80211_DEV(wl->hw, &wl->spi->dev); 1976 SET_IEEE80211_DEV(wl->hw, wl1271_wl_to_dev(wl));
1977 1977
1978 return 0; 1978 return 0;
1979} 1979}