Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 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>

authored by

Thierry Reding and committed by
Greg Kroah-Hartman
bc3bad16 148e1134

+16 -22
+3 -5
drivers/video/exynos/exynos_dp_core.c
··· 1076 1076 1077 1077 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1078 1078 1079 - dp->reg_base = devm_request_and_ioremap(&pdev->dev, res); 1080 - if (!dp->reg_base) { 1081 - dev_err(&pdev->dev, "failed to ioremap\n"); 1082 - return -ENOMEM; 1083 - } 1079 + dp->reg_base = devm_ioremap_resource(&pdev->dev, res); 1080 + if (IS_ERR(dp->reg_base)) 1081 + return PTR_ERR(dp->reg_base); 1084 1082 1085 1083 dp->irq = platform_get_irq(pdev, 0); 1086 1084 if (dp->irq == -ENXIO) {
+3 -3
drivers/video/jz4740_fb.c
··· 660 660 } 661 661 662 662 mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); 663 - jzfb->base = devm_request_and_ioremap(&pdev->dev, mem); 664 - if (!jzfb->base) { 665 - ret = -EBUSY; 663 + jzfb->base = devm_ioremap_resource(&pdev->dev, mem); 664 + if (IS_ERR(jzfb->base)) { 665 + ret = PTR_ERR(jzfb->base); 666 666 goto err_framebuffer_release; 667 667 } 668 668
+3 -5
drivers/video/omap2/dss/hdmi.c
··· 1080 1080 } 1081 1081 1082 1082 /* Base address taken from platform */ 1083 - hdmi.ip_data.base_wp = devm_request_and_ioremap(&pdev->dev, res); 1084 - if (!hdmi.ip_data.base_wp) { 1085 - DSSERR("can't ioremap WP\n"); 1086 - return -ENOMEM; 1087 - } 1083 + hdmi.ip_data.base_wp = devm_ioremap_resource(&pdev->dev, res); 1084 + if (IS_ERR(hdmi.ip_data.base_wp)) 1085 + return PTR_ERR(hdmi.ip_data.base_wp); 1088 1086 1089 1087 r = hdmi_get_clocks(pdev); 1090 1088 if (r) {
+4 -5
drivers/video/omap2/vrfb.c
··· 20 20 21 21 /*#define DEBUG*/ 22 22 23 + #include <linux/err.h> 23 24 #include <linux/kernel.h> 24 25 #include <linux/module.h> 25 26 #include <linux/ioport.h> ··· 358 357 return -EINVAL; 359 358 } 360 359 361 - vrfb_base = devm_request_and_ioremap(&pdev->dev, mem); 362 - if (!vrfb_base) { 363 - dev_err(&pdev->dev, "can't ioremap vrfb memory\n"); 364 - return -ENOMEM; 365 - } 360 + vrfb_base = devm_ioremap_resource(&pdev->dev, mem); 361 + if (IS_ERR(vrfb_base)) 362 + return PTR_ERR(vrfb_base); 366 363 367 364 num_ctxs = pdev->num_resources - 1; 368 365
+3 -4
drivers/video/s3c-fb.c
··· 1421 1421 pm_runtime_enable(sfb->dev); 1422 1422 1423 1423 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1424 - sfb->regs = devm_request_and_ioremap(dev, res); 1425 - if (!sfb->regs) { 1426 - dev_err(dev, "failed to map registers\n"); 1427 - ret = -ENXIO; 1424 + sfb->regs = devm_ioremap_resource(dev, res); 1425 + if (IS_ERR(sfb->regs)) { 1426 + ret = PTR_ERR(sfb->regs); 1428 1427 goto err_lcd_clk; 1429 1428 } 1430 1429