Skip to content

Commit

Permalink
stmmac: dwmac-socfpga: remove redundant dev_err call in socfpga_dwmac…
Browse files Browse the repository at this point in the history
…_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>
  • Loading branch information
Wei Yongjun authored and David S. Miller committed Jul 14, 2016
1 parent 484f674 commit 3f30849
Showing 1 changed file with 3 additions and 14 deletions.
17 changes: 3 additions & 14 deletions drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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;
Expand Down

0 comments on commit 3f30849

Please sign in to comment.