iwlagn: move more functions from the start flow to the transport layer
Basically all the nic_init flow should be in the transport layer.
iwl_prepare_card_hw will move to the transport too in a separate patch.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index 215f4d5..9e801d8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -64,19 +64,14 @@
/*This file includes the declaration that are exported from the transport
* layer */
-static inline int trans_rx_init(struct iwl_priv *priv)
+static inline int trans_start_device(struct iwl_priv *priv)
{
- return priv->trans.ops->rx_init(priv);
+ return priv->trans.ops->start_device(priv);
}
-static inline void trans_rx_free(struct iwl_priv *priv)
+static inline void trans_stop_device(struct iwl_priv *priv)
{
- priv->trans.ops->rx_free(priv);
-}
-
-static inline int trans_tx_init(struct iwl_priv *priv)
-{
- return priv->trans.ops->tx_init(priv);
+ priv->trans.ops->stop_device(priv);
}
static inline void trans_tx_start(struct iwl_priv *priv)
@@ -84,16 +79,16 @@
priv->trans.ops->tx_start(priv);
}
+static inline void trans_rx_free(struct iwl_priv *priv)
+{
+ priv->trans.ops->rx_free(priv);
+}
+
static inline void trans_tx_free(struct iwl_priv *priv)
{
priv->trans.ops->tx_free(priv);
}
-static inline void trans_stop_device(struct iwl_priv *priv)
-{
- priv->trans.ops->stop_device(priv);
-}
-
static inline int trans_send_cmd(struct iwl_priv *priv,
struct iwl_host_cmd *cmd)
{