lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wl1251: use wiphy_dev instead of wl->spi->dev

Browse Source 
Remove a dependency on the bus-specific struct device by using wiphy_dev
when requesting firmware.

Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Bob Copeland 2009-08-07 13:33:04 +03:00 committed by John W. Linville
parent 0764de64c8
commit 6c766f413c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/wl12xx/wl1251_main.c
View File

@ -75,9 +75,10 @@ static irqreturn_t wl1251_irq(int irq, void *cookie)
static int wl1251_fetch_firmware(struct wl1251 *wl)
{
const struct firmware *fw;
struct device *dev = wiphy_dev(wl->hw->wiphy);
int ret;
ret = request_firmware(&fw, wl->chip.fw_filename, &wl->spi->dev);
ret = request_firmware(&fw, wl->chip.fw_filename, dev);
if (ret < 0) {
wl1251_error("could not get firmware: %d", ret);
@ -113,9 +114,10 @@ static int wl1251_fetch_firmware(struct wl1251 *wl)
static int wl1251_fetch_nvs(struct wl1251 *wl)
{
const struct firmware *fw;
struct device *dev = wiphy_dev(wl->hw->wiphy);
int ret;
ret = request_firmware(&fw, wl->chip.nvs_filename, &wl->spi->dev);
ret = request_firmware(&fw, wl->chip.nvs_filename, dev);
if (ret < 0) {
wl1251_error("could not get nvs file: %d", ret);