aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/sh_veu.c
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-03-04 03:15:18 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-21 13:35:14 -0400
commitf2b4dc1a0fc8f52e06025497ce9bb252ff51f15f (patch)
treef93854957227a00b1bb07e4d5935205bdb347312 /drivers/media/platform/sh_veu.c
parent8efdb13543909af277a93bab17730e92b552b7c9 (diff)
[media] sh_veu.c: Convert to devm_ioremap_resource()
Use the newly introduced devm_ioremap_resource() instead of devm_request_and_ioremap() which provides more consistent error handling. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/sh_veu.c')
-rw-r--r--drivers/media/platform/sh_veu.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c
index cb54c69d5748..362d88ec6ea1 100644
--- a/drivers/media/platform/sh_veu.c
+++ b/drivers/media/platform/sh_veu.c
@@ -10,6 +10,7 @@
10 * published by the Free Software Foundation 10 * published by the Free Software Foundation
11 */ 11 */
12 12
13#include <linux/err.h>
13#include <linux/fs.h> 14#include <linux/fs.h>
14#include <linux/kernel.h> 15#include <linux/kernel.h>
15#include <linux/module.h> 16#include <linux/module.h>
@@ -1164,9 +1165,9 @@ static int sh_veu_probe(struct platform_device *pdev)
1164 1165
1165 veu->is_2h = resource_size(reg_res) == 0x22c; 1166 veu->is_2h = resource_size(reg_res) == 0x22c;
1166 1167
1167 veu->base = devm_request_and_ioremap(&pdev->dev, reg_res); 1168 veu->base = devm_ioremap_resource(&pdev->dev, reg_res);
1168 if (!veu->base) 1169 if (IS_ERR(veu->base))
1169 return -ENOMEM; 1170 return PTR_ERR(veu->base);
1170 1171
1171 ret = devm_request_threaded_irq(&pdev->dev, irq, sh_veu_isr, sh_veu_bh, 1172 ret = devm_request_threaded_irq(&pdev->dev, irq, sh_veu_isr, sh_veu_bh,
1172 0, "veu", veu); 1173 0, "veu", veu);