Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[cascardo/linux.git] / drivers / atm / nicstar.c

diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 700ed15..c7296b5 100644 (file)
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -370,7 +370,8 @@ static int ns_init_card(int i, struct pci_dev *pcidev)
                return error;
         }
 
-       if ((card = kmalloc(sizeof(ns_dev), GFP_KERNEL)) == NULL) {
+       card = kmalloc(sizeof(*card), GFP_KERNEL);
+       if (!card) {
                printk
                    ("nicstar%d: can't allocate memory for device structure.\n",
                     i);
@@ -611,7 +612,7 @@ static int ns_init_card(int i, struct pci_dev *pcidev)
        for (j = 0; j < card->rct_size; j++)
                ns_write_sram(card, j * 4, u32d, 4);
 
-       memset(card->vcmap, 0, NS_MAX_RCTSIZE * sizeof(vc_map));
+       memset(card->vcmap, 0, sizeof(card->vcmap));
 
        for (j = 0; j < NS_FRSCD_NUM; j++)
                card->scd2vc[j] = NULL;
@@ -862,7 +863,7 @@ static scq_info *get_scq(ns_dev *card, int size, u32 scd)
        if (size != VBR_SCQSIZE && size != CBR_SCQSIZE)
                return NULL;
 
-       scq = kmalloc(sizeof(scq_info), GFP_KERNEL);
+       scq = kmalloc(sizeof(*scq), GFP_KERNEL);
        if (!scq)
                return NULL;
         scq->org = dma_alloc_coherent(&card->pcidev->dev,
@@ -871,8 +872,9 @@ static scq_info *get_scq(ns_dev *card, int size, u32 scd)
                kfree(scq);
                return NULL;
        }
-       scq->skb = kmalloc(sizeof(struct sk_buff *) *
-                          (size / NS_SCQE_SIZE), GFP_KERNEL);
+       scq->skb = kmalloc_array(size / NS_SCQE_SIZE,
+                                sizeof(*scq->skb),
+                                GFP_KERNEL);
        if (!scq->skb) {
                dma_free_coherent(&card->pcidev->dev,
                                  2 * size, scq->org, scq->dma);
@@ -2021,7 +2023,8 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
 
                cell = skb->data;
                for (i = ns_rsqe_cellcount(rsqe); i; i--) {
-                       if ((sb = dev_alloc_skb(NS_SMSKBSIZE)) == NULL) {
+                       sb = dev_alloc_skb(NS_SMSKBSIZE);
+                       if (!sb) {
                                printk
                                    ("nicstar%d: Can't allocate buffers for aal0.\n",
                                     card->index);