Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41de8d4c authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e404decb

drivers/net/ethernet/3com/3c59x.c

+2 −3
Original line number Diff line number Diff line
@@ -1121,10 +1121,9 @@ static int __devinit vortex_probe1(struct device *gendev, 


	dev = alloc_etherdev(sizeof(*vp));

	retval = -ENOMEM;

	if (!dev) {

		pr_err(PFX "unable to allocate etherdev, aborting\n");

	if (!dev)

		goto out;

	}



	SET_NETDEV_DEV(dev, gendev);

	vp = netdev_priv(dev);

drivers/net/ethernet/adaptec/starfire.c

+2 −3
Original line number Diff line number Diff line
@@ -686,10 +686,9 @@ static int __devinit starfire_init_one(struct pci_dev *pdev, 
	}



	dev = alloc_etherdev(sizeof(*np));

	if (!dev) {

		printk(KERN_ERR DRV_NAME " %d: cannot alloc etherdev, aborting\n", card_idx);

	if (!dev)

		return -ENOMEM;

	}



	SET_NETDEV_DEV(dev, &pdev->dev);



	irq = pdev->irq;

drivers/net/ethernet/adi/bfin_mac.c

+1 −3
Original line number Diff line number Diff line
@@ -1467,10 +1467,8 @@ static int __devinit bfin_mac_probe(struct platform_device *pdev) 
	int rc;



	ndev = alloc_etherdev(sizeof(struct bfin_mac_local));

	if (!ndev) {

		dev_err(&pdev->dev, "Cannot allocate net device!\n");

	if (!ndev)

		return -ENOMEM;

	}



	SET_NETDEV_DEV(ndev, &pdev->dev);

	platform_set_drvdata(pdev, ndev);

drivers/net/ethernet/alteon/acenic.c

+1 −4
Original line number Diff line number Diff line
@@ -463,11 +463,8 @@ static int __devinit acenic_probe_one(struct pci_dev *pdev, 
	static int boards_found;



	dev = alloc_etherdev(sizeof(struct ace_private));

	if (dev == NULL) {

		printk(KERN_ERR "acenic: Unable to allocate "

		       "net_device structure!\n");

	if (dev == NULL)

		return -ENOMEM;

	}



	SET_NETDEV_DEV(dev, &pdev->dev);

drivers/net/ethernet/amd/amd8111e.c

+0 −1
Original line number Diff line number Diff line
@@ -1859,7 +1859,6 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev, 


	dev = alloc_etherdev(sizeof(struct amd8111e_priv));

	if (!dev) {

		printk(KERN_ERR "amd8111e: Etherdev alloc failed, exiting.\n");

		err = -ENOMEM;

		goto err_free_reg;

	}