summaryrefslogtreecommitdiff
path: root/drivers/media/platform/mtk-vpu
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2016-07-12 08:01:26 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-13 08:00:23 -0300
commit14ee452f3a6db34706f2560951cd0010aff2c848 (patch)
tree0a23586080d6cff2b59bdac589b1fc14df9c05ab /drivers/media/platform/mtk-vpu
parentffe57033008ba7b09f1319ea0f7fb8d91624046a (diff)
[media] VPU: mediatek: remove redundant dev_err call in mtk_vpu_probe()
There is a error message within devm_ioremap_resource already, so remove the dev_err call to avoid redundant error message. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform/mtk-vpu')
-rw-r--r--drivers/media/platform/mtk-vpu/mtk_vpu.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c
index c8b2c72e7c48..c9bf58c97878 100644
--- a/drivers/media/platform/mtk-vpu/mtk_vpu.c
+++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c
@@ -774,17 +774,13 @@ static int mtk_vpu_probe(struct platform_device *pdev)
vpu->dev = &pdev->dev;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "tcm");
vpu->reg.tcm = devm_ioremap_resource(dev, res);
- if (IS_ERR((__force void *)vpu->reg.tcm)) {
- dev_err(dev, "devm_ioremap_resource vpu tcm failed.\n");
+ if (IS_ERR((__force void *)vpu->reg.tcm))
return PTR_ERR((__force void *)vpu->reg.tcm);
- }
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg_reg");
vpu->reg.cfg = devm_ioremap_resource(dev, res);
- if (IS_ERR((__force void *)vpu->reg.cfg)) {
- dev_err(dev, "devm_ioremap_resource vpu cfg failed.\n");
+ if (IS_ERR((__force void *)vpu->reg.cfg))
return PTR_ERR((__force void *)vpu->reg.cfg);
- }
/* Get VPU clock */
vpu->clk = devm_clk_get(dev, "main");