Message ID | 20120407102051.GA5551@electric-eye.fr.zoreil.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Francois Romieu <romieu@fr.zoreil.com> Date: Sat, 7 Apr 2012 12:20:51 +0200 > Please pull from branch 'davem-next.base_addr.removal' in repository > > git://violet.fr.zoreil.com/romieu/linux davem-next.base_addr.removal > > to get the changes below. Pulled, thanks for doing this work Francois. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c index 25fe117..c4f37ac 100644 --- a/drivers/net/ethernet/dec/tulip/tulip_core.c +++ b/drivers/net/ethernet/dec/tulip/tulip_core.c @@ -1902,7 +1902,7 @@ static int tulip_resume(struct pci_dev *pdev) retval = request_irq(pdev->irq, tulip_interrupt, IRQF_SHARED, dev->name, dev); - if (retval < 0) { + if (retval) { pr_err("request_irq failed in resume\n"); return retval; } diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c index 328c631..6f939a1 100644 --- a/drivers/net/ethernet/fealnx.c +++ b/drivers/net/ethernet/fealnx.c @@ -835,8 +835,8 @@ static int netdev_open(struct net_device *dev) iowrite32(0x00000001, ioaddr + BCR); /* Reset */ rc = request_irq(irq, intr_handler, IRQF_SHARED, dev->name, dev); - if (rc < 0) - goto out; + if (rc) + return -EAGAIN; for (i = 0; i < 3; i++) iowrite16(((unsigned short*)dev->dev_addr)[i], diff --git a/drivers/net/ethernet/packetengines/yellowfin.c b/drivers/net/ethernet/packetengines/yellowfin.c index cf5f54b..04e622f 100644 --- a/drivers/net/ethernet/packetengines/yellowfin.c +++ b/drivers/net/ethernet/packetengines/yellowfin.c @@ -574,8 +574,8 @@ static int yellowfin_open(struct net_device *dev) iowrite32(0x80000000, ioaddr + DMACtrl); rc = request_irq(irq, yellowfin_interrupt, IRQF_SHARED, dev->name, dev); - if (rc < 0) - goto out; + if (rc) + return rc; rc = yellowfin_init_ring(dev); if (rc < 0) diff --git a/drivers/net/ethernet/smsc/epic100.c b/drivers/net/ethernet/smsc/epic100.c index 1710b4b..d01e59c 100644 --- a/drivers/net/ethernet/smsc/epic100.c +++ b/drivers/net/ethernet/smsc/epic100.c @@ -657,7 +657,7 @@ static int epic_open(struct net_device *dev) napi_enable(&ep->napi); rc = request_irq(irq, epic_interrupt, IRQF_SHARED, dev->name, dev); - if (rc < 0) { + if (rc) { napi_disable(&ep->napi); return rc; } diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c index 292753f..fd33b21 100644 --- a/drivers/net/ethernet/smsc/smsc9420.c +++ b/drivers/net/ethernet/smsc/smsc9420.c @@ -1361,8 +1361,9 @@ static int smsc9420_open(struct net_device *dev) result = request_irq(irq, smsc9420_isr, IRQF_SHARED | IRQF_DISABLED, DRV_NAME, pd); - if (result < 0) { + if (result) { smsc_warn(IFUP, "Unable to use IRQ = %d", irq); + result = -ENODEV; goto out_0; } diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index a470f38..afb19a6 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c @@ -2185,12 +2185,12 @@ static int happy_meal_open(struct net_device *dev) if ((hp->happy_flags & (HFLAG_QUATTRO|HFLAG_PCI)) != HFLAG_QUATTRO) { res = request_irq(hp->irq, happy_meal_interrupt, IRQF_SHARED, dev->name, dev); - if (res < 0) { + if (res) { HMD(("EAGAIN\n")); printk(KERN_ERR "happy_meal(SBUS): Can't order irq %d to go.\n", hp->irq); - return res; + return -EAGAIN; } }