Browse Source

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.

Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Vladimir Kondratiev 10 years ago
parent
commit
6992991346

+ 0 - 1
drivers/net/wireless/ath/wil6210/fw.c

@@ -15,7 +15,6 @@
  */
  */
 #include <linux/firmware.h>
 #include <linux/firmware.h>
 #include <linux/module.h>
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/crc32.h>
 #include <linux/crc32.h>
 #include "wil6210.h"
 #include "wil6210.h"
 #include "fw.h"
 #include "fw.h"

+ 1 - 1
drivers/net/wireless/ath/wil6210/fw_inc.c

@@ -471,7 +471,7 @@ int wil_request_firmware(struct wil6210_priv *wil, const char *name)
 	size_t sz;
 	size_t sz;
 	const void *d;
 	const void *d;
 
 
-	rc = request_firmware(&fw, name, wil_to_pcie_dev(wil));
+	rc = request_firmware(&fw, name, wil_to_dev(wil));
 	if (rc) {
 	if (rc) {
 		wil_err_fw(wil, "Failed to load firmware %s\n", name);
 		wil_err_fw(wil, "Failed to load firmware %s\n", name);
 		return rc;
 		return rc;

+ 0 - 1
drivers/net/wireless/ath/wil6210/wil6210.h

@@ -469,7 +469,6 @@ struct wil6210_priv {
 #define wdev_to_wil(w) (struct wil6210_priv *)(wdev_priv(w))
 #define wdev_to_wil(w) (struct wil6210_priv *)(wdev_priv(w))
 #define wil_to_ndev(i) (wil_to_wdev(i)->netdev)
 #define wil_to_ndev(i) (wil_to_wdev(i)->netdev)
 #define ndev_to_wil(n) (wdev_to_wil(n->ieee80211_ptr))
 #define ndev_to_wil(n) (wdev_to_wil(n->ieee80211_ptr))
-#define wil_to_pcie_dev(i) (&i->pdev->dev)
 
 
 __printf(2, 3)
 __printf(2, 3)
 void wil_dbg_trace(struct wil6210_priv *wil, const char *fmt, ...);
 void wil_dbg_trace(struct wil6210_priv *wil, const char *fmt, ...);