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/xilinx | |
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/xilinx')
-rw-r--r-- | drivers/net/ethernet/xilinx/ll_temac_main.c | 5 | ||||
-rw-r--r-- | drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/xilinx/xilinx_emaclite.c | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index f21addb1db95..d8eb9c9e3ee2 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c | |||
@@ -1011,10 +1011,9 @@ static int __devinit temac_of_probe(struct platform_device *op) | |||
1011 | 1011 | ||
1012 | /* Init network device structure */ | 1012 | /* Init network device structure */ |
1013 | ndev = alloc_etherdev(sizeof(*lp)); | 1013 | ndev = alloc_etherdev(sizeof(*lp)); |
1014 | if (!ndev) { | 1014 | if (!ndev) |
1015 | dev_err(&op->dev, "could not allocate device.\n"); | ||
1016 | return -ENOMEM; | 1015 | return -ENOMEM; |
1017 | } | 1016 | |
1018 | ether_setup(ndev); | 1017 | ether_setup(ndev); |
1019 | dev_set_drvdata(&op->dev, ndev); | 1018 | dev_set_drvdata(&op->dev, ndev); |
1020 | SET_NETDEV_DEV(ndev, &op->dev); | 1019 | SET_NETDEV_DEV(ndev, &op->dev); |
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index ea50caf8925b..a7cf00438a36 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c | |||
@@ -1486,10 +1486,8 @@ static int __devinit axienet_of_probe(struct platform_device *op) | |||
1486 | const void *addr; | 1486 | const void *addr; |
1487 | 1487 | ||
1488 | ndev = alloc_etherdev(sizeof(*lp)); | 1488 | ndev = alloc_etherdev(sizeof(*lp)); |
1489 | if (!ndev) { | 1489 | if (!ndev) |
1490 | dev_err(&op->dev, "could not allocate device.\n"); | ||
1491 | return -ENOMEM; | 1490 | return -ENOMEM; |
1492 | } | ||
1493 | 1491 | ||
1494 | ether_setup(ndev); | 1492 | ether_setup(ndev); |
1495 | dev_set_drvdata(&op->dev, ndev); | 1493 | dev_set_drvdata(&op->dev, ndev); |
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c index 79013e5731a5..90e611a6f6c6 100644 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c | |||
@@ -1136,10 +1136,8 @@ static int __devinit xemaclite_of_probe(struct platform_device *ofdev) | |||
1136 | 1136 | ||
1137 | /* Create an ethernet device instance */ | 1137 | /* Create an ethernet device instance */ |
1138 | ndev = alloc_etherdev(sizeof(struct net_local)); | 1138 | ndev = alloc_etherdev(sizeof(struct net_local)); |
1139 | if (!ndev) { | 1139 | if (!ndev) |
1140 | dev_err(dev, "Could not allocate network device\n"); | ||
1141 | return -ENOMEM; | 1140 | return -ENOMEM; |
1142 | } | ||
1143 | 1141 | ||
1144 | dev_set_drvdata(dev, ndev); | 1142 | dev_set_drvdata(dev, ndev); |
1145 | SET_NETDEV_DEV(ndev, &ofdev->dev); | 1143 | SET_NETDEV_DEV(ndev, &ofdev->dev); |