Merge branch 'for-3.17/core' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / drivers / atm / idt77252.c

diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index b621f56a36be5850b1abc4d1619b665fbce7ccf3..2b24ed0567281fe46f94e305b75859bfbd91ea75 100644 (file)
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -641,13 +641,11 @@ alloc_scq(struct idt77252_dev *card, int class)
        scq = kzalloc(sizeof(struct scq_info), GFP_KERNEL);
        if (!scq)
                return NULL;
-       scq->base = pci_alloc_consistent(card->pcidev, SCQ_SIZE,
-                                        &scq->paddr);
+       scq->base = pci_zalloc_consistent(card->pcidev, SCQ_SIZE, &scq->paddr);
        if (scq->base == NULL) {
                kfree(scq);
                return NULL;
        }
-       memset(scq->base, 0, SCQ_SIZE);
 
        scq->next = scq->base;
        scq->last = scq->base + (SCQ_ENTRIES - 1);
@@ -972,13 +970,12 @@ init_rsq(struct idt77252_dev *card)
 {
        struct rsq_entry *rsqe;
 
-       card->rsq.base = pci_alloc_consistent(card->pcidev, RSQSIZE,
-                                             &card->rsq.paddr);
+       card->rsq.base = pci_zalloc_consistent(card->pcidev, RSQSIZE,
+                                              &card->rsq.paddr);
        if (card->rsq.base == NULL) {
                printk("%s: can't allocate RSQ.\n", card->name);
                return -1;
        }
-       memset(card->rsq.base, 0, RSQSIZE);
 
        card->rsq.last = card->rsq.base + RSQ_NUM_ENTRIES - 1;
        card->rsq.next = card->rsq.last;
@@ -3400,14 +3397,14 @@ static int init_card(struct atm_dev *dev)
        writel(0, SAR_REG_GP);
 
        /* Initialize RAW Cell Handle Register  */
-       card->raw_cell_hnd = pci_alloc_consistent(card->pcidev, 2 * sizeof(u32),
-                                                 &card->raw_cell_paddr);
+       card->raw_cell_hnd = pci_zalloc_consistent(card->pcidev,
+                                                  2 * sizeof(u32),
+                                                  &card->raw_cell_paddr);
        if (!card->raw_cell_hnd) {
                printk("%s: memory allocation failure.\n", card->name);
                deinit_card(card);
                return -1;
        }
-       memset(card->raw_cell_hnd, 0, 2 * sizeof(u32));
        writel(card->raw_cell_paddr, SAR_REG_RAWHND);
        IPRINTK("%s: raw cell handle is at 0x%p.\n", card->name,
                card->raw_cell_hnd);