aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell
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/marvell
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/marvell')
-rw-r--r--drivers/net/ethernet/marvell/skge.c4
-rw-r--r--drivers/net/ethernet/marvell/sky2.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index edb9bda55d55..1d61eaac8587 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -3852,10 +3852,8 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
3852 struct skge_port *skge; 3852 struct skge_port *skge;
3853 struct net_device *dev = alloc_etherdev(sizeof(*skge)); 3853 struct net_device *dev = alloc_etherdev(sizeof(*skge));
3854 3854
3855 if (!dev) { 3855 if (!dev)
3856 dev_err(&hw->pdev->dev, "etherdev alloc failed\n");
3857 return NULL; 3856 return NULL;
3858 }
3859 3857
3860 SET_NETDEV_DEV(dev, &hw->pdev->dev); 3858 SET_NETDEV_DEV(dev, &hw->pdev->dev);
3861 dev->netdev_ops = &skge_netdev_ops; 3859 dev->netdev_ops = &skge_netdev_ops;
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 760c2b17dfd3..82c2c86a1951 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -4700,10 +4700,8 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
4700 struct sky2_port *sky2; 4700 struct sky2_port *sky2;
4701 struct net_device *dev = alloc_etherdev(sizeof(*sky2)); 4701 struct net_device *dev = alloc_etherdev(sizeof(*sky2));
4702 4702
4703 if (!dev) { 4703 if (!dev)
4704 dev_err(&hw->pdev->dev, "etherdev alloc failed\n");
4705 return NULL; 4704 return NULL;
4706 }
4707 4705
4708 SET_NETDEV_DEV(dev, &hw->pdev->dev); 4706 SET_NETDEV_DEV(dev, &hw->pdev->dev);
4709 dev->irq = hw->pdev->irq; 4707 dev->irq = hw->pdev->irq;