From ea3aa93055508ae3e3a62f90580c24ec381dcbe2 Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Tue, 31 May 2011 10:07:00 +0300 Subject: 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 Signed-off-by: Wey-Yi Guy --- drivers/net/wireless/iwlwifi/iwl-agn.c | 10 ---------- drivers/net/wireless/iwlwifi/iwl-dev.h | 4 ---- 2 files changed, 14 deletions(-) (limited to 'drivers/net/wireless/iwlwifi') diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index e2b319f3c5f..17228f77d22 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -32,9 +32,6 @@ #include #include #include -/* TODO: remove include to PCI*.h when no PCI will be needed here */ -#include -#include #include #include #include @@ -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 f6b54c6d878..34f9d0f6702 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 */ -- cgit v1.2.3-70-g09d2