From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Wed, 13 Jul 2016 12:46:40 +0000 (+0000)
Subject: stmmac: dwmac-socfpga: remove redundant dev_err call in socfpga_dwmac_parse_data()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3f30849f1f18b852f60ed04c7136967ec3a314a7;p=linux-beck.git

stmmac: dwmac-socfpga: remove redundant dev_err call in socfpga_dwmac_parse_data()

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 <yongjun_wei@trendmicro.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
index 3bc1fa2c1001..edd20c3b2b3d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -165,12 +165,8 @@ static int socfpga_dwmac_parse_data(struct socfpga_dwmac *dwmac, struct device *
 			dwmac->splitter_base =
 			    devm_ioremap_resource(dev, &res_splitter);
 
-			if (IS_ERR(dwmac->splitter_base)) {
-				dev_err(dev,
-					"%s: ERROR: failed mapping emac splitter\n",
-					__func__);
+			if (IS_ERR(dwmac->splitter_base))
 				return PTR_ERR(dwmac->splitter_base);
-			}
 		}
 
 		index = of_property_match_string(np_sgmii_adapter, "reg-names",
@@ -188,11 +184,8 @@ static int socfpga_dwmac_parse_data(struct socfpga_dwmac *dwmac, struct device *
 			dwmac->pcs.sgmii_adapter_base =
 			    devm_ioremap_resource(dev, &res_sgmii_adapter);
 
-			if (IS_ERR(dwmac->pcs.sgmii_adapter_base)) {
-				dev_err(dev, "%s: failed to mapping adapter\n",
-					__func__);
+			if (IS_ERR(dwmac->pcs.sgmii_adapter_base))
 				return PTR_ERR(dwmac->pcs.sgmii_adapter_base);
-			}
 		}
 
 		index = of_property_match_string(np_sgmii_adapter, "reg-names",
@@ -210,12 +203,8 @@ static int socfpga_dwmac_parse_data(struct socfpga_dwmac *dwmac, struct device *
 			dwmac->pcs.tse_pcs_base =
 			    devm_ioremap_resource(dev, &res_tse_pcs);
 
-			if (IS_ERR(dwmac->pcs.tse_pcs_base)) {
-				dev_err(dev,
-					"%s: ERROR: failed mapping tse control port\n",
-					__func__);
+			if (IS_ERR(dwmac->pcs.tse_pcs_base))
 				return PTR_ERR(dwmac->pcs.tse_pcs_base);
-			}
 		}
 	}
 	dwmac->reg_offset = reg_offset;