diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-07-11 12:18:48 +0400 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-07-21 18:30:07 +0400 |
| commit | c1c81401de30448baf35ec2f689ad21faffb0536 (patch) | |
| tree | 872aba1888985f591444fff76fce41193f37922e /drivers/net/wireless/iwlwifi/iwl-bus.h | |
| parent | d593411084a56124aa9d80aafa15db8463b2d8f7 (diff) | |
| download | linux-c1c81401de30448baf35ec2f689ad21faffb0536.tar.xz | |
iwlagn: iwl_bus holds drv_data as void * instead of iwl_priv
The price to pay is the access to the log system. Therefore logs from bus layer
are sent by dev_printk instead of IWL_XXXX.
Rename bus->priv to bus->drv_data to make the separation even clearer.
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-bus.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-bus.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-bus.h b/drivers/net/wireless/iwlwifi/iwl-bus.h index fef62e6c2c88..f3ee1c0c004c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-bus.h +++ b/drivers/net/wireless/iwlwifi/iwl-bus.h @@ -67,10 +67,9 @@ struct iwl_bus; /** * struct iwl_bus_ops - bus specific operations - * @get_pm_support: must returns true if the bus can go to sleep * @apm_config: will be called during the config of the APM configuration - * @set_drv_data: set the priv pointer to the bus layer + * @set_drv_data: set the drv_data pointer to the bus layer * @get_hw_id: prints the hw_id in the provided buffer * @write8: write a byte to register at offset ofs * @write32: write a dword to register at offset ofs @@ -88,9 +87,7 @@ struct iwl_bus_ops { struct iwl_bus { /* Common data to all buses */ - - /*TODO: priv should be void * */ - struct iwl_priv *priv; /* driver's context */ + void *drv_data; /* driver's context */ struct device *dev; struct iwl_bus_ops *ops; |