Message ID | 20240904185417.14357-1-liujing@cmss.chinamobile.com (mailing list archive) |
---|---|
State | Handled Elsewhere |
Headers | show |
Series | remoteproc:remove redundant dev_err message | expand |
On Thu, Sep 05, 2024 at 02:54:17AM +0800, Liu Jing wrote: > devm_ioremap_resource already contains error message, so remove > the redundant dev_err message > > Signed-off-by: Liu Jing <liujing@cmss.chinamobile.com> > > diff --git a/drivers/remoteproc/da8xx_remoteproc.c b/drivers/remoteproc/da8xx_remoteproc.c > index 9041a0e07fb2..289d5ce9f7af 100644 > --- a/drivers/remoteproc/da8xx_remoteproc.c > +++ b/drivers/remoteproc/da8xx_remoteproc.c > @@ -214,8 +214,6 @@ static int da8xx_rproc_get_internal_memories(struct platform_device *pdev, > mem_names[i]); > drproc->mem[i].cpu_addr = devm_ioremap_resource(dev, res); > if (IS_ERR(drproc->mem[i].cpu_addr)) { > - dev_err(dev, "failed to parse and map %s memory\n", > - mem_names[i]); > return PTR_ERR(drproc->mem[i].cpu_addr); > } > drproc->mem[i].bus_addr = res->start; > diff --git a/drivers/remoteproc/ingenic_rproc.c b/drivers/remoteproc/ingenic_rproc.c > index 9902cce28692..b3ee5c47001d 100644 > --- a/drivers/remoteproc/ingenic_rproc.c > +++ b/drivers/remoteproc/ingenic_rproc.c > @@ -186,7 +186,6 @@ static int ingenic_rproc_probe(struct platform_device *pdev) > mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "aux"); > vpu->aux_base = devm_ioremap_resource(dev, mem); > if (IS_ERR(vpu->aux_base)) { > - dev_err(dev, "Failed to ioremap\n"); > return PTR_ERR(vpu->aux_base); > } > > @@ -197,7 +196,6 @@ static int ingenic_rproc_probe(struct platform_device *pdev) > vpu->mem_info[i].base = devm_ioremap_resource(dev, mem); > if (IS_ERR(vpu->mem_info[i].base)) { > ret = PTR_ERR(vpu->mem_info[i].base); > - dev_err(dev, "Failed to ioremap\n"); > return ret; > } > > diff --git a/drivers/remoteproc/keystone_remoteproc.c b/drivers/remoteproc/keystone_remoteproc.c > index 7e57b90bcaf8..a31f94a290c9 100644 > --- a/drivers/remoteproc/keystone_remoteproc.c > +++ b/drivers/remoteproc/keystone_remoteproc.c > @@ -312,8 +312,6 @@ static int keystone_rproc_of_get_memories(struct platform_device *pdev, > mem_names[i]); > ksproc->mem[i].cpu_addr = devm_ioremap_resource(dev, res); > if (IS_ERR(ksproc->mem[i].cpu_addr)) { > - dev_err(dev, "failed to parse and map %s memory\n", > - mem_names[i]); > return PTR_ERR(ksproc->mem[i].cpu_addr); > } > ksproc->mem[i].bus_addr = res->start; > diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c > index e744c07507ee..cb8ad16583c7 100644 > --- a/drivers/remoteproc/mtk_scp.c > +++ b/drivers/remoteproc/mtk_scp.c > @@ -1126,7 +1126,6 @@ static struct mtk_scp *scp_rproc_init(struct platform_device *pdev, > res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sram"); > scp->sram_base = devm_ioremap_resource(dev, res); > if (IS_ERR(scp->sram_base)) { > - dev_err(dev, "Failed to parse and map sram memory\n"); > return ERR_CAST(scp->sram_base); > } There is another instance in the Mediatek driver - please address. Thanks, Mathieu > > diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c > index 9ae2e831456d..07e707776cf9 100644 > --- a/drivers/remoteproc/omap_remoteproc.c > +++ b/drivers/remoteproc/omap_remoteproc.c > @@ -1201,8 +1201,6 @@ static int omap_rproc_of_get_internal_memories(struct platform_device *pdev, > } > oproc->mem[i].cpu_addr = devm_ioremap_resource(dev, res); > if (IS_ERR(oproc->mem[i].cpu_addr)) { > - dev_err(dev, "failed to parse and map %s memory\n", > - data->mems[i].name); > return PTR_ERR(oproc->mem[i].cpu_addr); > } > oproc->mem[i].bus_addr = res->start; > diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c > index 327f0c7ee3d6..85b95e025c17 100644 > --- a/drivers/remoteproc/pru_rproc.c > +++ b/drivers/remoteproc/pru_rproc.c > @@ -1047,8 +1047,6 @@ static int pru_rproc_probe(struct platform_device *pdev) > mem_names[i]); > pru->mem_regions[i].va = devm_ioremap_resource(dev, res); > if (IS_ERR(pru->mem_regions[i].va)) { > - dev_err(dev, "failed to parse and map memory resource %d %s\n", > - i, mem_names[i]); > ret = PTR_ERR(pru->mem_regions[i].va); > return ret; > } > diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c > index 572dcb0f055b..fe65ffa9a93f 100644 > --- a/drivers/remoteproc/qcom_q6v5_adsp.c > +++ b/drivers/remoteproc/qcom_q6v5_adsp.c > @@ -602,7 +602,6 @@ static int adsp_init_mmio(struct qcom_adsp *adsp, > } else { > adsp->lpass_efuse = devm_ioremap_resource(&pdev->dev, efuse_region); > if (IS_ERR(adsp->lpass_efuse)) { > - dev_err(adsp->dev, "failed to map efuse registers\n"); > return PTR_ERR(adsp->lpass_efuse); > } > } > diff --git a/drivers/remoteproc/st_slim_rproc.c b/drivers/remoteproc/st_slim_rproc.c > index d17719384c16..a6e50f51c794 100644 > --- a/drivers/remoteproc/st_slim_rproc.c > +++ b/drivers/remoteproc/st_slim_rproc.c > @@ -251,7 +251,6 @@ struct st_slim_rproc *st_slim_rproc_alloc(struct platform_device *pdev, > > slim_rproc->mem[i].cpu_addr = devm_ioremap_resource(dev, res); > if (IS_ERR(slim_rproc->mem[i].cpu_addr)) { > - dev_err(&pdev->dev, "devm_ioremap_resource failed\n"); > err = PTR_ERR(slim_rproc->mem[i].cpu_addr); > goto err; > } > @@ -262,7 +261,6 @@ struct st_slim_rproc *st_slim_rproc_alloc(struct platform_device *pdev, > res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "slimcore"); > slim_rproc->slimcore = devm_ioremap_resource(dev, res); > if (IS_ERR(slim_rproc->slimcore)) { > - dev_err(&pdev->dev, "failed to ioremap slimcore IO\n"); > err = PTR_ERR(slim_rproc->slimcore); > goto err; > } > @@ -270,7 +268,6 @@ struct st_slim_rproc *st_slim_rproc_alloc(struct platform_device *pdev, > res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "peripherals"); > slim_rproc->peri = devm_ioremap_resource(dev, res); > if (IS_ERR(slim_rproc->peri)) { > - dev_err(&pdev->dev, "failed to ioremap peripherals IO\n"); > err = PTR_ERR(slim_rproc->peri); > goto err; > } > diff --git a/drivers/remoteproc/wkup_m3_rproc.c b/drivers/remoteproc/wkup_m3_rproc.c > index 36a55f7ffa64..5648f450c018 100644 > --- a/drivers/remoteproc/wkup_m3_rproc.c > +++ b/drivers/remoteproc/wkup_m3_rproc.c > @@ -186,8 +186,6 @@ static int wkup_m3_rproc_probe(struct platform_device *pdev) > mem_names[i]); > wkupm3->mem[i].cpu_addr = devm_ioremap_resource(dev, res); > if (IS_ERR(wkupm3->mem[i].cpu_addr)) { > - dev_err(&pdev->dev, "devm_ioremap_resource failed for resource %d\n", > - i); > ret = PTR_ERR(wkupm3->mem[i].cpu_addr); > goto err_put_rproc; > } > -- > 2.33.0 > > >
diff --git a/drivers/remoteproc/da8xx_remoteproc.c b/drivers/remoteproc/da8xx_remoteproc.c index 9041a0e07fb2..289d5ce9f7af 100644 --- a/drivers/remoteproc/da8xx_remoteproc.c +++ b/drivers/remoteproc/da8xx_remoteproc.c @@ -214,8 +214,6 @@ static int da8xx_rproc_get_internal_memories(struct platform_device *pdev, mem_names[i]); drproc->mem[i].cpu_addr = devm_ioremap_resource(dev, res); if (IS_ERR(drproc->mem[i].cpu_addr)) { - dev_err(dev, "failed to parse and map %s memory\n", - mem_names[i]); return PTR_ERR(drproc->mem[i].cpu_addr); } drproc->mem[i].bus_addr = res->start; diff --git a/drivers/remoteproc/ingenic_rproc.c b/drivers/remoteproc/ingenic_rproc.c index 9902cce28692..b3ee5c47001d 100644 --- a/drivers/remoteproc/ingenic_rproc.c +++ b/drivers/remoteproc/ingenic_rproc.c @@ -186,7 +186,6 @@ static int ingenic_rproc_probe(struct platform_device *pdev) mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "aux"); vpu->aux_base = devm_ioremap_resource(dev, mem); if (IS_ERR(vpu->aux_base)) { - dev_err(dev, "Failed to ioremap\n"); return PTR_ERR(vpu->aux_base); } @@ -197,7 +196,6 @@ static int ingenic_rproc_probe(struct platform_device *pdev) vpu->mem_info[i].base = devm_ioremap_resource(dev, mem); if (IS_ERR(vpu->mem_info[i].base)) { ret = PTR_ERR(vpu->mem_info[i].base); - dev_err(dev, "Failed to ioremap\n"); return ret; } diff --git a/drivers/remoteproc/keystone_remoteproc.c b/drivers/remoteproc/keystone_remoteproc.c index 7e57b90bcaf8..a31f94a290c9 100644 --- a/drivers/remoteproc/keystone_remoteproc.c +++ b/drivers/remoteproc/keystone_remoteproc.c @@ -312,8 +312,6 @@ static int keystone_rproc_of_get_memories(struct platform_device *pdev, mem_names[i]); ksproc->mem[i].cpu_addr = devm_ioremap_resource(dev, res); if (IS_ERR(ksproc->mem[i].cpu_addr)) { - dev_err(dev, "failed to parse and map %s memory\n", - mem_names[i]); return PTR_ERR(ksproc->mem[i].cpu_addr); } ksproc->mem[i].bus_addr = res->start; diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c index e744c07507ee..cb8ad16583c7 100644 --- a/drivers/remoteproc/mtk_scp.c +++ b/drivers/remoteproc/mtk_scp.c @@ -1126,7 +1126,6 @@ static struct mtk_scp *scp_rproc_init(struct platform_device *pdev, res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sram"); scp->sram_base = devm_ioremap_resource(dev, res); if (IS_ERR(scp->sram_base)) { - dev_err(dev, "Failed to parse and map sram memory\n"); return ERR_CAST(scp->sram_base); } diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c index 9ae2e831456d..07e707776cf9 100644 --- a/drivers/remoteproc/omap_remoteproc.c +++ b/drivers/remoteproc/omap_remoteproc.c @@ -1201,8 +1201,6 @@ static int omap_rproc_of_get_internal_memories(struct platform_device *pdev, } oproc->mem[i].cpu_addr = devm_ioremap_resource(dev, res); if (IS_ERR(oproc->mem[i].cpu_addr)) { - dev_err(dev, "failed to parse and map %s memory\n", - data->mems[i].name); return PTR_ERR(oproc->mem[i].cpu_addr); } oproc->mem[i].bus_addr = res->start; diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c index 327f0c7ee3d6..85b95e025c17 100644 --- a/drivers/remoteproc/pru_rproc.c +++ b/drivers/remoteproc/pru_rproc.c @@ -1047,8 +1047,6 @@ static int pru_rproc_probe(struct platform_device *pdev) mem_names[i]); pru->mem_regions[i].va = devm_ioremap_resource(dev, res); if (IS_ERR(pru->mem_regions[i].va)) { - dev_err(dev, "failed to parse and map memory resource %d %s\n", - i, mem_names[i]); ret = PTR_ERR(pru->mem_regions[i].va); return ret; } diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c index 572dcb0f055b..fe65ffa9a93f 100644 --- a/drivers/remoteproc/qcom_q6v5_adsp.c +++ b/drivers/remoteproc/qcom_q6v5_adsp.c @@ -602,7 +602,6 @@ static int adsp_init_mmio(struct qcom_adsp *adsp, } else { adsp->lpass_efuse = devm_ioremap_resource(&pdev->dev, efuse_region); if (IS_ERR(adsp->lpass_efuse)) { - dev_err(adsp->dev, "failed to map efuse registers\n"); return PTR_ERR(adsp->lpass_efuse); } } diff --git a/drivers/remoteproc/st_slim_rproc.c b/drivers/remoteproc/st_slim_rproc.c index d17719384c16..a6e50f51c794 100644 --- a/drivers/remoteproc/st_slim_rproc.c +++ b/drivers/remoteproc/st_slim_rproc.c @@ -251,7 +251,6 @@ struct st_slim_rproc *st_slim_rproc_alloc(struct platform_device *pdev, slim_rproc->mem[i].cpu_addr = devm_ioremap_resource(dev, res); if (IS_ERR(slim_rproc->mem[i].cpu_addr)) { - dev_err(&pdev->dev, "devm_ioremap_resource failed\n"); err = PTR_ERR(slim_rproc->mem[i].cpu_addr); goto err; } @@ -262,7 +261,6 @@ struct st_slim_rproc *st_slim_rproc_alloc(struct platform_device *pdev, res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "slimcore"); slim_rproc->slimcore = devm_ioremap_resource(dev, res); if (IS_ERR(slim_rproc->slimcore)) { - dev_err(&pdev->dev, "failed to ioremap slimcore IO\n"); err = PTR_ERR(slim_rproc->slimcore); goto err; } @@ -270,7 +268,6 @@ struct st_slim_rproc *st_slim_rproc_alloc(struct platform_device *pdev, res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "peripherals"); slim_rproc->peri = devm_ioremap_resource(dev, res); if (IS_ERR(slim_rproc->peri)) { - dev_err(&pdev->dev, "failed to ioremap peripherals IO\n"); err = PTR_ERR(slim_rproc->peri); goto err; } diff --git a/drivers/remoteproc/wkup_m3_rproc.c b/drivers/remoteproc/wkup_m3_rproc.c index 36a55f7ffa64..5648f450c018 100644 --- a/drivers/remoteproc/wkup_m3_rproc.c +++ b/drivers/remoteproc/wkup_m3_rproc.c @@ -186,8 +186,6 @@ static int wkup_m3_rproc_probe(struct platform_device *pdev) mem_names[i]); wkupm3->mem[i].cpu_addr = devm_ioremap_resource(dev, res); if (IS_ERR(wkupm3->mem[i].cpu_addr)) { - dev_err(&pdev->dev, "devm_ioremap_resource failed for resource %d\n", - i); ret = PTR_ERR(wkupm3->mem[i].cpu_addr); goto err_put_rproc; }
devm_ioremap_resource already contains error message, so remove the redundant dev_err message Signed-off-by: Liu Jing <liujing@cmss.chinamobile.com>