From: Thierry Reding <thierry.reding@avionic-design.de> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, Arnd Bergmann <arnd@arndb.de>, Wolfram Sang <w.sang@pengutronix.de>, Florian Tobias Schandinat <FlorianSchandinat@gmx.de>, linux-fbdev@vger.kernel.org Subject: [PATCH 30/33] video: Convert to devm_ioremap_resource() Date: Mon, 21 Jan 2013 11:09:23 +0100 [thread overview] Message-ID: <1358762966-20791-31-git-send-email-thierry.reding@avionic-design.de> (raw) In-Reply-To: <1358762966-20791-1-git-send-email-thierry.reding@avionic-design.de> 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> Cc: linux-fbdev@vger.kernel.org --- drivers/video/exynos/exynos_dp_core.c | 8 +++----- drivers/video/jz4740_fb.c | 6 +++--- drivers/video/omap2/dss/hdmi.c | 8 +++----- drivers/video/omap2/vrfb.c | 9 ++++----- drivers/video/s3c-fb.c | 7 +++---- 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c index 4ef18e2..7aae0bf 100644 --- a/drivers/video/exynos/exynos_dp_core.c +++ b/drivers/video/exynos/exynos_dp_core.c @@ -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) { diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c index d999bb5..36979b4 100644 --- a/drivers/video/jz4740_fb.c +++ b/drivers/video/jz4740_fb.c @@ -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; } diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index 769d082..7292364 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -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) { diff --git a/drivers/video/omap2/vrfb.c b/drivers/video/omap2/vrfb.c index 5d8fdac..10560ef 100644 --- a/drivers/video/omap2/vrfb.c +++ b/drivers/video/omap2/vrfb.c @@ -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; diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c index 9b57a23..968a625 100644 --- a/drivers/video/s3c-fb.c +++ b/drivers/video/s3c-fb.c @@ -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; } -- 1.8.1.1
WARNING: multiple messages have this Message-ID (diff)
From: Thierry Reding <thierry.reding@avionic-design.de> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, Arnd Bergmann <arnd@arndb.de>, Wolfram Sang <w.sang@pengutronix.de>, Florian Tobias Schandinat <FlorianSchandinat@gmx.de>, linux-fbdev@vger.kernel.org Subject: [PATCH 30/33] video: Convert to devm_ioremap_resource() Date: Mon, 21 Jan 2013 10:09:23 +0000 [thread overview] Message-ID: <1358762966-20791-31-git-send-email-thierry.reding@avionic-design.de> (raw) In-Reply-To: <1358762966-20791-1-git-send-email-thierry.reding@avionic-design.de> 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> Cc: linux-fbdev@vger.kernel.org --- drivers/video/exynos/exynos_dp_core.c | 8 +++----- drivers/video/jz4740_fb.c | 6 +++--- drivers/video/omap2/dss/hdmi.c | 8 +++----- drivers/video/omap2/vrfb.c | 9 ++++----- drivers/video/s3c-fb.c | 7 +++---- 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c index 4ef18e2..7aae0bf 100644 --- a/drivers/video/exynos/exynos_dp_core.c +++ b/drivers/video/exynos/exynos_dp_core.c @@ -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) { diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c index d999bb5..36979b4 100644 --- a/drivers/video/jz4740_fb.c +++ b/drivers/video/jz4740_fb.c @@ -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; } diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index 769d082..7292364 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -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) { diff --git a/drivers/video/omap2/vrfb.c b/drivers/video/omap2/vrfb.c index 5d8fdac..10560ef 100644 --- a/drivers/video/omap2/vrfb.c +++ b/drivers/video/omap2/vrfb.c @@ -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; diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c index 9b57a23..968a625 100644 --- a/drivers/video/s3c-fb.c +++ b/drivers/video/s3c-fb.c @@ -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; } -- 1.8.1.1
next prev parent reply other threads:[~2013-01-21 10:10 UTC|newest] Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-01-21 10:08 [PATCH 00/33] Sanitize devm_request_and_ioremap() Thierry Reding 2013-01-21 10:08 ` [PATCH 01/33] lib: devres: Introduce devm_ioremap_resource() Thierry Reding 2013-01-21 10:26 ` Dmitry Torokhov 2013-01-22 17:40 ` Greg Kroah-Hartman 2013-01-22 21:00 ` Thierry Reding 2013-01-21 10:08 ` [PATCH 02/33] ARM: Convert to devm_ioremap_resource() Thierry Reding 2013-01-21 10:08 ` Thierry Reding 2013-01-21 15:58 ` Russell King - ARM Linux 2013-01-21 15:58 ` Russell King - ARM Linux 2013-01-21 16:05 ` Thierry Reding 2013-01-21 16:05 ` Thierry Reding 2013-01-21 16:16 ` Russell King - ARM Linux 2013-01-21 16:16 ` Russell King - ARM Linux 2013-01-21 17:23 ` Arnd Bergmann 2013-01-21 17:23 ` Arnd Bergmann 2013-01-22 17:37 ` Greg Kroah-Hartman 2013-01-22 17:37 ` Greg Kroah-Hartman 2013-01-21 10:08 ` [PATCH 03/33] MIPS: " Thierry Reding 2013-01-21 10:08 ` [PATCH 04/33] amba: " Thierry Reding 2013-01-21 10:08 ` [PATCH 05/33] ata: " Thierry Reding 2013-01-21 10:08 ` [PATCH 06/33] char: " Thierry Reding 2013-01-21 10:09 ` [PATCH 07/33] dma: " Thierry Reding 2013-01-28 16:00 ` Vinod Koul 2013-01-28 17:20 ` Thierry Reding 2013-01-29 13:11 ` Andy Shevchenko 2013-01-29 13:21 ` Greg Kroah-Hartman 2013-01-21 10:09 ` [PATCH 08/33] gpio: " Thierry Reding 2013-01-21 10:52 ` Viresh Kumar 2013-02-09 13:52 ` Grant Likely 2013-02-11 13:53 ` Linus Walleij 2013-02-11 15:07 ` Russell King - ARM Linux 2013-01-22 10:15 ` Linus Walleij 2013-01-22 10:25 ` Thierry Reding 2013-01-22 16:08 ` Greg Kroah-Hartman 2013-01-22 16:15 ` Thierry Reding 2013-01-23 8:36 ` Linus Walleij 2013-01-22 11:39 ` Gregory CLEMENT 2013-01-22 11:49 ` Thierry Reding 2013-01-21 10:09 ` [PATCH 09/33] drm: " Thierry Reding 2013-01-21 10:09 ` Thierry Reding 2013-01-21 10:09 ` [PATCH 10/33] i2c: " Thierry Reding 2013-01-22 22:30 ` Wolfram Sang 2013-01-22 22:30 ` Wolfram Sang 2013-01-21 10:09 ` [PATCH 11/33] iio: " Thierry Reding 2013-01-22 12:12 ` Jonathan Cameron 2013-01-21 10:09 ` [PATCH 12/33] Input: " Thierry Reding 2013-01-21 10:27 ` Dmitry Torokhov 2013-01-21 10:45 ` Viresh Kumar 2013-01-21 10:49 ` Thierry Reding 2013-01-21 10:57 ` Viresh Kumar 2013-01-21 11:00 ` Thierry Reding 2013-01-21 10:09 ` [PATCH 13/33] iommu: " Thierry Reding 2013-01-21 10:09 ` Thierry Reding 2013-01-21 10:09 ` [PATCH 14/33] media: " Thierry Reding 2013-01-22 11:04 ` Sylwester Nawrocki 2013-01-21 10:09 ` [PATCH 15/33] memory: " Thierry Reding 2013-01-21 10:09 ` [PATCH 16/33] mfd: " Thierry Reding 2013-02-03 17:22 ` Samuel Ortiz 2013-02-03 22:32 ` Samuel Ortiz 2013-01-21 10:09 ` [PATCH 17/33] misc: " Thierry Reding 2013-01-21 10:09 ` [PATCH 18/33] mmc: " Thierry Reding 2013-01-21 10:09 ` [PATCH 19/33] mtd: " Thierry Reding 2013-01-21 10:09 ` Thierry Reding 2013-01-21 10:09 ` [PATCH 20/33] net: " Thierry Reding 2013-01-21 20:29 ` David Miller 2013-01-22 6:56 ` Thierry Reding 2013-01-22 13:03 ` Arnd Bergmann 2013-01-22 13:09 ` Thierry Reding 2013-01-22 13:17 ` Arnd Bergmann 2013-01-22 19:08 ` David Miller 2013-01-22 18:58 ` David Miller 2013-01-21 10:09 ` [PATCH 21/33] pinctrl: " Thierry Reding 2013-01-21 10:50 ` Viresh Kumar 2013-01-21 10:09 ` [PATCH 22/33] power: " Thierry Reding 2013-01-21 10:09 ` [PATCH 23/33] pwm: " Thierry Reding 2013-01-21 10:49 ` Viresh Kumar 2013-01-21 10:09 ` [PATCH 24/33] rtc: " Thierry Reding 2013-01-21 10:50 ` Viresh Kumar 2013-01-21 10:09 ` [PATCH 25/33] spi: " Thierry Reding 2013-02-05 14:20 ` Grant Likely 2013-02-05 14:20 ` Grant Likely 2013-01-21 10:09 ` [PATCH 26/33] staging: " Thierry Reding 2013-01-21 10:09 ` [PATCH 27/33] thermal: " Thierry Reding 2013-01-21 10:09 ` [PATCH 28/33] serial: " Thierry Reding 2013-01-21 10:09 ` [PATCH 29/33] usb: " Thierry Reding 2013-01-21 17:16 ` Alan Stern 2013-01-21 18:50 ` Felipe Balbi 2013-01-21 10:09 ` Thierry Reding [this message] 2013-01-21 10:09 ` [PATCH 30/33] video: " Thierry Reding 2013-01-22 4:17 ` Jingoo Han 2013-01-22 4:17 ` Jingoo Han 2013-01-21 10:09 ` [PATCH 31/33] w1: " Thierry Reding 2013-01-21 10:27 ` Evgeniy Polyakov 2013-01-21 10:09 ` [PATCH 32/33] watchdog: " Thierry Reding 2013-01-21 10:09 ` [PATCH 33/33] ASoC: " Thierry Reding 2013-01-21 10:09 ` Thierry Reding 2013-01-22 7:48 ` Mark Brown 2013-01-22 7:55 ` Thierry Reding 2013-01-22 8:01 ` Mark Brown 2013-02-09 13:58 ` [PATCH 00/33] Sanitize devm_request_and_ioremap() Grant Likely
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1358762966-20791-31-git-send-email-thierry.reding@avionic-design.de \ --to=thierry.reding@avionic-design.de \ --cc=FlorianSchandinat@gmx.de \ --cc=arnd@arndb.de \ --cc=dmitry.torokhov@gmail.com \ --cc=gregkh@linuxfoundation.org \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=w.sang@pengutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.