renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 21:54:06 +08:00
Code

iwlagn: finally kill the pointer to pci_dev from iwl-dev.h

Browse Source 
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>
This commit is contained in:
Emmanuel Grumbach 2011-05-31 10:07:00 +03:00 committed by Wey-Yi Guy
parent 08321c062f
commit ea3aa93055
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/iwlwifi/iwl-agn.c
View File

@ -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 ? */

4
drivers/net/wireless/iwlwifi/iwl-dev.h
View File

@ -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 */