diff options
author | Joe Perches <joe@perches.com> | 2012-01-29 08:47:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-31 16:20:48 -0500 |
commit | 41de8d4cff21a2e81e3d9ff66f5f7c903f9c3ab1 (patch) | |
tree | c441a6911ff802233473f31fa29a985e690a816a /drivers/net/ethernet/qlogic | |
parent | e404decb0fb017be80552adee894b35307b6c7b4 (diff) |
drivers/net: Remove alloc_etherdev error messages
alloc_etherdev has a generic OOM/unable to alloc message.
Remove the duplicative messages after alloc_etherdev calls.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic')
-rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qla3xxx.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 7dd9a4b107e6..64aa44d5dabb 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | |||
@@ -1403,7 +1403,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1403 | 1403 | ||
1404 | netdev = alloc_etherdev(sizeof(struct netxen_adapter)); | 1404 | netdev = alloc_etherdev(sizeof(struct netxen_adapter)); |
1405 | if(!netdev) { | 1405 | if(!netdev) { |
1406 | dev_err(&pdev->dev, "failed to allocate net_device\n"); | ||
1407 | err = -ENOMEM; | 1406 | err = -ENOMEM; |
1408 | goto err_out_free_res; | 1407 | goto err_out_free_res; |
1409 | } | 1408 | } |
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c index 7931531c3a40..d49f6dac51fd 100644 --- a/drivers/net/ethernet/qlogic/qla3xxx.c +++ b/drivers/net/ethernet/qlogic/qla3xxx.c | |||
@@ -3805,7 +3805,6 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev, | |||
3805 | 3805 | ||
3806 | ndev = alloc_etherdev(sizeof(struct ql3_adapter)); | 3806 | ndev = alloc_etherdev(sizeof(struct ql3_adapter)); |
3807 | if (!ndev) { | 3807 | if (!ndev) { |
3808 | pr_err("%s could not alloc etherdev\n", pci_name(pdev)); | ||
3809 | err = -ENOMEM; | 3808 | err = -ENOMEM; |
3810 | goto err_out_free_regions; | 3809 | goto err_out_free_regions; |
3811 | } | 3810 | } |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 69b8e4ef14d9..7bfdf57f4b76 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |||
@@ -1576,7 +1576,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1576 | 1576 | ||
1577 | netdev = alloc_etherdev(sizeof(struct qlcnic_adapter)); | 1577 | netdev = alloc_etherdev(sizeof(struct qlcnic_adapter)); |
1578 | if (!netdev) { | 1578 | if (!netdev) { |
1579 | dev_err(&pdev->dev, "failed to allocate net_device\n"); | ||
1580 | err = -ENOMEM; | 1579 | err = -ENOMEM; |
1581 | goto err_out_free_res; | 1580 | goto err_out_free_res; |
1582 | } | 1581 | } |