Message ID | 20210608084715.1046300-1-chenxiaosong2@huawei.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [-next,resend] EDAC/armada_xp: Remove redundant dev_err call in axp_mc_probe() and aurora_l2_probe() | expand |
On Tue, Jun 08, 2021 at 04:47:15PM +0800, ChenXiaoSong wrote: > There is a error message within devm_ioremap_resource > already, so remove the dev_err call to avoid redundant > error message. > > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: ChenXiaoSong <chenxiaosong2@huawei.com> > --- > drivers/edac/armada_xp_edac.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/edac/armada_xp_edac.c b/drivers/edac/armada_xp_edac.c > index e3e757513d1b..9661c72e6554 100644 > --- a/drivers/edac/armada_xp_edac.c > +++ b/drivers/edac/armada_xp_edac.c > @@ -297,10 +297,8 @@ static int axp_mc_probe(struct platform_device *pdev) > } > > base = devm_ioremap_resource(&pdev->dev, r); > - if (IS_ERR(base)) { > - dev_err(&pdev->dev, "Unable to map regs\n"); > + if (IS_ERR(base)) > return PTR_ERR(base); > - } > > config = readl(base + SDRAM_CONFIG_REG); > if (!(config & SDRAM_CONFIG_ECC_MASK)) { > @@ -525,10 +523,8 @@ static int aurora_l2_probe(struct platform_device *pdev) > } > > base = devm_ioremap_resource(&pdev->dev, r); > - if (IS_ERR(base)) { > - dev_err(&pdev->dev, "Unable to map regs\n"); > + if (IS_ERR(base)) > return PTR_ERR(base); > - } > > l2x0_aux_ctrl = readl(base + L2X0_AUX_CTRL); > if (!(l2x0_aux_ctrl & AURORA_ACR_PARITY_EN)) > -- https://lkml.kernel.org/r/YLT7JOR3fND5Y3K2@zn.tnic
diff --git a/drivers/edac/armada_xp_edac.c b/drivers/edac/armada_xp_edac.c index e3e757513d1b..9661c72e6554 100644 --- a/drivers/edac/armada_xp_edac.c +++ b/drivers/edac/armada_xp_edac.c @@ -297,10 +297,8 @@ static int axp_mc_probe(struct platform_device *pdev) } base = devm_ioremap_resource(&pdev->dev, r); - if (IS_ERR(base)) { - dev_err(&pdev->dev, "Unable to map regs\n"); + if (IS_ERR(base)) return PTR_ERR(base); - } config = readl(base + SDRAM_CONFIG_REG); if (!(config & SDRAM_CONFIG_ECC_MASK)) { @@ -525,10 +523,8 @@ static int aurora_l2_probe(struct platform_device *pdev) } base = devm_ioremap_resource(&pdev->dev, r); - if (IS_ERR(base)) { - dev_err(&pdev->dev, "Unable to map regs\n"); + if (IS_ERR(base)) return PTR_ERR(base); - } l2x0_aux_ctrl = readl(base + L2X0_AUX_CTRL); if (!(l2x0_aux_ctrl & AURORA_ACR_PARITY_EN))
There is a error message within devm_ioremap_resource already, so remove the dev_err call to avoid redundant error message. Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: ChenXiaoSong <chenxiaosong2@huawei.com> --- drivers/edac/armada_xp_edac.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- 2.25.4