Skip to content

Commit

Permalink
8139too: use err.h macros
Browse files Browse the repository at this point in the history
Instead of using call by reference use the PTR_ERR macros to handle
return value with error case. Compile tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Nov 24, 2008
1 parent 3755810 commit 85920d4
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions drivers/net/8139too.c
Original file line number Diff line number Diff line change
Expand Up @@ -741,8 +741,7 @@ static void rtl8139_chip_reset (void __iomem *ioaddr)
}


static int __devinit rtl8139_init_board (struct pci_dev *pdev,
struct net_device **dev_out)
static __devinit struct net_device * rtl8139_init_board (struct pci_dev *pdev)
{
void __iomem *ioaddr;
struct net_device *dev;
Expand All @@ -756,13 +755,11 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,

assert (pdev != NULL);

*dev_out = NULL;

/* dev and priv zeroed in alloc_etherdev */
dev = alloc_etherdev (sizeof (*tp));
if (dev == NULL) {
dev_err(&pdev->dev, "Unable to alloc new net device\n");
return -ENOMEM;
return ERR_PTR(-ENOMEM);
}
SET_NETDEV_DEV(dev, &pdev->dev);

Expand Down Expand Up @@ -906,14 +903,13 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,

rtl8139_chip_reset (ioaddr);

*dev_out = dev;
return 0;
return dev;

err_out:
__rtl8139_cleanup_dev (dev);
if (disable_dev_on_err)
pci_disable_device (pdev);
return rc;
return ERR_PTR(rc);
}

static const struct net_device_ops rtl8139_netdev_ops = {
Expand Down Expand Up @@ -972,9 +968,9 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
use_io = 1;
}

i = rtl8139_init_board (pdev, &dev);
if (i < 0)
return i;
dev = rtl8139_init_board (pdev);
if (IS_ERR(dev))
return PTR_ERR(dev);

assert (dev != NULL);
tp = netdev_priv(dev);
Expand Down

0 comments on commit 85920d4

Please sign in to comment.