From: Wei Yongjun Date: Wed, 8 Feb 2017 16:23:10 +0000 (+0000) Subject: mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d91f6cee98b6e0ef5a05209ca9b741d23086cdb2;p=linux.git mtd: aspeed: remove redundant dev_err call in aspeed_smc_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 Reviewed-by: Marek Vasut Signed-off-by: Brian Norris --- diff --git a/drivers/mtd/spi-nor/aspeed-smc.c b/drivers/mtd/spi-nor/aspeed-smc.c index 7c86099450bed..56051d30f0008 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)