asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

video: Convert to devm_ioremap_resource()

Browse source 
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: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Thierry Reding 2013-01-21 11:09:23 +01:00 committed by Greg Kroah-Hartman
parent 148e11349b
commit bc3bad166c
5 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/video/exynos/exynos_dp_core.c
View file

@ -1076,11 +1076,9 @@ static int exynos_dp_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
dp->reg_base = devm_request_and_ioremap(&pdev->dev, res); dp->reg_base = devm_ioremap_resource(&pdev->dev, res);
if (!dp->reg_base) { if (IS_ERR(dp->reg_base))
dev_err(&pdev->dev, "failed to ioremap\n"); return PTR_ERR(dp->reg_base);
return -ENOMEM;
}
dp->irq = platform_get_irq(pdev, 0); dp->irq = platform_get_irq(pdev, 0);
if (dp->irq == -ENXIO) { if (dp->irq == -ENXIO) {

6
drivers/video/jz4740_fb.c
View file

@ -660,9 +660,9 @@ static int jzfb_probe(struct platform_device *pdev)
} }
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
jzfb->base = devm_request_and_ioremap(&pdev->dev, mem); jzfb->base = devm_ioremap_resource(&pdev->dev, mem);
if (!jzfb->base) { if (IS_ERR(jzfb->base)) {
ret = -EBUSY; ret = PTR_ERR(jzfb->base);
goto err_framebuffer_release; goto err_framebuffer_release;
} }

8
drivers/video/omap2/dss/hdmi.c
View file

@ -1080,11 +1080,9 @@ static int __init omapdss_hdmihw_probe(struct platform_device *pdev)
} }
/* Base address taken from platform */ /* Base address taken from platform */
hdmi.ip_data.base_wp = devm_request_and_ioremap(&pdev->dev, res); hdmi.ip_data.base_wp = devm_ioremap_resource(&pdev->dev, res);
if (!hdmi.ip_data.base_wp) { if (IS_ERR(hdmi.ip_data.base_wp))
DSSERR("can't ioremap WP\n"); return PTR_ERR(hdmi.ip_data.base_wp);
return -ENOMEM;
}
r = hdmi_get_clocks(pdev); r = hdmi_get_clocks(pdev);
if (r) { if (r) {

9
drivers/video/omap2/vrfb.c
View file

@ -20,6 +20,7 @@
/*#define DEBUG*/ /*#define DEBUG*/
#include <linux/err.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/ioport.h> #include <linux/ioport.h>
@ -357,11 +358,9 @@ static int __init vrfb_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
vrfb_base = devm_request_and_ioremap(&pdev->dev, mem); vrfb_base = devm_ioremap_resource(&pdev->dev, mem);
if (!vrfb_base) { if (IS_ERR(vrfb_base))
dev_err(&pdev->dev, "can't ioremap vrfb memory\n"); return PTR_ERR(vrfb_base);
return -ENOMEM;
}
num_ctxs = pdev->num_resources - 1; num_ctxs = pdev->num_resources - 1;

7
drivers/video/s3c-fb.c
View file

@ -1421,10 +1421,9 @@ static int s3c_fb_probe(struct platform_device *pdev)
pm_runtime_enable(sfb->dev); pm_runtime_enable(sfb->dev);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
sfb->regs = devm_request_and_ioremap(dev, res); sfb->regs = devm_ioremap_resource(dev, res);
if (!sfb->regs) { if (IS_ERR(sfb->regs)) {
dev_err(dev, "failed to map registers\n"); ret = PTR_ERR(sfb->regs);
ret = -ENXIO;
goto err_lcd_clk; goto err_lcd_clk;
} }