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

Commit 2d2918e0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wil6210: remove wil_to_pcie_dev()"

parents 54847c1c 3b33f057

drivers/net/wireless/ath/wil6210/fw.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

#include <linux/firmware.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/crc32.h>

#include "wil6210.h"

#include "fw.h"

drivers/net/wireless/ath/wil6210/fw_inc.c

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ int wil_request_firmware(struct wil6210_priv *wil, const char *name) 
	size_t sz;

	const void *d;



	rc = request_firmware(&fw, name, wil_to_pcie_dev(wil));

	rc = request_firmware(&fw, name, wil_to_dev(wil));

	if (rc) {

		wil_err_fw(wil, "Failed to load firmware %s\n", name);

		return rc;

drivers/net/wireless/ath/wil6210/wil6210.h

+0 −1
Original line number Diff line number Diff line
@@ -469,7 +469,6 @@ struct wil6210_priv { 
#define wdev_to_wil(w) (struct wil6210_priv *)(wdev_priv(w))

#define wil_to_ndev(i) (wil_to_wdev(i)->netdev)

#define ndev_to_wil(n) (wdev_to_wil(n->ieee80211_ptr))

#define wil_to_pcie_dev(i) (&i->pdev->dev)



int wil_dbg_trace(struct wil6210_priv *wil, const char *fmt, ...);

int wil_err(struct wil6210_priv *wil, const char *fmt, ...);