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/mellanox/mlx4/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/mellanox/mlx4/main.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index e38c6b2e1578..12ddae6efce3 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c | |||
@@ -2054,10 +2054,8 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data) | |||
2054 | /* Allow large DMA segments, up to the firmware limit of 1 GB */ | 2054 | /* Allow large DMA segments, up to the firmware limit of 1 GB */ |
2055 | dma_set_max_seg_size(&pdev->dev, 1024 * 1024 * 1024); | 2055 | dma_set_max_seg_size(&pdev->dev, 1024 * 1024 * 1024); |
2056 | 2056 | ||
2057 | priv = kzalloc(sizeof *priv, GFP_KERNEL); | 2057 | priv = kzalloc(sizeof(*priv), GFP_KERNEL); |
2058 | if (!priv) { | 2058 | if (!priv) { |
2059 | dev_err(&pdev->dev, "Device struct alloc failed, " | ||
2060 | "aborting.\n"); | ||
2061 | err = -ENOMEM; | 2059 | err = -ENOMEM; |
2062 | goto err_release_regions; | 2060 | goto err_release_regions; |
2063 | } | 2061 | } |