33 files changed, 70 insertions, 170 deletions

diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index 630577dd3a7a..956024a636e6 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -69,10 +69,9 @@ static int airo_probe(struct pcmcia_device *p_dev)
 
         /* Allocate space for private device-specific data */
         local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
-        if (!local) {
-                printk(KERN_ERR "airo_cs: no memory for new device\n");
+        if (!local)
                 return -ENOMEM;
-        }
+
         p_dev->priv = local;
 
         return airo_config(p_dev);
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 77fa4286e5e9..5ac5f7ae2721 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -2164,10 +2164,8 @@ static int at76_alloc_urbs(struct at76_priv *priv,
 
         buffer_size = sizeof(struct at76_tx_buffer) + MAX_PADDING_SIZE;
         priv->bulk_out_buffer = kmalloc(buffer_size, GFP_KERNEL);
-        if (!priv->bulk_out_buffer) {
-                dev_err(&interface->dev, "cannot allocate output buffer\n");
+        if (!priv->bulk_out_buffer)
                 return -ENOMEM;
-        }
 
         at76_dbg(DBG_PROC_ENTRY, "%s: EXIT", __func__);
 
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
index 24877b00cbf4..467b60014b7b 100644
--- a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
+++ b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
@@ -288,11 +288,11 @@ struct dfs_pattern_detector *
 dfs_pattern_detector_init(enum nl80211_dfs_regions region)
 {
         struct dfs_pattern_detector *dpd;
+
         dpd = kmalloc(sizeof(*dpd), GFP_KERNEL);
-        if (dpd == NULL) {
-                pr_err("allocation of dfs_pattern_detector failed\n");
+        if (dpd == NULL)
                 return NULL;
-        }
+
         *dpd = default_dpd;
         INIT_LIST_HEAD(&dpd->channel_detectors);
 
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index e5d7958ab948..716058b67557 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -783,7 +783,7 @@ static int ath9k_init_firmware_version(struct ath9k_htc_priv *priv)
         priv->fw_version_major = be16_to_cpu(cmd_rsp.major);
         priv->fw_version_minor = be16_to_cpu(cmd_rsp.minor);
 
-        snprintf(hw->wiphy->fw_version, ETHTOOL_BUSINFO_LEN, "%d.%d",
+        snprintf(hw->wiphy->fw_version, sizeof(hw->wiphy->fw_version), "%d.%d",
                  priv->fw_version_major,
                  priv->fw_version_minor);
 
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index b6a5a08810b8..3ad1fd05c5e7 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -1196,20 +1196,17 @@ void ath9k_rx_cleanup(struct ath9k_htc_priv *priv)
 
 int ath9k_rx_init(struct ath9k_htc_priv *priv)
 {
-        struct ath_hw *ah = priv->ah;
-        struct ath_common *common = ath9k_hw_common(ah);
-        struct ath9k_htc_rxbuf *rxbuf;
         int i = 0;
 
         INIT_LIST_HEAD(&priv->rx.rxbuf);
         spin_lock_init(&priv->rx.rxbuflock);
 
         for (i = 0; i < ATH9K_HTC_RXBUF; i++) {
-                rxbuf = kzalloc(sizeof(struct ath9k_htc_rxbuf), GFP_KERNEL);
-                if (rxbuf == NULL) {
-                        ath_err(common, "Unable to allocate RX buffers\n");
+                struct ath9k_htc_rxbuf *rxbuf =
+                        kzalloc(sizeof(struct ath9k_htc_rxbuf), GFP_KERNEL);
+                if (rxbuf == NULL)
                         goto err;
-                }
+
                 list_add_tail(&rxbuf->list, &priv->rx.rxbuf);
         }
 
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 42cf3c7f1e25..2a2ae403e0e5 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -2981,13 +2981,8 @@ struct ath_gen_timer *ath_gen_timer_alloc(struct ath_hw *ah,
         struct ath_gen_timer *timer;
 
         timer = kzalloc(sizeof(struct ath_gen_timer), GFP_KERNEL);
-
-        if (timer == NULL) {
-                ath_err(ath9k_hw_common(ah),
-                        "Failed to allocate memory for hw timer[%d]\n",
-                        timer_index);
+        if (timer == NULL)
                 return NULL;
-        }
 
         /* allocate a hardware generic timer slot */
         timer_table->timers[timer_index] = timer;
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 54150b6a39ae..96ac433ba7f6 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -1452,17 +1452,7 @@ static void ath_rate_free(void *priv)
 
 static void *ath_rate_alloc_sta(void *priv, struct ieee80211_sta *sta, gfp_t gfp)
 {
-        struct ath_softc *sc = priv;
-        struct ath_rate_priv *rate_priv;
-
-        rate_priv = kzalloc(sizeof(struct ath_rate_priv), gfp);
-        if (!rate_priv) {
-                ath_err(ath9k_hw_common(sc->sc_ah),
-                        "Unable to allocate private rc structure\n");
-                return NULL;
-        }
-
-        return rate_priv;
+        return kzalloc(sizeof(struct ath_rate_priv), gfp);
 }
 
 static void ath_rate_free_sta(void *priv, struct ieee80211_sta *sta,
diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c
index 64b971fdc3cc..d1315b442375 100644
--- a/drivers/net/wireless/ath/wil6210/txrx.c
+++ b/drivers/net/wireless/ath/wil6210/txrx.c
@@ -74,8 +74,6 @@ static int wil_vring_alloc(struct wil6210_priv *wil, struct vring *vring)
         vring->swtail = 0;
         vring->ctx = kzalloc(vring->size * sizeof(vring->ctx[0]), GFP_KERNEL);
         if (!vring->ctx) {
-                wil_err(wil, "vring_alloc [%d] failed to alloc ctx mem\n",
-                        vring->size);
                 vring->va = NULL;
                 return -ENOMEM;
         }
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 79d608caa903..0bb3b76b4b58 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -587,11 +587,9 @@ void wmi_recv_cmd(struct wil6210_priv *wil)
                 evt = kmalloc(ALIGN(offsetof(struct pending_wmi_event,
                                              event.wmi) + len, 4),
                               GFP_KERNEL);
-                if (!evt) {
-                        wil_err(wil, "kmalloc for WMI event (%d) failed\n",
-                                len);
+                if (!evt)
                         return;
-                }
+
                 evt->event.hdr = hdr;
                 cmd = (void *)&evt->event.wmi;
                 wil_memcpy_fromio_32(cmd, src, len);
@@ -838,10 +836,8 @@ int wmi_set_ie(struct wil6210_priv *wil, u8 type, u16 ie_len, const void *ie)
         int rc;
         u16 len = sizeof(struct wmi_set_appie_cmd) + ie_len;
         struct wmi_set_appie_cmd *cmd = kzalloc(len, GFP_KERNEL);
-        if (!cmd) {
-                wil_err(wil, "kmalloc(%d) failed\n", len);
+        if (!cmd)
                 return -ENOMEM;
-        }
 
         cmd->mgmt_frm_type = type;
         /* BUG: FW API define ieLen as u8. Will fix FW */
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index ded03d226a71..b42930f457c2 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -79,10 +79,9 @@ static int atmel_probe(struct pcmcia_device *p_dev)
 
         /* Allocate space for private device-specific data */
         local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
-        if (!local) {
-                printk(KERN_ERR "atmel_cs: no memory for new device\n");
+        if (!local)
                 return -ENOMEM;
-        }
+
         p_dev->priv = local;
 
         return atmel_config(p_dev);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 6e3846ca88be..c06cea88df0d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -413,9 +413,11 @@ static void brcmf_ethtool_get_drvinfo(struct net_device *ndev,
         struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_pub *drvr = ifp->drvr;
 
-        sprintf(info->driver, KBUILD_MODNAME);
-        sprintf(info->version, "%lu", drvr->drv_version);
-        sprintf(info->bus_info, "%s", dev_name(drvr->bus_if->dev));
+        strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
+        snprintf(info->version, sizeof(info->version), "%lu",
+                 drvr->drv_version);
+        strlcpy(info->bus_info, dev_name(drvr->bus_if->dev),
+                sizeof(info->bus_info));
 }
 
 static const struct ethtool_ops brcmf_ethtool_ops = {
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 35817631ea06..4469321c0eb3 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -1443,10 +1443,9 @@ brcmf_sdbrcm_read_control(struct brcmf_sdio *bus, u8 *hdr, uint len, uint doff)
 
         if (bus->rxblen)
                 buf = vzalloc(bus->rxblen);
-        if (!buf) {
-                brcmf_err("no memory for control frame\n");
+        if (!buf)
                 goto done;
-        }
+
         rbuf = bus->rxbuf;
         pad = ((unsigned long)rbuf % BRCMF_SDALIGN);
         if (pad)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index a55994d33763..42289e9ea886 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -354,11 +354,10 @@ brcmf_usbdev_qinit(struct list_head *q, int qsize)
         int i;
         struct brcmf_usbreq *req, *reqs;
 
-        reqs = kzalloc(sizeof(struct brcmf_usbreq) * qsize, GFP_ATOMIC);
-        if (reqs == NULL) {
-                brcmf_err("fail to allocate memory!\n");
+        reqs = kcalloc(qsize, sizeof(struct brcmf_usbreq), GFP_ATOMIC);
+        if (reqs == NULL)
                 return NULL;
-        }
+
         req = reqs;
 
         for (i = 0; i < qsize; i++) {
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index d92b21a8e597..04d5e6442bf6 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -4478,13 +4478,10 @@ static int ipw2100_tx_allocate(struct ipw2100_priv *priv)
                 return err;
         }
 
-        priv->tx_buffers =
-            kmalloc(TX_PENDED_QUEUE_LENGTH * sizeof(struct ipw2100_tx_packet),
-                    GFP_ATOMIC);
+        priv->tx_buffers = kmalloc_array(TX_PENDED_QUEUE_LENGTH,
+                                         sizeof(struct ipw2100_tx_packet),
+                                         GFP_ATOMIC);
         if (!priv->tx_buffers) {
-                printk(KERN_ERR DRV_NAME
-                       ": %s: alloc failed form tx buffers.\n",
-                       priv->net_dev->name);
                 bd_queue_free(priv, &priv->tx_queue);
                 return -ENOMEM;
         }
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 844f201b7b70..3e824b8fa83d 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -11327,7 +11327,6 @@ static int ipw_up(struct ipw_priv *priv)
                 if (!(priv->config & CFG_CUSTOM_MAC))
                         eeprom_parse_mac(priv, priv->mac_addr);
                 memcpy(priv->net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
-                memcpy(priv->net_dev->perm_addr, priv->mac_addr, ETH_ALEN);
 
                 ipw_set_geo(priv);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h
index de3c24a5a620..b545178e46e3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fw.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw.h
@@ -171,7 +171,7 @@ struct iwl_tlv_calib_ctrl {
 struct iwl_fw {
         u32 ucode_ver;
 
-        char fw_version[ETHTOOL_BUSINFO_LEN];
+        char fw_version[ETHTOOL_FWVERS_LEN];
 
         /* ucode images */
         struct fw_img img[IWL_UCODE_TYPE_MAX];
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index 61735db3b051..116f4aba08d6 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -2081,10 +2081,8 @@ struct wireless_dev *lbs_cfg_alloc(struct device *dev)
         lbs_deb_enter(LBS_DEB_CFG80211);
 
         wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);
-        if (!wdev) {
-                dev_err(dev, "cannot allocate wireless device\n");
+        if (!wdev)
                 return ERR_PTR(-ENOMEM);
-        }
 
         wdev->wiphy = wiphy_new(&lbs_cfg80211_ops, sizeof(struct lbs_private));
         if (!wdev->wiphy) {
diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c
index 48cc46bc152f..25596ab0c576 100644
--- a/drivers/net/wireless/mwifiex/11n.c
+++ b/drivers/net/wireless/mwifiex/11n.c
@@ -494,11 +494,8 @@ void mwifiex_create_ba_tbl(struct mwifiex_private *priv, u8 *ra, int tid,
         if (!mwifiex_get_ba_tbl(priv, tid, ra)) {
                 new_node = kzalloc(sizeof(struct mwifiex_tx_ba_stream_tbl),
                                    GFP_ATOMIC);
-                if (!new_node) {
-                        dev_err(priv->adapter->dev,
-                                "%s: failed to alloc new_node\n", __func__);
+                if (!new_node)
                         return;
-                }
 
                 INIT_LIST_HEAD(&new_node->list);
 
diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.c b/drivers/net/wireless/mwifiex/11n_rxreorder.c
index 4a97acd170f7..5e796f847088 100644
--- a/drivers/net/wireless/mwifiex/11n_rxreorder.c
+++ b/drivers/net/wireless/mwifiex/11n_rxreorder.c
@@ -272,11 +272,8 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta,
         }
         /* if !tbl then create one */
         new_node = kzalloc(sizeof(struct mwifiex_rx_reorder_tbl), GFP_KERNEL);
-        if (!new_node) {
-                dev_err(priv->adapter->dev, "%s: failed to alloc new_node\n",
-                        __func__);
+        if (!new_node)
                 return;
-        }
 
         INIT_LIST_HEAD(&new_node->list);
         new_node->tid = tid;
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 81c84a29308f..dc5357c0098f 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -1820,10 +1820,8 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy,
 
         priv->user_scan_cfg = kzalloc(sizeof(struct mwifiex_user_scan_cfg),
                                       GFP_KERNEL);
-        if (!priv->user_scan_cfg) {
-                dev_err(priv->adapter->dev, "failed to alloc scan_req\n");
+        if (!priv->user_scan_cfg)
                 return -ENOMEM;
-        }
 
         priv->scan_request = request;
 
@@ -2103,7 +2101,6 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
         dev->ieee80211_ptr = priv->wdev;
         dev->ieee80211_ptr->iftype = priv->bss_mode;
         memcpy(dev->dev_addr, wiphy->perm_addr, ETH_ALEN);
-        memcpy(dev->perm_addr, wiphy->perm_addr, ETH_ALEN);
         SET_NETDEV_DEV(dev, wiphy_dev(wiphy));
 
         dev->flags |= IFF_BROADCAST | IFF_MULTICAST;
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c
index 5f438e6c2155..2b125beecf2c 100644
--- a/drivers/net/wireless/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/mwifiex/cmdevt.c
@@ -334,20 +334,15 @@ static int mwifiex_dnld_sleep_confirm_cmd(struct mwifiex_adapter *adapter)
 int mwifiex_alloc_cmd_buffer(struct mwifiex_adapter *adapter)
 {
         struct cmd_ctrl_node *cmd_array;
-        u32 buf_size;
         u32 i;
 
         /* Allocate and initialize struct cmd_ctrl_node */
-        buf_size = sizeof(struct cmd_ctrl_node) * MWIFIEX_NUM_OF_CMD_BUFFER;
-        cmd_array = kzalloc(buf_size, GFP_KERNEL);
-        if (!cmd_array) {
-                dev_err(adapter->dev, "%s: failed to alloc cmd_array\n",
-                        __func__);
+        cmd_array = kcalloc(MWIFIEX_NUM_OF_CMD_BUFFER,
+                            sizeof(struct cmd_ctrl_node), GFP_KERNEL);
+        if (!cmd_array)
                 return -ENOMEM;
-        }
 
         adapter->cmd_pool = cmd_array;
-        memset(adapter->cmd_pool, 0, buf_size);
 
         /* Allocate and initialize command buffers */
         for (i = 0; i < MWIFIEX_NUM_OF_CMD_BUFFER; i++) {
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index 820a19cfa562..e38aa9b3663d 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -39,11 +39,8 @@ static int mwifiex_add_bss_prio_tbl(struct mwifiex_private *priv)
         unsigned long flags;
 
         bss_prio = kzalloc(sizeof(struct mwifiex_bss_prio_node), GFP_KERNEL);
-        if (!bss_prio) {
-                dev_err(adapter->dev, "%s: failed to alloc bss_prio\n",
-                        __func__);
+        if (!bss_prio)
                 return -ENOMEM;
-        }
 
         bss_prio->priv = priv;
         INIT_LIST_HEAD(&bss_prio->list);
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 949234fcf8c6..e0cce1b52d55 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1309,7 +1309,6 @@ int mwifiex_scan_networks(struct mwifiex_private *priv,
         struct cmd_ctrl_node *cmd_node;
         union mwifiex_scan_cmd_config_tlv *scan_cfg_out;
         struct mwifiex_ie_types_chan_list_param_set *chan_list_out;
-        u32 buf_size;
         struct mwifiex_chan_scan_param_set *scan_chan_list;
         u8 filtered_scan;
         u8 scan_current_chan_only;
@@ -1332,18 +1331,16 @@ int mwifiex_scan_networks(struct mwifiex_private *priv,
         spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
 
         scan_cfg_out = kzalloc(sizeof(union mwifiex_scan_cmd_config_tlv),
-                                                                GFP_KERNEL);
+                               GFP_KERNEL);
         if (!scan_cfg_out) {
-                dev_err(adapter->dev, "failed to alloc scan_cfg_out\n");
                 ret = -ENOMEM;
                 goto done;
         }
 
-        buf_size = sizeof(struct mwifiex_chan_scan_param_set) *
-                                                MWIFIEX_USER_SCAN_CHAN_MAX;
-        scan_chan_list = kzalloc(buf_size, GFP_KERNEL);
+        scan_chan_list = kcalloc(MWIFIEX_USER_SCAN_CHAN_MAX,
+                                 sizeof(struct mwifiex_chan_scan_param_set),
+                                 GFP_KERNEL);
         if (!scan_chan_list) {
-                dev_err(adapter->dev, "failed to alloc scan_chan_list\n");
                 kfree(scan_cfg_out);
                 ret = -ENOMEM;
                 goto done;
@@ -1461,12 +1458,9 @@ static int mwifiex_update_curr_bss_params(struct mwifiex_private *priv,
         unsigned long flags;
 
         /* Allocate and fill new bss descriptor */
-        bss_desc = kzalloc(sizeof(struct mwifiex_bssdescriptor),
-                        GFP_KERNEL);
-        if (!bss_desc) {
-                dev_err(priv->adapter->dev, " failed to alloc bss_desc\n");
+        bss_desc = kzalloc(sizeof(struct mwifiex_bssdescriptor), GFP_KERNEL);
+        if (!bss_desc)
                 return -ENOMEM;
-        }
 
         ret = mwifiex_fill_new_bss_desc(priv, bss, bss_desc);
         if (ret)
@@ -1880,10 +1874,8 @@ static int mwifiex_scan_specific_ssid(struct mwifiex_private *priv,
         }
 
         scan_cfg = kzalloc(sizeof(struct mwifiex_user_scan_cfg), GFP_KERNEL);
-        if (!scan_cfg) {
-                dev_err(adapter->dev, "failed to alloc scan_cfg\n");
+        if (!scan_cfg)
                 return -ENOMEM;
-        }
 
         scan_cfg->ssid_list = req_ssid;
         scan_cfg->num_ssids = 1;
@@ -1997,11 +1989,8 @@ mwifiex_save_curr_bcn(struct mwifiex_private *priv)
                 kfree(priv->curr_bcn_buf);
                 priv->curr_bcn_buf = kmalloc(curr_bss->beacon_buf_size,
                                              GFP_ATOMIC);
-                if (!priv->curr_bcn_buf) {
-                        dev_err(priv->adapter->dev,
-                                "failed to alloc curr_bcn_buf\n");
+                if (!priv->curr_bcn_buf)
                         return;
-                }
         }
 
         memcpy(priv->curr_bcn_buf, curr_bss->beacon_buf,
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index e35b67a9e6a6..d3fb9a14580a 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -716,11 +716,8 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
 
         /* Assume that the allocated buffer is 8-byte aligned */
         fwbuf = kzalloc(MWIFIEX_UPLD_SIZE, GFP_KERNEL);
-        if (!fwbuf) {
-                dev_err(adapter->dev,
-                        "unable to alloc buffer for FW. Terminating dnld\n");
+        if (!fwbuf)
                 return -ENOMEM;
-        }
 
         /* Perform firmware data transfer */
         do {
@@ -1518,7 +1515,6 @@ static int mwifiex_alloc_sdio_mpa_buffers(struct mwifiex_adapter *adapter,
 
         card->mpa_tx.buf = kzalloc(mpa_tx_buf_size, GFP_KERNEL);
         if (!card->mpa_tx.buf) {
-                dev_err(adapter->dev, "could not alloc buffer for MP-A TX\n");
                 ret = -1;
                 goto error;
         }
@@ -1527,7 +1523,6 @@ static int mwifiex_alloc_sdio_mpa_buffers(struct mwifiex_adapter *adapter,
 
         card->mpa_rx.buf = kzalloc(mpa_rx_buf_size, GFP_KERNEL);
         if (!card->mpa_rx.buf) {
-                dev_err(adapter->dev, "could not alloc buffer for MP-A RX\n");
                 ret = -1;
                 goto error;
         }
@@ -1680,10 +1675,8 @@ static int mwifiex_init_sdio(struct mwifiex_adapter *adapter)
 
         /* Allocate buffers for SDIO MP-A */
         card->mp_regs = kzalloc(MAX_MP_REGS, GFP_KERNEL);
-        if (!card->mp_regs) {
-                dev_err(adapter->dev, "failed to alloc mp_regs\n");
+        if (!card->mp_regs)
                 return -ENOMEM;
-        }
 
         ret = mwifiex_alloc_sdio_mpa_buffers(adapter,
                                              SDIO_MP_TX_AGGR_DEF_BUF_SIZE,
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index 0d018460daf9..7eef74564a92 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -261,11 +261,9 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
 
                 /* Allocate and fill new bss descriptor */
                 bss_desc = kzalloc(sizeof(struct mwifiex_bssdescriptor),
-                                GFP_KERNEL);
-                if (!bss_desc) {
-                        dev_err(priv->adapter->dev, " failed to alloc bss_desc\n");
+                                   GFP_KERNEL);
+                if (!bss_desc)
                         return -ENOMEM;
-                }
 
                 ret = mwifiex_fill_new_bss_desc(priv, bss, bss_desc);
                 if (ret)
@@ -631,11 +629,8 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv,
                 }
         }
         buf = kzalloc(MWIFIEX_SIZE_OF_CMD_BUFFER, GFP_KERNEL);
-        if (!buf) {
-                dev_err(priv->adapter->dev, "%s: failed to alloc cmd buffer\n",
-                        __func__);
+        if (!buf)
                 return -ENOMEM;
-        }
 
         txp_cfg = (struct host_cmd_ds_txpwr_cfg *) buf;
         txp_cfg->action = cpu_to_le16(HostCmd_ACT_GEN_SET);
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c
index 135d96df2063..32adc878041d 100644
--- a/drivers/net/wireless/mwifiex/wmm.c
+++ b/drivers/net/wireless/mwifiex/wmm.c
@@ -109,12 +109,9 @@ mwifiex_wmm_allocate_ralist_node(struct mwifiex_adapter *adapter, u8 *ra)
         struct mwifiex_ra_list_tbl *ra_list;
 
         ra_list = kzalloc(sizeof(struct mwifiex_ra_list_tbl), GFP_ATOMIC);
-
-        if (!ra_list) {
-                dev_err(adapter->dev, "%s: failed to alloc ra_list\n",
-                        __func__);
+        if (!ra_list)
                 return NULL;
-        }
+
         INIT_LIST_HEAD(&ra_list->list);
         skb_queue_head_init(&ra_list->skb_head);
 
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index 88e3ad2d1db8..38ec8d19ac29 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -853,12 +853,8 @@ void __orinoco_ev_rx(struct net_device *dev, struct hermes *hw)
         int err;
 
         desc = kmalloc(sizeof(*desc), GFP_ATOMIC);
-        if (!desc) {
-                printk(KERN_WARNING
-                       "%s: Can't allocate space for RX descriptor\n",
-                       dev->name);
+        if (!desc)
                 goto update_stats;
-        }
 
         rxfid = hermes_read_regn(hw, RXFID);
 
@@ -1336,10 +1332,9 @@ static void qbuf_scan(struct orinoco_private *priv, void *buf,
         unsigned long flags;
 
         sd = kmalloc(sizeof(*sd), GFP_ATOMIC);
-        if (!sd) {
-                printk(KERN_ERR "%s: failed to alloc memory\n", __func__);
+        if (!sd)
                 return;
-        }
+
         sd->buf = buf;
         sd->len = len;
         sd->type = type;
@@ -1357,10 +1352,9 @@ static void qabort_scan(struct orinoco_private *priv)
         unsigned long flags;
 
         sd = kmalloc(sizeof(*sd), GFP_ATOMIC);
-        if (!sd) {
-                printk(KERN_ERR "%s: failed to alloc memory\n", __func__);
+        if (!sd)
                 return;
-        }
+
         sd->len = -1; /* Abort */
 
         spin_lock_irqsave(&priv->scan_lock, flags);
@@ -2290,7 +2284,6 @@ int orinoco_if_add(struct orinoco_private *priv,
         netif_carrier_off(dev);
 
         memcpy(dev->dev_addr, wiphy->perm_addr, ETH_ALEN);
-        memcpy(dev->perm_addr, wiphy->perm_addr, ETH_ALEN);
 
         dev->base_addr = base_addr;
         dev->irq = irq;
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index 1f7858588919..b9deef66cf4b 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -510,11 +510,8 @@ static int p54u_upload_firmware_3887(struct ieee80211_hw *dev)
                 return err;
 
         tmp = buf = kmalloc(P54U_FW_BLOCK, GFP_KERNEL);
-        if (!buf) {
-                dev_err(&priv->udev->dev, "(p54usb) cannot allocate firmware"
-                                          "upload buffer!\n");
+        if (!buf)
                 return -ENOMEM;
-        }
 
         left = block_size = min((size_t)P54U_FW_BLOCK, priv->fw->size);
         strcpy(buf, p54u_firmware_upload_3887);
@@ -637,11 +634,8 @@ static int p54u_upload_firmware_net2280(struct ieee80211_hw *dev)
         const u8 *data;
 
         buf = kmalloc(512, GFP_KERNEL);
-        if (!buf) {
-                dev_err(&priv->udev->dev, "(p54usb) firmware buffer "
-                                          "alloc failed!\n");
+        if (!buf)
                 return -ENOMEM;
-        }
 
 #define P54U_WRITE(type, addr, data) \
         do {\
diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c
index c5404cb59e08..9f19cceab487 100644
--- a/drivers/net/wireless/prism54/islpci_mgt.c
+++ b/drivers/net/wireless/prism54/islpci_mgt.c
@@ -123,11 +123,8 @@ islpci_mgmt_rx_fill(struct net_device *ndev)
 
                 if (buf->mem == NULL) {
                         buf->mem = kmalloc(MGMT_FRAME_SIZE, GFP_ATOMIC);
-                        if (!buf->mem) {
-                                printk(KERN_WARNING
-                                       "Error allocating management frame.\n");
+                        if (!buf->mem)
                                 return -ENOMEM;
-                        }
                         buf->size = MGMT_FRAME_SIZE;
                 }
                 if (buf->pci_addr == 0) {
@@ -356,14 +353,11 @@ islpci_mgt_receive(struct net_device *ndev)
 
                 /* Determine frame size, skipping OID_INL_TUNNEL headers. */
                 size = PIMFOR_HEADER_SIZE + header->length;
-                frame = kmalloc(sizeof (struct islpci_mgmtframe) + size,
+                frame = kmalloc(sizeof(struct islpci_mgmtframe) + size,
                                 GFP_ATOMIC);
-                if (!frame) {
-                        printk(KERN_WARNING
-                               "%s: Out of memory, cannot handle oid 0x%08x\n",
-                               ndev->name, header->oid);
+                if (!frame)
                         continue;
-                }
+
                 frame->ndev = ndev;
                 memcpy(&frame->buf, header, size);
                 frame->header = (pimfor_header_t *) frame->buf;
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index fe2f272689aa..525fd7521dff 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -1621,11 +1621,8 @@ static void set_multicast_list(struct usbnet *usbdev)
         } else if (mc_count) {
                 int i = 0;
 
-                mc_addrs = kmalloc(mc_count * ETH_ALEN, GFP_ATOMIC);
+                mc_addrs = kmalloc_array(mc_count, ETH_ALEN, GFP_ATOMIC);
                 if (!mc_addrs) {
-                        netdev_warn(usbdev->net,
-                                    "couldn't alloc %d bytes of memory\n",
-                                    mc_count * ETH_ALEN);
                         netif_addr_unlock_bh(usbdev->net);
                         return;
                 }
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
index 18b0bc51766b..bb7cc90bafb2 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
@@ -341,7 +341,7 @@ static struct rtl_hal_cfg rtl8723ae_hal_cfg = {
         .maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15,
 };
 
-static struct pci_device_id rtl8723ae_pci_ids[] __devinitdata = {
+static struct pci_device_id rtl8723ae_pci_ids[] = {
         {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8723, rtl8723ae_hal_cfg)},
         {},
 };
diff --git a/drivers/net/wireless/ti/wlcore/wlcore_i.h b/drivers/net/wireless/ti/wlcore/wlcore_i.h
index c845b0ef7f4b..508f5b0f8a70 100644
--- a/drivers/net/wireless/ti/wlcore/wlcore_i.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore_i.h
@@ -111,9 +111,9 @@ enum {
 
 struct wl1271_chip {
         u32 id;
-        char fw_ver_str[ETHTOOL_BUSINFO_LEN];
+        char fw_ver_str[ETHTOOL_FWVERS_LEN];
         unsigned int fw_ver[NUM_FW_VER];
-        char phy_fw_ver_str[ETHTOOL_BUSINFO_LEN];
+        char phy_fw_ver_str[ETHTOOL_FWVERS_LEN];
 };
 
 #define NUM_TX_QUEUES              4
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index ef2b171e3514..7ef0b4a181e1 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -155,7 +155,6 @@ static int upload_code(struct usb_device *udev,
          */
         p = kmalloc(MAX_TRANSFER_SIZE, GFP_KERNEL);
         if (!p) {
-                dev_err(&udev->dev, "out of memory\n");
                 r = -ENOMEM;
                 goto error;
         }