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

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

video: 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: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Acked-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 148e1134

drivers/video/exynos/exynos_dp_core.c

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


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	dp->reg_base = devm_request_and_ioremap(&pdev->dev, res);

	if (!dp->reg_base) {

		dev_err(&pdev->dev, "failed to ioremap\n");

		return -ENOMEM;

	}

	dp->reg_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(dp->reg_base))

		return PTR_ERR(dp->reg_base);



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

	if (dp->irq == -ENXIO) {

drivers/video/jz4740_fb.c

+3 −3
Original line number Diff line number Diff line
@@ -660,9 +660,9 @@ static int jzfb_probe(struct platform_device *pdev) 
	}



	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	jzfb->base = devm_request_and_ioremap(&pdev->dev, mem);

	if (!jzfb->base) {

		ret = -EBUSY;

	jzfb->base = devm_ioremap_resource(&pdev->dev, mem);

	if (IS_ERR(jzfb->base)) {

		ret = PTR_ERR(jzfb->base);

		goto err_framebuffer_release;

	}

drivers/video/omap2/dss/hdmi.c

+3 −5
Original line number Diff line number Diff line
@@ -1080,11 +1080,9 @@ static int __init omapdss_hdmihw_probe(struct platform_device *pdev) 
	}



	/* Base address taken from platform */

	hdmi.ip_data.base_wp = devm_request_and_ioremap(&pdev->dev, res);

	if (!hdmi.ip_data.base_wp) {

		DSSERR("can't ioremap WP\n");

		return -ENOMEM;

	}

	hdmi.ip_data.base_wp = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(hdmi.ip_data.base_wp))

		return PTR_ERR(hdmi.ip_data.base_wp);



	r = hdmi_get_clocks(pdev);

	if (r) {

drivers/video/omap2/vrfb.c

+4 −5
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


/*#define DEBUG*/



#include <linux/err.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/ioport.h>
@@ -357,11 +358,9 @@ static int __init vrfb_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	vrfb_base = devm_request_and_ioremap(&pdev->dev, mem);

	if (!vrfb_base) {

		dev_err(&pdev->dev, "can't ioremap vrfb memory\n");

		return -ENOMEM;

	}

	vrfb_base = devm_ioremap_resource(&pdev->dev, mem);

	if (IS_ERR(vrfb_base))

		return PTR_ERR(vrfb_base);



	num_ctxs = pdev->num_resources - 1;

drivers/video/s3c-fb.c

+3 −4
Original line number Diff line number Diff line
@@ -1421,10 +1421,9 @@ static int s3c_fb_probe(struct platform_device *pdev) 
	pm_runtime_enable(sfb->dev);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	sfb->regs = devm_request_and_ioremap(dev, res);

	if (!sfb->regs) {

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

		ret = -ENXIO;

	sfb->regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(sfb->regs)) {

		ret = PTR_ERR(sfb->regs);

		goto err_lcd_clk;

	}