Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c766f41 authored by Bob Copeland's avatar Bob Copeland Committed by John W. Linville
Browse files

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



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

Signed-off-by: default avatarBob Copeland <me@bobcopeland.com>
Signed-off-by: default avatarKalle Valo <kalle.valo@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0764de64

drivers/net/wireless/wl12xx/wl1251_main.c

+4 −2
Original line number Diff line number Diff line
@@ -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);