]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
drm/etnaviv: remove unneeded 'fail' label
authorFabio Estevam <festevam@gmail.com>
Sun, 21 Aug 2016 22:32:14 +0000 (19:32 -0300)
committerLucas Stach <l.stach@pengutronix.de>
Thu, 15 Sep 2016 13:29:30 +0000 (15:29 +0200)
In the etnaviv_gpu_platform_probe() error path the 'fail' label is
used to just return the error code.

This can be simplified by returning the error code immediately, so
get rid of the unneeded 'fail' label.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
drivers/gpu/drm/etnaviv/etnaviv_gpu.c

index 666f3d13706ef191153d2ca8058b35596224bc0c..e430870d193031d85bf84d6b4591d16ff6e24c26 100644 (file)
@@ -1669,16 +1669,15 @@ static int etnaviv_gpu_platform_probe(struct platform_device *pdev)
        /* Get Interrupt: */
        gpu->irq = platform_get_irq(pdev, 0);
        if (gpu->irq < 0) {
-               err = gpu->irq;
-               dev_err(dev, "failed to get irq: %d\n", err);
-               goto fail;
+               dev_err(dev, "failed to get irq: %d\n", gpu->irq);
+               return gpu->irq;
        }
 
        err = devm_request_irq(&pdev->dev, gpu->irq, irq_handler, 0,
                               dev_name(gpu->dev), gpu);
        if (err) {
                dev_err(dev, "failed to request IRQ%u: %d\n", gpu->irq, err);
-               goto fail;
+               return err;
        }
 
        /* Get Clocks: */
@@ -1712,13 +1711,10 @@ static int etnaviv_gpu_platform_probe(struct platform_device *pdev)
        err = component_add(&pdev->dev, &gpu_ops);
        if (err < 0) {
                dev_err(&pdev->dev, "failed to register component: %d\n", err);
-               goto fail;
+               return err;
        }
 
        return 0;
-
-fail:
-       return err;
 }
 
 static int etnaviv_gpu_platform_remove(struct platform_device *pdev)