tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[ATM]: [drivers] kill pointless NULL checks and casts before kfree()

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jesper Juhl and committed by
David S. Miller a2c1aa54 3087e1ff

+18 -25
unified split
+2 -4
drivers/atm/fore200e.c
··· 383 383 switch(fore200e->state) { 384 384 385 385 case FORE200E_STATE_COMPLETE: 386 - if (fore200e->stats) 387 - kfree(fore200e->stats); 386 + kfree(fore200e->stats); 388 387 389 388 case FORE200E_STATE_IRQ: 390 389 free_irq(fore200e->irq, fore200e->atm_dev); ··· 962 963 entry, txq->tail, entry->vc_map, entry->skb); 963 964 964 965 /* free copy of misaligned data */ 965 - if (entry->data) 966 - kfree(entry->data); 966 + kfree(entry->data); 967 967 968 968 /* remove DMA mapping */ 969 969 fore200e->bus->dma_unmap(fore200e, entry->tpd->tsd[ 0 ].buffer, entry->tpd->tsd[ 0 ].length,
+2 -4
drivers/atm/he.c
··· 412 412 init_one_failure: 413 413 if (atm_dev) 414 414 atm_dev_deregister(atm_dev); 415 - if (he_dev) 416 - kfree(he_dev); 415 + kfree(he_dev); 417 416 pci_disable_device(pci_dev); 418 417 return err; 419 418 } ··· 2533 2534 open_failed: 2534 2535 2535 2536 if (err) { 2536 - if (he_vcc) 2537 - kfree(he_vcc); 2537 + kfree(he_vcc); 2538 2538 clear_bit(ATM_VF_ADDR, &vcc->flags); 2539 2539 } 2540 2540 else
+10 -10
drivers/atm/nicstar.c
··· 676 676 PRINTK("nicstar%d: RSQ base at 0x%x.\n", i, (u32) card->rsq.base); 677 677 678 678 /* Initialize SCQ0, the only VBR SCQ used */ 679 - card->scq1 = (scq_info *) NULL; 680 - card->scq2 = (scq_info *) NULL; 679 + card->scq1 = NULL; 680 + card->scq2 = NULL; 681 681 card->scq0 = get_scq(VBR_SCQSIZE, NS_VRSCD0); 682 - if (card->scq0 == (scq_info *) NULL) 682 + if (card->scq0 == NULL) 683 683 { 684 684 printk("nicstar%d: can't get SCQ0.\n", i); 685 685 error = 12; ··· 993 993 int i; 994 994 995 995 if (size != VBR_SCQSIZE && size != CBR_SCQSIZE) 996 - return (scq_info *) NULL; 996 + return NULL; 997 997 998 998 scq = (scq_info *) kmalloc(sizeof(scq_info), GFP_KERNEL); 999 - if (scq == (scq_info *) NULL) 1000 - return (scq_info *) NULL; 999 + if (scq == NULL) 1000 + return NULL; 1001 1001 scq->org = kmalloc(2 * size, GFP_KERNEL); 1002 1002 if (scq->org == NULL) 1003 1003 { 1004 1004 kfree(scq); 1005 - return (scq_info *) NULL; 1005 + return NULL; 1006 1006 } 1007 1007 scq->skb = (struct sk_buff **) kmalloc(sizeof(struct sk_buff *) * 1008 1008 (size / NS_SCQE_SIZE), GFP_KERNEL); 1009 - if (scq->skb == (struct sk_buff **) NULL) 1009 + if (scq->skb == NULL) 1010 1010 { 1011 1011 kfree(scq->org); 1012 1012 kfree(scq); 1013 - return (scq_info *) NULL; 1013 + return NULL; 1014 1014 } 1015 1015 scq->num_entries = size / NS_SCQE_SIZE; 1016 1016 scq->base = (ns_scqe *) ALIGN_ADDRESS(scq->org, size); ··· 1498 1498 vc->cbr_scd = NS_FRSCD + frscdi * NS_FRSCD_SIZE; 1499 1499 1500 1500 scq = get_scq(CBR_SCQSIZE, vc->cbr_scd); 1501 - if (scq == (scq_info *) NULL) 1501 + if (scq == NULL) 1502 1502 { 1503 1503 PRINTK("nicstar%d: can't get fixed rate SCQ.\n", card->index); 1504 1504 card->scd2vc[frscdi] = NULL;
+4 -7
drivers/atm/zatm.c
··· 902 902 zatm_dev->tx_bw += vcc->qos.txtp.min_pcr; 903 903 dealloc_shaper(vcc->dev,zatm_vcc->shaper); 904 904 } 905 - if (zatm_vcc->ring) kfree(zatm_vcc->ring); 905 + kfree(zatm_vcc->ring); 906 906 } 907 907 908 908 ··· 1339 1339 return 0; 1340 1340 out: 1341 1341 for (i = 0; i < NR_MBX; i++) 1342 - if (zatm_dev->mbx_start[i] != 0) 1343 - kfree((void *) zatm_dev->mbx_start[i]); 1344 - if (zatm_dev->rx_map != NULL) 1345 - kfree(zatm_dev->rx_map); 1346 - if (zatm_dev->tx_map != NULL) 1347 - kfree(zatm_dev->tx_map); 1342 + kfree(zatm_dev->mbx_start[i]); 1343 + kfree(zatm_dev->rx_map); 1344 + kfree(zatm_dev->tx_map); 1348 1345 free_irq(zatm_dev->irq, dev); 1349 1346 return error; 1350 1347 }