diff options
author | Joe Perches <joe@perches.com> | 2013-03-14 09:07:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-15 08:56:58 -0400 |
commit | d0320f750093d012d3ed69fc1e8b385f654523d5 (patch) | |
tree | 1f9c25c892c33275fb85a993e9a274dc5618370b /drivers/net/ethernet/mellanox/mlx4/cmd.c | |
parent | 68c45a2da34cb44962c6a48f8e474ec6b7853641 (diff) |
drivers:net: Remove dma_alloc_coherent OOM messages
I believe these error messages are already logged
on allocation failure by warn_alloc_failed and so
get a dump_stack on OOM.
Remove the unnecessary additional error logging.
Around these deletions:
o Alignment neatening.
o Remove unnecessary casts of dma_alloc_coherent.
o Hoist assigns from ifs.
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/cmd.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/cmd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c index fdc5f23d8e9f..05267d716e86 100644 --- a/drivers/net/ethernet/mellanox/mlx4/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c | |||
@@ -1837,10 +1837,8 @@ int mlx4_cmd_init(struct mlx4_dev *dev) | |||
1837 | priv->mfunc.vhcr = dma_alloc_coherent(&(dev->pdev->dev), PAGE_SIZE, | 1837 | priv->mfunc.vhcr = dma_alloc_coherent(&(dev->pdev->dev), PAGE_SIZE, |
1838 | &priv->mfunc.vhcr_dma, | 1838 | &priv->mfunc.vhcr_dma, |
1839 | GFP_KERNEL); | 1839 | GFP_KERNEL); |
1840 | if (!priv->mfunc.vhcr) { | 1840 | if (!priv->mfunc.vhcr) |
1841 | mlx4_err(dev, "Couldn't allocate VHCR.\n"); | ||
1842 | goto err_hcr; | 1841 | goto err_hcr; |
1843 | } | ||
1844 | } | 1842 | } |
1845 | 1843 | ||
1846 | priv->cmd.pool = pci_pool_create("mlx4_cmd", dev->pdev, | 1844 | priv->cmd.pool = pci_pool_create("mlx4_cmd", dev->pdev, |