9 files changed, 44 insertions, 79 deletions

diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c
index fe8ebfebcc0e..e535c937628b 100644
--- a/drivers/net/wireless/mwifiex/11n.c
+++ b/drivers/net/wireless/mwifiex/11n.c
@@ -101,8 +101,7 @@ int mwifiex_ret_11n_delba(struct mwifiex_private *priv,
 {
         int tid;
         struct mwifiex_tx_ba_stream_tbl *tx_ba_tbl;
-        struct host_cmd_ds_11n_delba *del_ba =
-                (struct host_cmd_ds_11n_delba *) &resp->params.del_ba;
+        struct host_cmd_ds_11n_delba *del_ba = &resp->params.del_ba;
         uint16_t del_ba_param_set = le16_to_cpu(del_ba->del_ba_param_set);
 
         tid = del_ba_param_set >> DELBA_TID_POS;
@@ -147,8 +146,7 @@ int mwifiex_ret_11n_addba_req(struct mwifiex_private *priv,
                               struct host_cmd_ds_command *resp)
 {
         int tid;
-        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp =
-                (struct host_cmd_ds_11n_addba_rsp *) &resp->params.add_ba_rsp;
+        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = &resp->params.add_ba_rsp;
         struct mwifiex_tx_ba_stream_tbl *tx_ba_tbl;
 
         add_ba_rsp->ssn = cpu_to_le16((le16_to_cpu(add_ba_rsp->ssn))
@@ -412,7 +410,7 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
 
                 memcpy((u8 *) bss_co_2040 +
                        sizeof(struct mwifiex_ie_types_header),
-                       (u8 *) bss_desc->bcn_bss_co_2040 +
+                       bss_desc->bcn_bss_co_2040 +
                        sizeof(struct ieee_types_header),
                        le16_to_cpu(bss_co_2040->header.len));
 
@@ -426,10 +424,8 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
                 ext_cap->header.type = cpu_to_le16(WLAN_EID_EXT_CAPABILITY);
                 ext_cap->header.len = cpu_to_le16(sizeof(ext_cap->ext_cap));
 
-                memcpy((u8 *) ext_cap +
-                       sizeof(struct mwifiex_ie_types_header),
-                       (u8 *) bss_desc->bcn_ext_cap +
-                       sizeof(struct ieee_types_header),
+                memcpy((u8 *)ext_cap + sizeof(struct mwifiex_ie_types_header),
+                       bss_desc->bcn_ext_cap + sizeof(struct ieee_types_header),
                        le16_to_cpu(ext_cap->header.len));
 
                 *buffer += sizeof(struct mwifiex_ie_types_extcap);
diff --git a/drivers/net/wireless/mwifiex/11n.h b/drivers/net/wireless/mwifiex/11n.h
index 77646d777dce..28366e9211fb 100644
--- a/drivers/net/wireless/mwifiex/11n.h
+++ b/drivers/net/wireless/mwifiex/11n.h
@@ -105,8 +105,7 @@ static inline u8 mwifiex_space_avail_for_new_ba_stream(
                 priv = adapter->priv[i];
                 if (priv)
                         ba_stream_num += mwifiex_wmm_list_len(
-                                                (struct list_head *)
-                                                &priv->tx_ba_stream_tbl_ptr);
+                                &priv->tx_ba_stream_tbl_ptr);
         }
 
         return ((ba_stream_num <
diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.c b/drivers/net/wireless/mwifiex/11n_rxreorder.c
index 9c44088054dd..89f7c570cd2e 100644
--- a/drivers/net/wireless/mwifiex/11n_rxreorder.c
+++ b/drivers/net/wireless/mwifiex/11n_rxreorder.c
@@ -296,9 +296,7 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta,
  */
 int mwifiex_cmd_11n_addba_req(struct host_cmd_ds_command *cmd, void *data_buf)
 {
-        struct host_cmd_ds_11n_addba_req *add_ba_req =
-                (struct host_cmd_ds_11n_addba_req *)
-                &cmd->params.add_ba_req;
+        struct host_cmd_ds_11n_addba_req *add_ba_req = &cmd->params.add_ba_req;
 
         cmd->command = cpu_to_le16(HostCmd_CMD_11N_ADDBA_REQ);
         cmd->size = cpu_to_le16(sizeof(*add_ba_req) + S_DS_GEN);
@@ -320,9 +318,7 @@ int mwifiex_cmd_11n_addba_rsp_gen(struct mwifiex_private *priv,
                                   struct host_cmd_ds_11n_addba_req
                                   *cmd_addba_req)
 {
-        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp =
-                (struct host_cmd_ds_11n_addba_rsp *)
-                &cmd->params.add_ba_rsp;
+        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = &cmd->params.add_ba_rsp;
         u8 tid;
         int win_size;
         uint16_t block_ack_param_set;
@@ -367,8 +363,7 @@ int mwifiex_cmd_11n_addba_rsp_gen(struct mwifiex_private *priv,
  */
 int mwifiex_cmd_11n_delba(struct host_cmd_ds_command *cmd, void *data_buf)
 {
-        struct host_cmd_ds_11n_delba *del_ba = (struct host_cmd_ds_11n_delba *)
-                &cmd->params.del_ba;
+        struct host_cmd_ds_11n_delba *del_ba = &cmd->params.del_ba;
 
         cmd->command = cpu_to_le16(HostCmd_CMD_11N_DELBA);
         cmd->size = cpu_to_le16(sizeof(*del_ba) + S_DS_GEN);
@@ -398,8 +393,7 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv,
         int start_win, end_win, win_size;
         u16 pkt_index;
 
-        tbl = mwifiex_11n_get_rx_reorder_tbl((struct mwifiex_private *) priv,
-                                             tid, ta);
+        tbl = mwifiex_11n_get_rx_reorder_tbl(priv, tid, ta);
         if (!tbl) {
                 if (pkt_type != PKT_TYPE_BAR)
                         mwifiex_process_rx_packet(priv->adapter, payload);
@@ -520,9 +514,7 @@ mwifiex_del_ba_tbl(struct mwifiex_private *priv, int tid, u8 *peer_mac,
 int mwifiex_ret_11n_addba_resp(struct mwifiex_private *priv,
                                struct host_cmd_ds_command *resp)
 {
-        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp =
-                (struct host_cmd_ds_11n_addba_rsp *)
-                &resp->params.add_ba_rsp;
+        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = &resp->params.add_ba_rsp;
         int tid, win_size;
         struct mwifiex_rx_reorder_tbl *tbl;
         uint16_t block_ack_param_set;
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 87671446e24b..42c1af943111 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -1703,7 +1703,7 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
         wdev_priv = wiphy_priv(wiphy);
         *(unsigned long *)wdev_priv = (unsigned long)adapter;
 
-        set_wiphy_dev(wiphy, (struct device *)priv->adapter->dev);
+        set_wiphy_dev(wiphy, priv->adapter->dev);
 
         ret = wiphy_register(wiphy);
         if (ret < 0) {
diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index d6b4fb04011f..82e63cee1e97 100644
--- a/drivers/net/wireless/mwifiex/join.c
+++ b/drivers/net/wireless/mwifiex/join.c
@@ -1349,22 +1349,16 @@ static int mwifiex_deauthenticate_infra(struct mwifiex_private *priv, u8 *mac)
 {
         u8 mac_address[ETH_ALEN];
         int ret;
-        u8 zero_mac[ETH_ALEN] = { 0, 0, 0, 0, 0, 0 };
 
-        if (mac) {
-                if (!memcmp(mac, zero_mac, sizeof(zero_mac)))
-                        memcpy((u8 *) &mac_address,
-                               (u8 *) &priv->curr_bss_params.bss_descriptor.
-                               mac_address, ETH_ALEN);
-                else
-                        memcpy((u8 *) &mac_address, (u8 *) mac, ETH_ALEN);
-        } else {
-                memcpy((u8 *) &mac_address, (u8 *) &priv->curr_bss_params.
-                       bss_descriptor.mac_address, ETH_ALEN);
-        }
+        if (!mac || is_zero_ether_addr(mac))
+                memcpy(mac_address,
+                       priv->curr_bss_params.bss_descriptor.mac_address,
+                       ETH_ALEN);
+        else
+                memcpy(mac_address, mac, ETH_ALEN);
 
         ret = mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_DEAUTHENTICATE,
-                                    HostCmd_ACT_GEN_SET, 0, &mac_address);
+                                    HostCmd_ACT_GEN_SET, 0, mac_address);
 
         return ret;
 }
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 74f045715723..8fa763fa629a 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1014,14 +1014,12 @@ mwifiex_ret_802_11_scan_get_tlv_ptrs(struct mwifiex_adapter *adapter,
                         case TLV_TYPE_TSFTIMESTAMP:
                                 dev_dbg(adapter->dev, "info: SCAN_RESP: TSF "
                                         "timestamp TLV, len = %d\n", tlv_len);
-                                *tlv_data = (struct mwifiex_ie_types_data *)
-                                        current_tlv;
+                                *tlv_data = current_tlv;
                                 break;
                         case TLV_TYPE_CHANNELBANDLIST:
                                 dev_dbg(adapter->dev, "info: SCAN_RESP: channel"
                                         " band list TLV, len = %d\n", tlv_len);
-                                *tlv_data = (struct mwifiex_ie_types_data *)
-                                        current_tlv;
+                                *tlv_data = current_tlv;
                                 break;
                         default:
                                 dev_err(adapter->dev,
@@ -1226,15 +1224,15 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
                                         bss_entry->beacon_buf);
                         break;
                 case WLAN_EID_BSS_COEX_2040:
-                        bss_entry->bcn_bss_co_2040 = (u8 *) (current_ptr +
-                                        sizeof(struct ieee_types_header));
+                        bss_entry->bcn_bss_co_2040 = current_ptr +
+                                sizeof(struct ieee_types_header);
                         bss_entry->bss_co_2040_offset = (u16) (current_ptr +
                                         sizeof(struct ieee_types_header) -
                                                 bss_entry->beacon_buf);
                         break;
                 case WLAN_EID_EXT_CAPABILITY:
-                        bss_entry->bcn_ext_cap = (u8 *) (current_ptr +
-                                        sizeof(struct ieee_types_header));
+                        bss_entry->bcn_ext_cap = current_ptr +
+                                sizeof(struct ieee_types_header);
                         bss_entry->ext_cap_offset = (u16) (current_ptr +
                                         sizeof(struct ieee_types_header) -
                                         bss_entry->beacon_buf);
@@ -1683,8 +1681,7 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
                                 goto done;
                         }
                         if (element_id == WLAN_EID_DS_PARAMS) {
-                                channel = *(u8 *) (current_ptr +
-                                        sizeof(struct ieee_types_header));
+                                channel = *(current_ptr + sizeof(struct ieee_types_header));
                                 break;
                         }
 
@@ -2010,12 +2007,11 @@ mwifiex_save_curr_bcn(struct mwifiex_private *priv)
 
         if (curr_bss->bcn_bss_co_2040)
                 curr_bss->bcn_bss_co_2040 =
-                        (u8 *) (curr_bss->beacon_buf +
-                                        curr_bss->bss_co_2040_offset);
+                        (curr_bss->beacon_buf + curr_bss->bss_co_2040_offset);
 
         if (curr_bss->bcn_ext_cap)
-                curr_bss->bcn_ext_cap = (u8 *) (curr_bss->beacon_buf +
-                                curr_bss->ext_cap_offset);
+                curr_bss->bcn_ext_cap = curr_bss->beacon_buf +
+                        curr_bss->ext_cap_offset;
 }
 
 /*
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index 40e025da6bc2..1ff1362d8cdf 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -793,8 +793,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_mac_reg_access *mac_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*mac_reg) + S_DS_GEN);
-                mac_reg = (struct host_cmd_ds_mac_reg_access *) &cmd->
-                                                                params.mac_reg;
+                mac_reg = &cmd->params.mac_reg;
                 mac_reg->action = cpu_to_le16(cmd_action);
                 mac_reg->offset =
                         cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -806,8 +805,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_bbp_reg_access *bbp_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*bbp_reg) + S_DS_GEN);
-                bbp_reg = (struct host_cmd_ds_bbp_reg_access *)
-                                                        &cmd->params.bbp_reg;
+                bbp_reg = &cmd->params.bbp_reg;
                 bbp_reg->action = cpu_to_le16(cmd_action);
                 bbp_reg->offset =
                         cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -819,8 +817,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_rf_reg_access *rf_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*rf_reg) + S_DS_GEN);
-                rf_reg = (struct host_cmd_ds_rf_reg_access *)
-                                                        &cmd->params.rf_reg;
+                rf_reg = &cmd->params.rf_reg;
                 rf_reg->action = cpu_to_le16(cmd_action);
                 rf_reg->offset = cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
                 rf_reg->value = (u8) le32_to_cpu(reg_rw->value);
@@ -831,8 +828,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_pmic_reg_access *pmic_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*pmic_reg) + S_DS_GEN);
-                pmic_reg = (struct host_cmd_ds_pmic_reg_access *) &cmd->
-                                params.pmic_reg;
+                pmic_reg = &cmd->params.pmic_reg;
                 pmic_reg->action = cpu_to_le16(cmd_action);
                 pmic_reg->offset =
                                 cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -844,8 +840,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_rf_reg_access *cau_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*cau_reg) + S_DS_GEN);
-                cau_reg = (struct host_cmd_ds_rf_reg_access *)
-                                                        &cmd->params.rf_reg;
+                cau_reg = &cmd->params.rf_reg;
                 cau_reg->action = cpu_to_le16(cmd_action);
                 cau_reg->offset =
                                 cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -856,7 +851,6 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
         {
                 struct mwifiex_ds_read_eeprom *rd_eeprom = data_buf;
                 struct host_cmd_ds_802_11_eeprom_access *cmd_eeprom =
-                        (struct host_cmd_ds_802_11_eeprom_access *)
                         &cmd->params.eeprom;
 
                 cmd->size = cpu_to_le16(sizeof(*cmd_eeprom) + S_DS_GEN);
diff --git a/drivers/net/wireless/mwifiex/sta_cmdresp.c b/drivers/net/wireless/mwifiex/sta_cmdresp.c
index a79ed9bd9695..bd40541ebd5a 100644
--- a/drivers/net/wireless/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/mwifiex/sta_cmdresp.c
@@ -227,7 +227,7 @@ static int mwifiex_ret_get_log(struct mwifiex_private *priv,
                                struct mwifiex_ds_get_stats *stats)
 {
         struct host_cmd_ds_802_11_get_log *get_log =
-                (struct host_cmd_ds_802_11_get_log *) &resp->params.get_log;
+                &resp->params.get_log;
 
         if (stats) {
                 stats->mcast_tx_frame = le32_to_cpu(get_log->mcast_tx_frame);
@@ -282,7 +282,7 @@ static int mwifiex_ret_tx_rate_cfg(struct mwifiex_private *priv,
         u32 i;
         int ret = 0;
 
-        tlv_buf = (u8 *) ((u8 *) rate_cfg) +
+        tlv_buf = ((u8 *)rate_cfg) +
                         sizeof(struct host_cmd_ds_tx_rate_cfg);
         tlv_buf_len = *(u16 *) (tlv_buf + sizeof(u16));
 
@@ -679,39 +679,33 @@ static int mwifiex_ret_reg_access(u16 type, struct host_cmd_ds_command *resp,
         eeprom = data_buf;
         switch (type) {
         case HostCmd_CMD_MAC_REG_ACCESS:
-                r.mac = (struct host_cmd_ds_mac_reg_access *)
-                        &resp->params.mac_reg;
+                r.mac = &resp->params.mac_reg;
                 reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.mac->offset));
                 reg_rw->value = r.mac->value;
                 break;
         case HostCmd_CMD_BBP_REG_ACCESS:
-                r.bbp = (struct host_cmd_ds_bbp_reg_access *)
-                        &resp->params.bbp_reg;
+                r.bbp = &resp->params.bbp_reg;
                 reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.bbp->offset));
                 reg_rw->value = cpu_to_le32((u32) r.bbp->value);
                 break;
 
         case HostCmd_CMD_RF_REG_ACCESS:
-                r.rf = (struct host_cmd_ds_rf_reg_access *)
-                       &resp->params.rf_reg;
+                r.rf = &resp->params.rf_reg;
                 reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.rf->offset));
                 reg_rw->value = cpu_to_le32((u32) r.bbp->value);
                 break;
         case HostCmd_CMD_PMIC_REG_ACCESS:
-                r.pmic = (struct host_cmd_ds_pmic_reg_access *)
-                         &resp->params.pmic_reg;
+                r.pmic = &resp->params.pmic_reg;
                 reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.pmic->offset));
                 reg_rw->value = cpu_to_le32((u32) r.pmic->value);
                 break;
         case HostCmd_CMD_CAU_REG_ACCESS:
-                r.rf = (struct host_cmd_ds_rf_reg_access *)
-                       &resp->params.rf_reg;
+                r.rf = &resp->params.rf_reg;
                 reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.rf->offset));
                 reg_rw->value = cpu_to_le32((u32) r.rf->value);
                 break;
         case HostCmd_CMD_802_11_EEPROM_ACCESS:
-                r.eeprom = (struct host_cmd_ds_802_11_eeprom_access *)
-                           &resp->params.eeprom;
+                r.eeprom = &resp->params.eeprom;
                 pr_debug("info: EEPROM read len=%x\n", r.eeprom->byte_count);
                 if (le16_to_cpu(eeprom->byte_count) <
                     le16_to_cpu(r.eeprom->byte_count)) {
@@ -787,7 +781,7 @@ static int mwifiex_ret_subsc_evt(struct mwifiex_private *priv,
                                  struct mwifiex_ds_misc_subsc_evt *sub_event)
 {
         struct host_cmd_ds_802_11_subsc_evt *cmd_sub_event =
-                (struct host_cmd_ds_802_11_subsc_evt *)&resp->params.subsc_evt;
+                &resp->params.subsc_evt;
 
         /* For every subscribe event command (Get/Set/Clear), FW reports the
          * current set of subscribed events*/
diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c
index 4ace5a3dcd23..e8b27c305367 100644
--- a/drivers/net/wireless/mwifiex/sta_event.c
+++ b/drivers/net/wireless/mwifiex/sta_event.c
@@ -422,7 +422,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
 
                         if (len != -1) {
                                 sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
-                                sinfo.assoc_req_ies = (u8 *)&event->data[len];
+                                sinfo.assoc_req_ies = &event->data[len];
                                 len = (u8 *)sinfo.assoc_req_ies -
                                       (u8 *)&event->frame_control;
                                 sinfo.assoc_req_ies_len =