[PATCH v3 3/3] video: xilinxfb: Simplify error path

[Michal Simek]

devm_iounmap is called automatically that's why remove it from the code
dev_set_drvdata(dev, NULL) is called by generic code
after device_release or on probe failure.

Signed-off-by: Michal Simek <michal.si...@xilinx.com>

Reviewed-by: Jingoo Han <jg1....@samsung.com>
---
Changes in v3: None
Changes in v2:
- Rebased on git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git 
for-next

 drivers/video/xilinxfb.c | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index c420328..9eedf96 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -260,10 +260,9 @@ static int xilinxfb_assign(struct platform_device *pdev,

                res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
                drvdata->regs = devm_ioremap_resource(&pdev->dev, res);
-               if (IS_ERR(drvdata->regs)) {
-                       rc = PTR_ERR(drvdata->regs);
-                       goto err_region;
-               }
+               if (IS_ERR(drvdata->regs))
+                       return PTR_ERR(drvdata->regs);
+
                drvdata->regs_phys = res->start;
        }

@@ -279,11 +278,7 @@ static int xilinxfb_assign(struct platform_device *pdev,

        if (!drvdata->fb_virt) {
                dev_err(dev, "Could not allocate frame buffer memory\n");
-               rc = -ENOMEM;
-               if (drvdata->flags & BUS_ACCESS_FLAG)
-                       goto err_fbmem;
-               else
-                       goto err_region;
+               return -ENOMEM;
        }

        /* Clear (turn to black) the framebuffer */
@@ -363,11 +358,6 @@ err_cmap:
        /* Turn off the display */
        xilinx_fb_out32(drvdata, REG_CTRL, 0);

-err_fbmem:
-       if (drvdata->flags & BUS_ACCESS_FLAG)
-               devm_iounmap(dev, drvdata->regs);
-
-err_region:
        return rc;
 }

@@ -392,11 +382,9 @@ static int xilinxfb_release(struct device *dev)
        /* Turn off the display */
        xilinx_fb_out32(drvdata, REG_CTRL, 0);

-       /* Release the resources, as allocated based on interface */
-       if (drvdata->flags & BUS_ACCESS_FLAG)
-               devm_iounmap(dev, drvdata->regs);
 #ifdef CONFIG_PPC_DCR
-       else
+       /* Release the resources, as allocated based on interface */
+       if (!(drvdata->flags & BUS_ACCESS_FLAG))
                dcr_unmap(drvdata->dcr_host, drvdata->dcr_len);
 #endif

--
1.8.2.3

pgpa13knIptjo.pgp
Description: PGP signature