mtd: nand: omap: updated devm_xx for all resource allocation and free calls

"Managed Device Resource" or devm_xx calls takes care of automatic freeing
of the resource in case of:
- failure during driver probe
- failure during resource allocation
- detaching or unloading of driver module (rmmod)
Reference: Documentation/driver-model/devres.txt

Though OMAP NAND driver handles freeing of resource allocation in most of
the cases, but using devm_xx provides more clean and effortless approach
to handle all such cases.

- simplifies label for exiting probe during error
  s/out_release_mem_region/return_error

Signed-off-by: Pekon Gupta <pekon@ti.com>
Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 93aa35c..ec40b8d 100644 (file)
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1642,7 +1642,8 @@ static int omap_nand_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       info = kzalloc(sizeof(struct omap_nand_info), GFP_KERNEL);
+       info = devm_kzalloc(&pdev->dev, sizeof(struct omap_nand_info),
+                               GFP_KERNEL);
        if (!info)
                return -ENOMEM;
 
@@ -1667,22 +1668,23 @@ static int omap_nand_probe(struct platform_device *pdev)
        if (res == NULL) {
                err = -EINVAL;
                dev_err(&pdev->dev, "error getting memory resource\n");
-               goto out_free_info;
+               goto return_error;
        }
 
        info->phys_base = res->start;
        info->mem_size = resource_size(res);
 
-       if (!request_mem_region(info->phys_base, info->mem_size,
-                               pdev->dev.driver->name)) {
+       if (!devm_request_mem_region(&pdev->dev, info->phys_base,
+                               info->mem_size, pdev->dev.driver->name)) {
                err = -EBUSY;
-               goto out_free_info;
+               goto return_error;
        }
 
-       nand_chip->IO_ADDR_R = ioremap(info->phys_base, info->mem_size);
+       nand_chip->IO_ADDR_R = devm_ioremap(&pdev->dev, info->phys_base,
+                                               info->mem_size);
        if (!nand_chip->IO_ADDR_R) {
                err = -ENOMEM;
-               goto out_release_mem_region;
+               goto return_error;
        }
 
        nand_chip->controller = &info->controller;
@@ -1710,14 +1712,14 @@ static int omap_nand_probe(struct platform_device *pdev)
        if (nand_scan_ident(mtd, 1, NULL)) {
                pr_err("nand device scan failed, may be bus-width mismatch\n");
                err = -ENXIO;
-               goto out_release_mem_region;
+               goto return_error;
        }
 
        /* check for small page devices */
        if ((mtd->oobsize < 64) && (pdata->ecc_opt != OMAP_ECC_HAM1_CODE_HW)) {
                pr_err("small page devices are not supported\n");
                err = -EINVAL;
-               goto out_release_mem_region;
+               goto return_error;
        }
 
        /* re-populate low-level callbacks based on xfer modes */
@@ -1745,7 +1747,7 @@ static int omap_nand_probe(struct platform_device *pdev)
                if (!info->dma) {
                        dev_err(&pdev->dev, "DMA engine request failed\n");
                        err = -ENXIO;
-                       goto out_release_mem_region;
+                       goto return_error;
                } else {
                        struct dma_slave_config cfg;
 
@@ -1760,7 +1762,7 @@ static int omap_nand_probe(struct platform_device *pdev)
                        if (err) {
                                dev_err(&pdev->dev, "DMA engine slave config failed: %d\n",
                                        err);
-                               goto out_release_mem_region;
+                               goto return_error;
                        }
                        nand_chip->read_buf   = omap_read_buf_dma_pref;
                        nand_chip->write_buf  = omap_write_buf_dma_pref;
@@ -1772,30 +1774,32 @@ static int omap_nand_probe(struct platform_device *pdev)
                if (info->gpmc_irq_fifo <= 0) {
                        dev_err(&pdev->dev, "error getting fifo irq\n");
                        err = -ENODEV;
-                       goto out_release_mem_region;
+                       goto return_error;
                }
-               err = request_irq(info->gpmc_irq_fifo,  omap_nand_irq,
-                                       IRQF_SHARED, "gpmc-nand-fifo", info);
+               err = devm_request_irq(&pdev->dev, info->gpmc_irq_fifo,
+                                       omap_nand_irq, IRQF_SHARED,
+                                       "gpmc-nand-fifo", info);
                if (err) {
                        dev_err(&pdev->dev, "requesting irq(%d) error:%d",
                                                info->gpmc_irq_fifo, err);
                        info->gpmc_irq_fifo = 0;
-                       goto out_release_mem_region;
+                       goto return_error;
                }
 
                info->gpmc_irq_count = platform_get_irq(pdev, 1);
                if (info->gpmc_irq_count <= 0) {
                        dev_err(&pdev->dev, "error getting count irq\n");
                        err = -ENODEV;
-                       goto out_release_mem_region;
+                       goto return_error;
                }
-               err = request_irq(info->gpmc_irq_count, omap_nand_irq,
-                                       IRQF_SHARED, "gpmc-nand-count", info);
+               err = devm_request_irq(&pdev->dev, info->gpmc_irq_count,
+                                       omap_nand_irq, IRQF_SHARED,
+                                       "gpmc-nand-count", info);
                if (err) {
                        dev_err(&pdev->dev, "requesting irq(%d) error:%d",
                                                info->gpmc_irq_count, err);
                        info->gpmc_irq_count = 0;
-                       goto out_release_mem_region;
+                       goto return_error;
                }
 
                nand_chip->read_buf  = omap_read_buf_irq_pref;
@@ -1807,7 +1811,7 @@ static int omap_nand_probe(struct platform_device *pdev)
                dev_err(&pdev->dev,
                        "xfer_type(%d) not supported!\n", pdata->xfer_type);
                err = -EINVAL;
-               goto out_release_mem_region;
+               goto return_error;
        }
 
        /* populate MTD interface based on ECC scheme */
@@ -1865,7 +1869,7 @@ static int omap_nand_probe(struct platform_device *pdev)
 #else
                pr_err("nand: error: CONFIG_MTD_NAND_ECC_BCH not enabled\n");
                err = -EINVAL;
-               goto out_release_mem_region;
+               goto return_error;
 #endif
 
        case OMAP_ECC_BCH4_CODE_HW:
@@ -1892,13 +1896,13 @@ static int omap_nand_probe(struct platform_device *pdev)
                if (is_elm_present(info, pdata->elm_of_node, BCH4_ECC) < 0) {
                        pr_err("nand: error: could not initialize ELM\n");
                        err = -ENODEV;
-                       goto out_release_mem_region;
+                       goto return_error;
                }
                break;
 #else
                pr_err("nand: error: CONFIG_MTD_NAND_OMAP_BCH not enabled\n");
                err = -EINVAL;
-               goto out_release_mem_region;
+               goto return_error;
 #endif
 
        case OMAP_ECC_BCH8_CODE_HW_DETECTION_SW:
@@ -1926,13 +1930,13 @@ static int omap_nand_probe(struct platform_device *pdev)
                if (!nand_chip->ecc.priv) {
                        pr_err("nand: error: unable to use s/w BCH library\n");
                        err = -EINVAL;
-                       goto out_release_mem_region;
+                       goto return_error;
                }
                break;
 #else
                pr_err("nand: error: CONFIG_MTD_NAND_ECC_BCH not enabled\n");
                err = -EINVAL;
-               goto out_release_mem_region;
+               goto return_error;
 #endif
 
        case OMAP_ECC_BCH8_CODE_HW:
@@ -1951,7 +1955,7 @@ static int omap_nand_probe(struct platform_device *pdev)
                /* This ECC scheme requires ELM H/W block */
                if (is_elm_present(info, pdata->elm_of_node, BCH8_ECC) < 0) {
                        pr_err("nand: error: could not initialize ELM\n");
-                       goto out_release_mem_region;
+                       goto return_error;
                }
                /* define ECC layout */
                ecclayout->eccbytes             = nand_chip->ecc.bytes *
@@ -1964,13 +1968,13 @@ static int omap_nand_probe(struct platform_device *pdev)
 #else
                pr_err("nand: error: CONFIG_MTD_NAND_OMAP_BCH not enabled\n");
                err = -EINVAL;
-               goto out_release_mem_region;
+               goto return_error;
 #endif
 
        default:
                pr_err("nand: error: invalid or unsupported ECC scheme\n");
                err = -EINVAL;
-               goto out_release_mem_region;
+               goto return_error;
        }
 
        /* populate remaining ECC layout data */
