From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Tue, 31 May 2011 07:07:00 +0000 (+0300)
Subject: iwlagn: finally kill the pointer to pci_dev from iwl-dev.h
X-Git-Tag: firefly_0821_release~3680^2~4429^2~12^2~42^2~401^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ea3aa93055508ae3e3a62f90580c24ec381dcbe2;p=firefly-linux-kernel-4.4.55.git
iwlagn: finally kill the pointer to pci_dev from iwl-dev.h
All pci related stuff is in iwl-pci.c.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
---
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index e2b319f3c5f8..17228f77d22f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -32,9 +32,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
-/* TODO: remove include to PCI*.h when no PCI will be needed here */
-#include <linux/pci.h>
-#include <linux/pci-aspm.h>
#include <linux/slab.h>
#include <linux/dma-mapping.h>
#include <linux/delay.h>
@@ -3488,12 +3485,6 @@ int iwl_probe(void *bus_specific, struct iwl_bus_ops *bus_ops,
/************************
* 1. Allocating HW data
************************/
- /* TODO: remove this nasty hack when PCI encapsulation is done
- * assumes that struct pci_dev * is at the very beginning of whatever
- * is pointed by bus_specific */
- unsigned long *ppdev = bus_specific;
- struct pci_dev *pdev = (struct pci_dev *) *ppdev;
-
hw = iwl_alloc_all(cfg);
if (!hw) {
err = -ENOMEM;
@@ -3512,7 +3503,6 @@ int iwl_probe(void *bus_specific, struct iwl_bus_ops *bus_ops,
IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
priv->cfg = cfg;
- priv->pci_dev = pdev;
priv->inta_mask = CSR_INI_SET_MASK;
/* is antenna coupling more than 35dB ? */
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index f6b54c6d878d..34f9d0f6702a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1293,10 +1293,6 @@ struct iwl_priv {
spinlock_t reg_lock; /* protect hw register access */
struct mutex mutex;
- /* TODO: remove this after PCI abstraction is done */
- /* basic pci-network driver stuff */
- struct pci_dev *pci_dev;
-
struct iwl_bus bus; /* bus specific data */
/* microcode/device supports multiple contexts */