diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-07-11 09:48:51 +0200 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-07-21 16:29:55 +0200 |
| commit | d593411084a56124aa9d80aafa15db8463b2d8f7 (patch) | |
| tree | cbe550ecb8e7c0a7700e0ed168f1553c25b3d183 /drivers/net/wireless/iwlwifi/iwl-agn.h | |
| parent | iwlagn: transport layer receives struct iwl_trans* (diff) | |
| download | linux-d593411084a56124aa9d80aafa15db8463b2d8f7.tar.xz linux-d593411084a56124aa9d80aafa15db8463b2d8f7.zip | |
iwlagn: simplify the bus architecture
Call iwl_probe with a ready iwl_bus struct. This means that the bus layer
assigns the irq, dev and iwl_bus_ops pointers to iwl_bus before giving it to
iwl_probe.
The device specific struct is allocated together with the common iwl_bus struct
by the bus specific layer. The pointer to the aggregate struct is passed to the
upper layer that holds a pointer to iwl_bus instead of an embedded iw_bus.
The private data given to the PCI subsystem is now iwl_bus and not iwl_priv.
Provide bus_* inliners on the way in order to simplify the syntax.
Rename iwl-pci.h -> iwl-bus.h since it is bus agnostic and represent the
external of the bus layer.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h index 496ab99c424d..78dccde88aaf 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn.h @@ -336,8 +336,7 @@ void iwl_testmode_cleanup(struct iwl_priv *priv) } #endif -int iwl_probe(void *bus_specific, struct iwl_bus_ops *bus_ops, - struct iwl_cfg *cfg); +int iwl_probe(struct iwl_bus *bus, struct iwl_cfg *cfg); void __devexit iwl_remove(struct iwl_priv * priv); #endif /* __iwl_agn_h__ */ |