Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f30849f authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller
Browse files

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: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 484f674b

drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c

+3 −14
Original line number Diff line number Diff line
@@ -165,13 +165,9 @@ 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",

						 "gmii_to_sgmii_adapter_avalon_slave");
@@ -188,12 +184,9 @@ 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",

						 "eth_tse_control_port");
@@ -210,14 +203,10 @@ 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;

	dwmac->reg_shift = reg_shift;

	dwmac->sys_mgr_base_addr = sys_mgr_base_addr;