1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 9a3d4d6724f7..ef1104476bd8 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -1159,12 +1159,11 @@ static int mwl8k_rxq_init(struct ieee80211_hw *hw, int index)
 
         size = MWL8K_RX_DESCS * priv->rxd_ops->rxd_size;
 
-        rxq->rxd = pci_alloc_consistent(priv->pdev, size, &rxq->rxd_dma);
+        rxq->rxd = pci_zalloc_consistent(priv->pdev, size, &rxq->rxd_dma);
         if (rxq->rxd == NULL) {
                 wiphy_err(hw->wiphy, "failed to alloc RX descriptors\n");
                 return -ENOMEM;
         }
-        memset(rxq->rxd, 0, size);
 
         rxq->buf = kcalloc(MWL8K_RX_DESCS, sizeof(*rxq->buf), GFP_KERNEL);
         if (rxq->buf == NULL) {
@@ -1451,12 +1450,11 @@ static int mwl8k_txq_init(struct ieee80211_hw *hw, int index)
 
         size = MWL8K_TX_DESCS * sizeof(struct mwl8k_tx_desc);
 
-        txq->txd = pci_alloc_consistent(priv->pdev, size, &txq->txd_dma);
+        txq->txd = pci_zalloc_consistent(priv->pdev, size, &txq->txd_dma);
         if (txq->txd == NULL) {
                 wiphy_err(hw->wiphy, "failed to alloc TX descriptors\n");
                 return -ENOMEM;
         }
-        memset(txq->txd, 0, size);
 
         txq->skb = kcalloc(MWL8K_TX_DESCS, sizeof(*txq->skb), GFP_KERNEL);
         if (txq->skb == NULL) {
@@ -5676,7 +5674,7 @@ MODULE_FIRMWARE("mwl8k/helper_8366.fw");
 MODULE_FIRMWARE("mwl8k/fmimage_8366.fw");
 MODULE_FIRMWARE(MWL8K_8366_AP_FW(MWL8K_8366_AP_FW_API));
 
-static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = {
+static const struct pci_device_id mwl8k_pci_id_table[] = {
         { PCI_VDEVICE(MARVELL, 0x2a0a), .driver_data = MWL8363, },
         { PCI_VDEVICE(MARVELL, 0x2a0c), .driver_data = MWL8363, },
         { PCI_VDEVICE(MARVELL, 0x2a24), .driver_data = MWL8363, },