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

Commit 3b33f057 authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by Hamad Kadmany
Browse files

wil6210: remove wil_to_pcie_dev() 



There is no need to obtain physical device through
wil->pdev->dev path, as it is done by this macro.
The same device already stored as wiphy's device, thus
wil_to_dev() returns the same device as wil_to_pcie_dev()

Remove unnecessary macros, this allows to drop dependency
by pci.h in the firmware download code.

Change-Id: Ief48708b4eb27cbf4b13ac92b048326b8e094fb2
Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Git-commit: 6992991346e820ca031efee95c769e45649f79fc
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git


Signed-off-by: default avatarHamad Kadmany <hkadmany@codeaurora.org>
parent 576f21d7

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, ...);