diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2016-07-13 12:46:40 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-13 18:07:56 -0700 |
| commit | 3f30849f1f18b852f60ed04c7136967ec3a314a7 (patch) | |
| tree | 95b2ba1ff70d7d0a2d0532e43383cf1aed0f6ec9 | |
| parent | 484f674bb51cdce21b507c0a79d56a9741e6eb9f (diff) | |
| download | linux-3f30849f1f18b852f60ed04c7136967ec3a314a7.tar.bz2 | |
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>
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 17 |
1 files changed, 3 insertions, 14 deletions
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; |