diff options
| author | Jesper Juhl <jesper.juhl@gmail.com> | 2006-01-10 13:09:01 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-01-10 13:09:01 -0800 |
| commit | 79a34648e488a41be92369c72aa9784bd4d741f9 (patch) | |
| tree | 53ef45fdffa96f7e21e34d2735a8d27051583ac2 /drivers/atm | |
| parent | 12fe2c588df77d60dfe13b432f95d00f76b8c969 (diff) | |
| download | op-kernel-dev-79a34648e488a41be92369c72aa9784bd4d741f9.zip op-kernel-dev-79a34648e488a41be92369c72aa9784bd4d741f9.tar.gz | |
[ATM]: Remove unneeded kmalloc() return value casts + tiny whitespace cleanup
Small cleanups for drivers/atm/zatm.c
Get rid of unneeded cast of kmalloc() return value.
Small whitespace/CodingStyle/formatting cleanup (since I was in there anyway).
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/zatm.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c index 55959e4..f484747 100644 --- a/drivers/atm/zatm.c +++ b/drivers/atm/zatm.c @@ -669,11 +669,13 @@ printk("NONONONOO!!!!\n"); u32 *put; int i; - dsc = (u32 *) kmalloc(uPD98401_TXPD_SIZE*2+ - uPD98401_TXBD_SIZE*ATM_SKB(skb)->iovcnt,GFP_ATOMIC); + dsc = kmalloc(uPD98401_TXPD_SIZE * 2 + + uPD98401_TXBD_SIZE * ATM_SKB(skb)->iovcnt, GFP_ATOMIC); if (!dsc) { - if (vcc->pop) vcc->pop(vcc,skb); - else dev_kfree_skb_irq(skb); + if (vcc->pop) + vcc->pop(vcc, skb); + else + dev_kfree_skb_irq(skb); return -EAGAIN; } /* @@@ should check alignment */ @@ -683,7 +685,7 @@ printk("NONONONOO!!!!\n"); (ATM_SKB(skb)->atm_options & ATM_ATMOPT_CLP ? uPD98401_CLPM_1 : uPD98401_CLPM_0)); dsc[1] = 0; - dsc[2] = ATM_SKB(skb)->iovcnt*uPD98401_TXBD_SIZE; + dsc[2] = ATM_SKB(skb)->iovcnt * uPD98401_TXBD_SIZE; dsc[3] = virt_to_bus(put); for (i = 0; i < ATM_SKB(skb)->iovcnt; i++) { *put++ = ((struct iovec *) skb->data)[i].iov_len; |
