diff options
Diffstat (limited to 'drivers/net/ethernet/smsc')
-rw-r--r-- | drivers/net/ethernet/smsc/epic100.c | 5 | ||||
-rw-r--r-- | drivers/net/ethernet/smsc/smc911x.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/smsc/smc91x.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/smsc/smsc9420.c | 4 |
5 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/ethernet/smsc/epic100.c b/drivers/net/ethernet/smsc/epic100.c index 2c077ce0b6d6..11dcb38b99f7 100644 --- a/drivers/net/ethernet/smsc/epic100.c +++ b/drivers/net/ethernet/smsc/epic100.c | |||
@@ -363,10 +363,9 @@ static int __devinit epic_init_one (struct pci_dev *pdev, | |||
363 | ret = -ENOMEM; | 363 | ret = -ENOMEM; |
364 | 364 | ||
365 | dev = alloc_etherdev(sizeof (*ep)); | 365 | dev = alloc_etherdev(sizeof (*ep)); |
366 | if (!dev) { | 366 | if (!dev) |
367 | dev_err(&pdev->dev, "no memory for eth device\n"); | ||
368 | goto err_out_free_res; | 367 | goto err_out_free_res; |
369 | } | 368 | |
370 | SET_NETDEV_DEV(dev, &pdev->dev); | 369 | SET_NETDEV_DEV(dev, &pdev->dev); |
371 | 370 | ||
372 | #ifdef USE_IO_OPS | 371 | #ifdef USE_IO_OPS |
diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c index 313ba3b32ab4..c28230148efd 100644 --- a/drivers/net/ethernet/smsc/smc911x.c +++ b/drivers/net/ethernet/smsc/smc911x.c | |||
@@ -2065,7 +2065,6 @@ static int __devinit smc911x_drv_probe(struct platform_device *pdev) | |||
2065 | 2065 | ||
2066 | ndev = alloc_etherdev(sizeof(struct smc911x_local)); | 2066 | ndev = alloc_etherdev(sizeof(struct smc911x_local)); |
2067 | if (!ndev) { | 2067 | if (!ndev) { |
2068 | printk("%s: could not allocate device.\n", CARDNAME); | ||
2069 | ret = -ENOMEM; | 2068 | ret = -ENOMEM; |
2070 | goto release_1; | 2069 | goto release_1; |
2071 | } | 2070 | } |
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index 64ad3ed74495..24104a1ee6a5 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c | |||
@@ -2223,7 +2223,6 @@ static int __devinit smc_drv_probe(struct platform_device *pdev) | |||
2223 | 2223 | ||
2224 | ndev = alloc_etherdev(sizeof(struct smc_local)); | 2224 | ndev = alloc_etherdev(sizeof(struct smc_local)); |
2225 | if (!ndev) { | 2225 | if (!ndev) { |
2226 | printk("%s: could not allocate device.\n", CARDNAME); | ||
2227 | ret = -ENOMEM; | 2226 | ret = -ENOMEM; |
2228 | goto out; | 2227 | goto out; |
2229 | } | 2228 | } |
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index 24d2df068d71..6a1cd2360818 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c | |||
@@ -2374,7 +2374,6 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) | |||
2374 | 2374 | ||
2375 | dev = alloc_etherdev(sizeof(struct smsc911x_data)); | 2375 | dev = alloc_etherdev(sizeof(struct smsc911x_data)); |
2376 | if (!dev) { | 2376 | if (!dev) { |
2377 | pr_warn("Could not allocate device\n"); | ||
2378 | retval = -ENOMEM; | 2377 | retval = -ENOMEM; |
2379 | goto out_release_io_1; | 2378 | goto out_release_io_1; |
2380 | } | 2379 | } |
diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c index a9efbdfe5302..595f9881e096 100644 --- a/drivers/net/ethernet/smsc/smsc9420.c +++ b/drivers/net/ethernet/smsc/smsc9420.c | |||
@@ -1598,10 +1598,8 @@ smsc9420_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1598 | pci_set_master(pdev); | 1598 | pci_set_master(pdev); |
1599 | 1599 | ||
1600 | dev = alloc_etherdev(sizeof(*pd)); | 1600 | dev = alloc_etherdev(sizeof(*pd)); |
1601 | if (!dev) { | 1601 | if (!dev) |
1602 | printk(KERN_ERR "ether device alloc failed\n"); | ||
1603 | goto out_disable_pci_device_1; | 1602 | goto out_disable_pci_device_1; |
1604 | } | ||
1605 | 1603 | ||
1606 | SET_NETDEV_DEV(dev, &pdev->dev); | 1604 | SET_NETDEV_DEV(dev, &pdev->dev); |
1607 | 1605 | ||