diff options
author | Joe Perches <joe@perches.com> | 2013-02-03 12:43:58 -0500 |
---|---|---|
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 | 09da6c5f60ad2e2018366e47192a9ddbccfb3ac5 (diff) |
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, | |||
5425 | 5425 | ||
5426 | alloc_size = sizeof(struct cnic_dev) + sizeof(struct cnic_local); | 5426 | alloc_size = sizeof(struct cnic_dev) + sizeof(struct cnic_local); |
5427 | 5427 | ||
5428 | cdev = kzalloc(alloc_size , GFP_KERNEL); | 5428 | cdev = kzalloc(alloc_size, GFP_KERNEL); |
5429 | if (cdev == NULL) { | 5429 | if (cdev == NULL) |
5430 | netdev_err(dev, "allocate dev struct failure\n"); | ||
5431 | return NULL; | 5430 | return NULL; |
5432 | } | ||
5433 | 5431 | ||
5434 | cdev->netdev = dev; | 5432 | cdev->netdev = dev; |
5435 | cdev->cnic_priv = (char *)cdev + sizeof(struct cnic_dev); | 5433 | cdev->cnic_priv = (char *)cdev + sizeof(struct cnic_dev); |