iwlwifi: virtualize the op_mode

Define the op_mode as an interface with its ops. All the functions
of the op_mode are "private", but its ops is made public in
iwl-op-mode.h.
The drv object starts the op_mode by using the start function in the
public ops.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.c b/drivers/net/wireless/iwlwifi/iwl-testmode.c
index 80955ed06e82..e3cca664c19f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@ -255,7 +255,7 @@ void iwl_testmode_cleanup(struct iwl_priv *priv)
  */
 static int iwl_testmode_ucode(struct ieee80211_hw *hw, struct nlattr **tb)
 {
-        struct iwl_priv *priv = hw->priv;
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_host_cmd cmd;
         struct iwl_rx_packet *pkt;
         struct sk_buff *skb;
@@ -341,7 +341,7 @@ nla_put_failure:
  */
 static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)
 {
-        struct iwl_priv *priv = hw->priv;
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         u32 ofs, val32, cmd;
         u8 val8;
         struct sk_buff *skb;
@@ -458,7 +458,7 @@ cfg_init_calib_error:
  */
 static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
 {
-        struct iwl_priv *priv = hw->priv;
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_trans *trans = trans(priv);
         struct sk_buff *skb;
         unsigned char *rsp_data_ptr = NULL;
@@ -643,7 +643,7 @@ nla_put_failure:
  */
 static int iwl_testmode_trace(struct ieee80211_hw *hw, struct nlattr **tb)
 {
-        struct iwl_priv *priv = hw->priv;
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct sk_buff *skb;
         int status = 0;
         struct device *dev = trans(priv)->dev;
@@ -718,7 +718,7 @@ static int iwl_testmode_trace_dump(struct ieee80211_hw *hw, struct nlattr **tb,
                                    struct sk_buff *skb,
                                    struct netlink_callback *cb)
 {
-        struct iwl_priv *priv = hw->priv;
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         int idx, length;
 
         if (priv->testmode_trace.trace_enabled &&
@@ -762,7 +762,7 @@ static int iwl_testmode_trace_dump(struct ieee80211_hw *hw, struct nlattr **tb,
  */
 static int iwl_testmode_ownership(struct ieee80211_hw *hw, struct nlattr **tb)
 {
-        struct iwl_priv *priv = hw->priv;
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         u8 owner;
 
         if (!tb[IWL_TM_ATTR_UCODE_OWNER]) {
@@ -876,7 +876,7 @@ static int iwl_testmode_indirect_write(struct iwl_priv *priv, u32 addr,
 static int iwl_testmode_indirect_mem(struct ieee80211_hw *hw,
         struct nlattr **tb)
 {
-        struct iwl_priv *priv = hw->priv;
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         u32 addr, size, cmd;
         unsigned char *buf;
 
@@ -910,7 +910,7 @@ static int iwl_testmode_buffer_dump(struct ieee80211_hw *hw, struct nlattr **tb,
                                    struct sk_buff *skb,
                                    struct netlink_callback *cb)
 {
-        struct iwl_priv *priv = hw->priv;
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         int idx, length;
 
         if (priv->testmode_mem.read_in_progress) {
@@ -961,7 +961,7 @@ static int iwl_testmode_buffer_dump(struct ieee80211_hw *hw, struct nlattr **tb,
 int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)
 {
         struct nlattr *tb[IWL_TM_ATTR_MAX];
-        struct iwl_priv *priv = hw->priv;
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         int result;
 
         result = nla_parse(tb, IWL_TM_ATTR_MAX - 1, data, len,
@@ -1038,7 +1038,7 @@ int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb,
                       void *data, int len)
 {
         struct nlattr *tb[IWL_TM_ATTR_MAX];
-        struct iwl_priv *priv = hw->priv;
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         int result;
         u32 cmd;