---

yaml --- r: 255794 b: refs/heads/master c: ea3aa93 h: refs/heads/master v: v3
git-mirror · Jun 18, 2011 · 543c55e · 543c55e
1 parent 4de7ba8
commit 543c55e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08321c062f77e379c4a539f1522220b83ab1e84e
+refs/heads/master: ea3aa93055508ae3e3a62f90580c24ec381dcbe2
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/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/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h b/trunk/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 */