提交 3f30849f 编写于 作者: W Wei Yongjun 提交者: David S. Miller

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: NWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 484f674b
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册