From: Wei Yongjun Date: Thu, 14 Jul 2016 12:57:44 +0000 (+0000) Subject: remoteproc: qcom: remove redundant dev_err call in q6v5_init_mem() X-Git-Tag: Ubuntu-4.8.0-22.24~838^2~1 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b1653f23ea464b60445ee0d7cf569b3ed6fa3f0b;p=mirror_ubuntu-zesty-kernel.git remoteproc: qcom: remove redundant dev_err call in q6v5_init_mem() 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 Signed-off-by: Bjorn Andersson --- diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c index fb4c56cc6dfc..9b0e1dd6cd8b 100644 --- a/drivers/remoteproc/qcom_q6v5_pil.c +++ b/drivers/remoteproc/qcom_q6v5_pil.c @@ -680,17 +680,13 @@ static int q6v5_init_mem(struct q6v5 *qproc, struct platform_device *pdev) res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qdsp6"); qproc->reg_base = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(qproc->reg_base)) { - dev_err(qproc->dev, "failed to get qdsp6_base\n"); + if (IS_ERR(qproc->reg_base)) return PTR_ERR(qproc->reg_base); - } res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rmb"); qproc->rmb_base = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(qproc->rmb_base)) { - dev_err(qproc->dev, "failed to get rmb_base\n"); + if (IS_ERR(qproc->rmb_base)) return PTR_ERR(qproc->rmb_base); - } ret = of_parse_phandle_with_fixed_args(pdev->dev.of_node, "qcom,halt-regs", 3, 0, &args);