The patch titled
ethernet-driver-for-eisa-only-sni-rm200-rm400-machines-update 2
has been added to the -mm tree. Its filename is
ethernet-driver-for-eisa-only-sni-rm200-rm400-machines-update-2.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ethernet-driver-for-eisa-only-sni-rm200-rm400-machines-update 2
From: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
- spelling fix
- cleaned up probe code
Signed-off-by: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/sni_82596.c | 71 +++++++++++++++-----------------------
1 files changed, 29 insertions(+), 42 deletions(-)
diff -puN drivers/net/sni_82596.c~ethernet-driver-for-eisa-only-sni-rm200-rm400-machines-update-2 drivers/net/sni_82596.c
--- a/drivers/net/sni_82596.c~ethernet-driver-for-eisa-only-sni-rm200-rm400-machines-update-2
+++ a/drivers/net/sni_82596.c
@@ -80,53 +80,41 @@ static int __devinit sni_82596_probe(str
struct net_device *netdevice;
struct i596_private *lp;
struct resource *res, *ca, *idprom, *options;
- int retval = -ENODEV;
- void __iomem *mpu_addr = NULL;
- void __iomem *ca_addr = NULL;
- u8 __iomem *eth_addr = NULL;
+ int retval = -ENOMEM;
+ void __iomem *mpu_addr;
+ void __iomem *ca_addr;
+ u8 __iomem *eth_addr;
res = platform_get_resource(dev, IORESOURCE_MEM, 0);
- if (!res)
- goto probe_failed;
- mpu_addr = ioremap_nocache(res->start, 4);
- if (!mpu_addr) {
- retval = -ENOMEM;
- goto probe_failed;
- }
ca = platform_get_resource(dev, IORESOURCE_MEM, 1);
- if (!ca)
- goto probe_failed;
- ca_addr = ioremap_nocache(ca->start, 4);
- if (!ca_addr) {
- retval = -ENOMEM;
- goto probe_failed;
- }
- idprom = platform_get_resource(dev, IORESOURCE_MEM, 2);
- if (!idprom)
- goto probe_failed;
- eth_addr = ioremap_nocache(idprom->start, 0x10);
- if (!eth_addr) {
- retval = -ENOMEM;
- goto probe_failed;
- }
options = platform_get_resource(dev, 0, 0);
- if (!options)
- goto probe_failed;
+ idprom = platform_get_resource(dev, IORESOURCE_MEM, 2);
+ if (!res || !ca || !options || !idprom)
+ return -ENODEV;
+ mpu_addr = ioremap_nocache(res->start, 4);
+ if (!mpu_addr)
+ return -ENOMEM;
+ ca_addr = ioremap_nocache(ca->start, 4);
+ if (!ca_addr)
+ goto probe_failed_free_mpu;
printk(KERN_INFO "Found i82596 at 0x%x\n", res->start);
netdevice = alloc_etherdev(sizeof(struct i596_private));
- if (!netdevice) {
- retval = -ENOMEM;
- goto probe_failed;
- }
+ if (!netdevice)
+ goto probe_failed_free_ca;
+
SET_NETDEV_DEV(netdevice, &dev->dev);
platform_set_drvdata (dev, netdevice);
netdevice->base_addr = res->start;
netdevice->irq = platform_get_irq(dev, 0);
- /* someone seams to like messed up stuff */
+ eth_addr = ioremap_nocache(idprom->start, 0x10);
+ if (!eth_addr)
+ goto probe_failed;
+
+ /* someone seems to like messed up stuff */
netdevice->dev_addr[0] = readb(eth_addr + 0x0b);
netdevice->dev_addr[1] = readb(eth_addr + 0x0a);
netdevice->dev_addr[2] = readb(eth_addr + 0x09);
@@ -147,16 +135,15 @@ static int __devinit sni_82596_probe(str
lp->mpu_port = mpu_addr;
retval = i82596_probe(netdevice);
- if (retval) {
- free_netdev(netdevice);
+ if (retval == 0)
+ return 0;
+
probe_failed:
- if (mpu_addr)
- iounmap(mpu_addr);
- if (ca_addr)
- iounmap(ca_addr);
- if (eth_addr)
- iounmap(ca_addr);
- }
+ free_netdev(netdevice);
+probe_failed_free_ca:
+ iounmap(ca_addr);
+probe_failed_free_mpu:
+ iounmap(mpu_addr);
return retval;
}
_
Patches currently in -mm which might be from tsbogend@xxxxxxxxxxxxxxxx are
extract-chip-specific-code-out-of-lasi_82596c.patch
extract-chip-specific-code-out-of-lasi_82596c-update.patch
extract-chip-specific-code-out-of-lasi_82596c-update-2.patch
ethernet-driver-for-eisa-only-sni-rm200-rm400-machines.patch
ethernet-driver-for-eisa-only-sni-rm200-rm400-machines-update.patch
ethernet-driver-for-eisa-only-sni-rm200-rm400-machines-update-2.patch
git-scsi-misc.patch
rtc-driver-for-ds1216-chips.patch
rtc-driver-for-ds1216-chips-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
