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

Commit d4ed6025 authored by Thierry Reding's avatar Thierry Reding Committed by Greg Kroah-Hartman
Browse files

drm: Convert to devm_ioremap_resource() 



Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.

devm_ioremap_resource() provides its own error messages so all explicit
error messages can be removed from the failure code paths.

Signed-off-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7331205a

drivers/gpu/drm/exynos/exynos_drm_fimc.c

+3 −5
Original line number Diff line number Diff line
@@ -1785,11 +1785,9 @@ static int fimc_probe(struct platform_device *pdev) 


	/* resource memory */

	ctx->regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	ctx->regs = devm_request_and_ioremap(dev, ctx->regs_res);

	if (!ctx->regs) {

		dev_err(dev, "failed to map registers.\n");

		return -ENXIO;

	}

	ctx->regs = devm_ioremap_resource(dev, ctx->regs_res);

	if (IS_ERR(ctx->regs))

		return PTR_ERR(ctx->regs);



	/* resource irq */

	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+3 −5
Original line number Diff line number Diff line
@@ -913,11 +913,9 @@ static int fimd_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	ctx->regs = devm_request_and_ioremap(&pdev->dev, res);

	if (!ctx->regs) {

		dev_err(dev, "failed to map registers\n");

		return -ENXIO;

	}

	ctx->regs = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(ctx->regs))

		return PTR_ERR(ctx->regs);



	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!res) {

drivers/gpu/drm/exynos/exynos_drm_g2d.c

+3 −4
Original line number Diff line number Diff line
@@ -1136,10 +1136,9 @@ static int g2d_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	g2d->regs = devm_request_and_ioremap(&pdev->dev, res);

	if (!g2d->regs) {

		dev_err(dev, "failed to remap I/O memory\n");

		ret = -ENXIO;

	g2d->regs = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(g2d->regs)) {

		ret = PTR_ERR(g2d->regs);

		goto err_put_clk;

	}

drivers/gpu/drm/exynos/exynos_drm_gsc.c

+3 −5
Original line number Diff line number Diff line
@@ -1692,11 +1692,9 @@ static int gsc_probe(struct platform_device *pdev) 


	/* resource memory */

	ctx->regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	ctx->regs = devm_request_and_ioremap(dev, ctx->regs_res);

	if (!ctx->regs) {

		dev_err(dev, "failed to map registers.\n");

		return -ENXIO;

	}

	ctx->regs = devm_ioremap_resource(dev, ctx->regs_res);

	if (IS_ERR(ctx->regs))

		return PTR_ERR(ctx->regs);



	/* resource irq */

	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

drivers/gpu/drm/exynos/exynos_drm_rotator.c

+3 −5
Original line number Diff line number Diff line
@@ -656,11 +656,9 @@ static int rotator_probe(struct platform_device *pdev) 
				platform_get_device_id(pdev)->driver_data;



	rot->regs_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	rot->regs = devm_request_and_ioremap(dev, rot->regs_res);

	if (!rot->regs) {

		dev_err(dev, "failed to map register\n");

		return -ENXIO;

	}

	rot->regs = devm_ioremap_resource(dev, rot->regs_res);

	if (IS_ERR(rot->regs))

		return PTR_ERR(rot->regs);



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

	if (rot->irq < 0) {