diff options
| author |   Joe Perches <joe@perches.com> | 2013-02-03 17:43:58 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-02-04 13:22:33 -0500 |
| commit | b2adaca92c63b9bb8beb021d554f656e387a7648 (patch) | |
| tree | ec0ca7c14267dc090435ddbefe29b110912b851f /drivers/net/ethernet/broadcom/cnic.c | |
| parent | can: Remove unnecessary alloc/OOM messages (diff) | |
| download | linux-dev-b2adaca92c63b9bb8beb021d554f656e387a7648.tar.xz linux-dev-b2adaca92c63b9bb8beb021d554f656e387a7648.zip | |
ethernet: Remove unnecessary alloc/OOM messages, alloc cleanups
alloc failures already get standardized OOM
messages and a dump_stack.
Convert kzalloc's with multiplies to kcalloc.
Convert kmalloc's with multiplies to kmalloc_array.
Fix a few whitespace defects.
Convert a constant 6 to ETH_ALEN.
Use parentheses around sizeof.
Convert vmalloc/memset to vzalloc.
Remove now unused size variables.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/cnic.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/cnic.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c index 1c4dadc7ebbb..149a3a038491 100644 --- a/drivers/net/ethernet/broadcom/cnic.c +++ b/drivers/net/ethernet/broadcom/cnic.c @@ -5425,11 +5425,9 @@ static struct cnic_dev *cnic_alloc_dev(struct net_device *dev, alloc_size = sizeof(struct cnic_dev) + sizeof(struct cnic_local); - cdev = kzalloc(alloc_size , GFP_KERNEL); - if (cdev == NULL) { - netdev_err(dev, "allocate dev struct failure\n"); + cdev = kzalloc(alloc_size, GFP_KERNEL); + if (cdev == NULL) return NULL; - } cdev->netdev = dev; cdev->cnic_priv = (char *)cdev + sizeof(struct cnic_dev); |