summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/spi-nor
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2017-02-08 16:23:10 +0000
committerBrian Norris <computersforpeace@gmail.com>2017-02-10 11:20:22 -0800
commitd91f6cee98b6e0ef5a05209ca9b741d23086cdb2 (patch)
treedc84414e5b33790421eec577eff4f55ba9cae6f6 /drivers/mtd/spi-nor
parent2bfc7452742617fe1182b742917e6e9032eae52c (diff)
downloadblackbird-op-linux-d91f6cee98b6e0ef5a05209ca9b741d23086cdb2.tar.gz
blackbird-op-linux-d91f6cee98b6e0ef5a05209ca9b741d23086cdb2.zip
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 <weiyongjun1@huawei.com> Reviewed-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/spi-nor')
-rw-r--r--drivers/mtd/spi-nor/aspeed-smc.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mtd/spi-nor/aspeed-smc.c b/drivers/mtd/spi-nor/aspeed-smc.c
index 7c86099450be..56051d30f000 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)
OpenPOWER on IntegriCloud