aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ti
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/ti
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/ti')
-rw-r--r--drivers/net/ethernet/ti/cpmac.c5
-rw-r--r--drivers/net/ethernet/ti/davinci_emac.c1
-rw-r--r--drivers/net/ethernet/ti/tlan.c1
3 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
index 4d9a28ffd3c3..97e1df330a17 100644
--- a/drivers/net/ethernet/ti/cpmac.c
+++ b/drivers/net/ethernet/ti/cpmac.c
@@ -1143,11 +1143,8 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
1143 } 1143 }
1144 1144
1145 dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES); 1145 dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);
1146 1146 if (!dev)
1147 if (!dev) {
1148 printk(KERN_ERR "cpmac: Unable to allocate net_device\n");
1149 return -ENOMEM; 1147 return -ENOMEM;
1150 }
1151 1148
1152 platform_set_drvdata(pdev, dev); 1149 platform_set_drvdata(pdev, dev);
1153 priv = netdev_priv(dev); 1150 priv = netdev_priv(dev);
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 794ac30a577b..efd4f3ee1a2c 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -1789,7 +1789,6 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
1789 1789
1790 ndev = alloc_etherdev(sizeof(struct emac_priv)); 1790 ndev = alloc_etherdev(sizeof(struct emac_priv));
1791 if (!ndev) { 1791 if (!ndev) {
1792 dev_err(&pdev->dev, "error allocating net_device\n");
1793 rc = -ENOMEM; 1792 rc = -ENOMEM;
1794 goto free_clk; 1793 goto free_clk;
1795 } 1794 }
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index 9c0dd6b8d6c9..817ad3bc4957 100644
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -486,7 +486,6 @@ static int __devinit tlan_probe1(struct pci_dev *pdev,
486 486
487 dev = alloc_etherdev(sizeof(struct tlan_priv)); 487 dev = alloc_etherdev(sizeof(struct tlan_priv));
488 if (dev == NULL) { 488 if (dev == NULL) {
489 pr_err("Could not allocate memory for device\n");
490 rc = -ENOMEM; 489 rc = -ENOMEM;
491 goto err_out_regions; 490 goto err_out_regions;
492 } 491 }