@@ -1983,13 +1987,13 @@ static int omap_nand_probe(struct platform_device *pdev)
                pr_err("not enough OOB bytes required = %d, available=%d\n",
                                           ecclayout->eccbytes, mtd->oobsize);
                err = -EINVAL;
-               goto out_release_mem_region;
+               goto return_error;
        }
 
        /* second phase scan */
        if (nand_scan_tail(mtd)) {
                err = -ENXIO;
-               goto out_release_mem_region;
+               goto return_error;
        }
 
        ppdata.of_node = pdata->of_node;
@@ -2000,21 +2004,13 @@ static int omap_nand_probe(struct platform_device *pdev)
 
        return 0;
 
-out_release_mem_region:
+return_error:
        if (info->dma)
                dma_release_channel(info->dma);
-       if (info->gpmc_irq_count > 0)
-               free_irq(info->gpmc_irq_count, info);
-       if (info->gpmc_irq_fifo > 0)
-               free_irq(info->gpmc_irq_fifo, info);
-       release_mem_region(info->phys_base, info->mem_size);
-out_free_info:
        if (nand_chip->ecc.priv) {
                nand_bch_free(nand_chip->ecc.priv);
                nand_chip->ecc.priv = NULL;
        }
-       kfree(info);
-
        return err;
 }
 
@@ -2028,20 +2024,9 @@ static int omap_nand_remove(struct platform_device *pdev)
                nand_bch_free(nand_chip->ecc.priv);
                nand_chip->ecc.priv = NULL;
        }
-
        if (info->dma)
                dma_release_channel(info->dma);
-
-       if (info->gpmc_irq_count > 0)
-               free_irq(info->gpmc_irq_count, info);
-       if (info->gpmc_irq_fifo > 0)
-               free_irq(info->gpmc_irq_fifo, info);
-
-       /* Release NAND device, its internal structures and partitions */
        nand_release(mtd);
-       iounmap(nand_chip->IO_ADDR_R);
-       release_mem_region(info->phys_base, info->mem_size);
-       kfree(info);
        return 0;
 }