stmmac: dwmac-socfpga: remove redundant dev_err call in socfpga_dwmac_parse_data()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Wed, 13 Jul 2016 12:46:40 +0000 (12:46 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 14 Jul 2016 01:07:56 +0000 (18:07 -0700)
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>
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c

index 3bc1fa2c1001e78ac3042dbe418fe13f0c9bbd1d..edd20c3b2b3d538254f501e1b837ee39f846e9f8 100644 (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;