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/qlogic/netxen/netxen_nic_main.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/qlogic/netxen/netxen_nic_main.c')
-rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 7a849fc55a66..501f49207da5 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | |||
@@ -3176,11 +3176,8 @@ netxen_list_config_vlan_ip(struct netxen_adapter *adapter, | |||
3176 | } | 3176 | } |
3177 | 3177 | ||
3178 | cur = kzalloc(sizeof(struct nx_vlan_ip_list), GFP_ATOMIC); | 3178 | cur = kzalloc(sizeof(struct nx_vlan_ip_list), GFP_ATOMIC); |
3179 | if (cur == NULL) { | 3179 | if (cur == NULL) |
3180 | printk(KERN_ERR "%s: failed to add vlan ip to list\n", | ||
3181 | adapter->netdev->name); | ||
3182 | return; | 3180 | return; |
3183 | } | ||
3184 | 3181 | ||
3185 | cur->ip_addr = ifa->ifa_address; | 3182 | cur->ip_addr = ifa->ifa_address; |
3186 | list_add_tail(&cur->list, &adapter->vlan_ip_list); | 3183 | list_add_tail(&cur->list, &adapter->vlan_ip_list); |