summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-drv.h
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2012-03-26 17:51:09 +0200
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2012-04-18 16:20:06 +0200
commit9130bab137844d9ad3db6ab524de299cd2b9e39d (patch)
tree4a2b641fe5cb716540d049f11b35cd1d06d5e993 /drivers/net/wireless/iwlwifi/iwl-drv.h
parentmwifiex: corrections in timestamp related code (diff)
downloadlinux-9130bab137844d9ad3db6ab524de299cd2b9e39d.tar.xz
linux-9130bab137844d9ad3db6ab524de299cd2b9e39d.zip
iwlwifi: kill shrd->drv, driver points to transport
The driver layer now holds a pointer to the transport, and shrd->drv is not needed any more, so kill it. 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-drv.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-drv.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.h b/drivers/net/wireless/iwlwifi/iwl-drv.h
index 3b771c1d9096..290a3680ed3e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.h
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.h
@@ -90,6 +90,7 @@
* 8) iwl_ucode_callback starts the wifi implementation to matches the fw
*/
+struct iwl_drv;
/**
* iwl_drv_start - start the drv
*
@@ -102,10 +103,11 @@
* starts the driver: fetches the firmware. This should be called by bus
* specific system flows implementations. For example, the bus specific probe
* function should do bus related operations only, and then call to this
- * function.
+ * function. It returns the driver object or %NULL if an error occured.
*/
-int iwl_drv_start(struct iwl_shared *shrd,
- struct iwl_trans *trans, const struct iwl_cfg *cfg);
+struct iwl_drv *iwl_drv_start(struct iwl_shared *shrd,
+ struct iwl_trans *trans,
+ const struct iwl_cfg *cfg);
/**
* iwl_drv_stop - stop the drv
@@ -118,6 +120,6 @@ int iwl_drv_start(struct iwl_shared *shrd,
* implementations. For example, the bus specific remove function should first
* call this function and then do the bus related operations only.
*/
-void iwl_drv_stop(struct iwl_shared *shrd);
+void iwl_drv_stop(struct iwl_drv *drv);
#endif /* __iwl_drv_h__ */