From: Joe Jin <joe.jin@oracle.com>
Date: Thu, 17 May 2012 03:02:23 +0000 (+0800)
Subject: e100: Remove alloc_etherdev error messages
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~402
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e3762b80a1dbdd5803492d4159e269b2999baca8;p=users%2Fjedix%2Flinux-maple.git

e100: Remove alloc_etherdev error messages

alloc_etherdev has a generic OOM/unable to alloc message.
Remove the duplicative messages after alloc_etherdev calls.

(backported from commit 41de8d4cff21a2e81e3d9ff66f5f7c903f9c3ab1)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 9a394ad1baa63..d013af66f758f 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2755,11 +2755,8 @@ static int __devinit e100_probe(struct pci_dev *pdev,
 	struct nic *nic;
 	int err;
 
-	if (!(netdev = alloc_etherdev(sizeof(struct nic)))) {
-		if (((1 << debug) - 1) & NETIF_MSG_PROBE)
-			pr_err("Etherdev alloc failed, aborting\n");
+	if (!(netdev = alloc_etherdev(sizeof(struct nic))))
 		return -ENOMEM;
-	}
 
 	netdev->netdev_ops = &e100_netdev_ops;
 	SET_ETHTOOL_OPS(netdev, &e100_ethtool_ops);