aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/via
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-01-29 08:47:52 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-31 16:20:48 -0500
commit41de8d4cff21a2e81e3d9ff66f5f7c903f9c3ab1 (patch)
treec441a6911ff802233473f31fa29a985e690a816a /drivers/net/ethernet/via
parente404decb0fb017be80552adee894b35307b6c7b4 (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/via')
-rw-r--r--drivers/net/ethernet/via/via-rhine.c1
-rw-r--r--drivers/net/ethernet/via/via-velocity.c4
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index 10b18eb63d25..1b95daa372c4 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -927,7 +927,6 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
927 dev = alloc_etherdev(sizeof(struct rhine_private)); 927 dev = alloc_etherdev(sizeof(struct rhine_private));
928 if (!dev) { 928 if (!dev) {
929 rc = -ENOMEM; 929 rc = -ENOMEM;
930 dev_err(&pdev->dev, "alloc_etherdev failed\n");
931 goto err_out; 930 goto err_out;
932 } 931 }
933 SET_NETDEV_DEV(dev, &pdev->dev); 932 SET_NETDEV_DEV(dev, &pdev->dev);
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index 4128d6b8cc28..2776bbc67936 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -2733,10 +2733,8 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
2733 } 2733 }
2734 2734
2735 dev = alloc_etherdev(sizeof(struct velocity_info)); 2735 dev = alloc_etherdev(sizeof(struct velocity_info));
2736 if (!dev) { 2736 if (!dev)
2737 dev_err(&pdev->dev, "allocate net device failed.\n");
2738 goto out; 2737 goto out;
2739 }
2740 2738
2741 /* Chain it all together */ 2739 /* Chain it all together */
2742 2740