net: ibm: emac: Fix some error handling path in 'emac_probe()'

If 'irq_of_parse_and_map()' or 'of_address_to_resource()' fail, 'err' is
known to be 0 at this point.
So return -ENODEV instead in the first case and use 'of_iomap()' instead of
the equivalent 'of_address_to_resource()/ioremap()' combinaison in the 2nd
case.

Doing so, the 'rsrc_regs' field of the 'emac_instance struct' becomes
redundant and is removed.

While at it, turn a 'err != 0' test into an equivalent 'err' to be more
consistent.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index 95135d20458fbd74926868ed42fe1430f3920128..7feff2450ed68717240c1793279c45ee5bef525f 100644 (file)
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -3032,7 +3032,7 @@ static int emac_probe(struct platform_device *ofdev)
 
        /* Init various config data based on device-tree */
        err = emac_init_config(dev);
-       if (err != 0)
+       if (err)
                goto err_free;
 
        /* Get interrupts. EMAC irq is mandatory, WOL irq is optional */
@@ -3040,18 +3040,14 @@ static int emac_probe(struct platform_device *ofdev)
        dev->wol_irq = irq_of_parse_and_map(np, 1);
        if (!dev->emac_irq) {
                printk(KERN_ERR "%pOF: Can't map main interrupt\n", np);
+               err = -ENODEV;
                goto err_free;
        }
        ndev->irq = dev->emac_irq;
 
        /* Map EMAC regs */
-       if (of_address_to_resource(np, 0, &dev->rsrc_regs)) {
-               printk(KERN_ERR "%pOF: Can't get registers address\n", np);
-               goto err_irq_unmap;
-       }
-       // TODO : request_mem_region
-       dev->emacp = ioremap(dev->rsrc_regs.start,
-                            resource_size(&dev->rsrc_regs));
+       // TODO : platform_get_resource() and devm_ioremap_resource()
+       dev->emacp = of_iomap(np, 0);
        if (dev->emacp == NULL) {
                printk(KERN_ERR "%pOF: Can't map device registers!\n", np);
                err = -ENOMEM;

diff --git a/drivers/net/ethernet/ibm/emac/core.h b/drivers/net/ethernet/ibm/emac/core.h
index f10e156641d511d2d5d6a133dd3a8df18498cf69..369de2cfb15bad65010dfd77ae59023f7cc0654c 100644 (file)
--- a/drivers/net/ethernet/ibm/emac/core.h
+++ b/drivers/net/ethernet/ibm/emac/core.h
@@ -167,7 +167,6 @@ struct emac_error_stats {
 
 struct emac_instance {
        struct net_device               *ndev;
-       struct resource                 rsrc_regs;
        struct emac_regs                __iomem *emacp;
        struct platform_device          *ofdev;
        struct device_node              **blist; /* bootlist entry */