renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-29 15:43:59 +08:00
Code

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

Browse Source 
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>
This commit is contained in:
Wei Yongjun 2016-07-13 12:46:40 +00:00 committed by David S. Miller
parent 484f674bb5
commit 3f30849f1f
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
View File

@ -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;