Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db60eda3 authored by Fabio Estevam's avatar Fabio Estevam Committed by Lucas Stach
Browse files

drm/etnaviv: remove unneeded 'fail' label 



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: default avatarFabio Estevam <festevam@gmail.com>
parent 9e59eea6

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+4 −8
Original line number Original line Diff line number Diff line
@@ -1669,16 +1669,15 @@ static int etnaviv_gpu_platform_probe(struct platform_device *pdev) 
	/* Get Interrupt: */

	/* Get Interrupt: */

	gpu->irq = platform_get_irq(pdev, 0);

	gpu->irq = platform_get_irq(pdev, 0);

	if (gpu->irq < 0) {

	if (gpu->irq < 0) {

		err = gpu->irq;

		dev_err(dev, "failed to get irq: %d\n", gpu->irq);

		dev_err(dev, "failed to get irq: %d\n", err);

		return gpu->irq;

		goto fail;

	}

	}





	err = devm_request_irq(&pdev->dev, gpu->irq, irq_handler, 0,

	err = devm_request_irq(&pdev->dev, gpu->irq, irq_handler, 0,

			       dev_name(gpu->dev), gpu);

			       dev_name(gpu->dev), gpu);

	if (err) {

	if (err) {

		dev_err(dev, "failed to request IRQ%u: %d\n", gpu->irq, err);

		dev_err(dev, "failed to request IRQ%u: %d\n", gpu->irq, err);

		goto fail;

		return err;

	}

	}





	/* Get Clocks: */

	/* Get Clocks: */
@@ -1712,13 +1711,10 @@ static int etnaviv_gpu_platform_probe(struct platform_device *pdev) 
	err = component_add(&pdev->dev, &gpu_ops);

	err = component_add(&pdev->dev, &gpu_ops);

	if (err < 0) {

	if (err < 0) {

		dev_err(&pdev->dev, "failed to register component: %d\n", err);

		dev_err(&pdev->dev, "failed to register component: %d\n", err);

		goto fail;

		return err;

	}

	}





	return 0;

	return 0;



fail:

	return err;

}

}





static int etnaviv_gpu_platform_remove(struct platform_device *pdev)

static int etnaviv_gpu_platform_remove(struct platform_device *pdev)