[PATCH -next] mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe()

[PATCH -next] mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe()

[Wei Yongjun]

From: Wei Yongjun <weiyongjun1@huawei.com>

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 <weiyongjun1@huawei.com>
---
 drivers/mtd/spi-nor/aspeed-smc.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/mtd/spi-nor/aspeed-smc.c b/drivers/mtd/spi-nor/aspeed-smc.c
index 7c86099..56051d3 100644
--- a/drivers/mtd/spi-nor/aspeed-smc.c
+++ b/drivers/mtd/spi-nor/aspeed-smc.c
@@ -723,17 +723,13 @@ static int aspeed_smc_probe(struct platform_device *pdev)
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	controller->regs = devm_ioremap_resource(dev, res);
-	if (IS_ERR(controller->regs)) {
-		dev_err(dev, "Cannot remap controller address.\n");
+	if (IS_ERR(controller->regs))
 		return PTR_ERR(controller->regs);
-	}
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
 	controller->ahb_base = devm_ioremap_resource(dev, res);
-	if (IS_ERR(controller->ahb_base)) {
-		dev_err(dev, "Cannot remap controller address.\n");
+	if (IS_ERR(controller->ahb_base))
 		return PTR_ERR(controller->ahb_base);
-	}
 
 	ret = aspeed_smc_setup_flash(controller, np, res);
 	if (ret)

Re: [PATCH -next] mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe()

[Marek Vasut]

On 02/08/2017 05:23 PM, Wei Yongjun wrote:
> From: Wei Yongjun <weiyongjun1@huawei.com>
> 
> 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 <weiyongjun1@huawei.com>

Reviewed-by: Marek Vasut <marek.vasut@gmail.com>

> ---
>  drivers/mtd/spi-nor/aspeed-smc.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/mtd/spi-nor/aspeed-smc.c b/drivers/mtd/spi-nor/aspeed-smc.c
> index 7c86099..56051d3 100644
> --- a/drivers/mtd/spi-nor/aspeed-smc.c
> +++ b/drivers/mtd/spi-nor/aspeed-smc.c
> @@ -723,17 +723,13 @@ static int aspeed_smc_probe(struct platform_device *pdev)
>  
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>  	controller->regs = devm_ioremap_resource(dev, res);
> -	if (IS_ERR(controller->regs)) {
> -		dev_err(dev, "Cannot remap controller address.\n");
> +	if (IS_ERR(controller->regs))
>  		return PTR_ERR(controller->regs);
> -	}
>  
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
>  	controller->ahb_base = devm_ioremap_resource(dev, res);
> -	if (IS_ERR(controller->ahb_base)) {
> -		dev_err(dev, "Cannot remap controller address.\n");
> +	if (IS_ERR(controller->ahb_base))
>  		return PTR_ERR(controller->ahb_base);
> -	}
>  
>  	ret = aspeed_smc_setup_flash(controller, np, res);
>  	if (ret)
> 
> 
> 


-- 
Best regards,
Marek Vasut

Re: [PATCH -next] mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe()

[Brian Norris]

On Thu, Feb 09, 2017 at 09:50:23AM +0100, Marek Vasut wrote:
> On 02/08/2017 05:23 PM, Wei Yongjun wrote:
> > From: Wei Yongjun <weiyongjun1@huawei.com>
> > 
> > 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 <weiyongjun1@huawei.com>
> 
> Reviewed-by: Marek Vasut <marek.vasut@gmail.com>

The driver is new for 4.11, so I'll just take this now, directly.
Applied to l2-mtd.git.