Commit 8e178ae0 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-ethernet-simplify-few-things' 

Krzysztof Kozlowski says:

====================
net: ethernet: Simplify few things

Few code simplifications without functional impact.
Not tested on hardware.
====================

Link: https://patch.msgid.link/20250112-syscon-phandle-args-net-v1-0-3423889935f7@linaro.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b6be5ba8 6e9c6882

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

+3 −7
Original line number Diff line number Diff line
@@ -302,15 +302,11 @@ imx_dwmac_parse_dt(struct imx_priv_data *dwmac, struct device *dev) 
		 * is required by i.MX8MP, i.MX93.

		 * is optinoal for i.MX8DXL.

		 */

		dwmac->intf_regmap = syscon_regmap_lookup_by_phandle(np, "intf_mode");

		dwmac->intf_regmap =

			syscon_regmap_lookup_by_phandle_args(np, "intf_mode", 1,

							     &dwmac->intf_reg_off);

		if (IS_ERR(dwmac->intf_regmap))

			return PTR_ERR(dwmac->intf_regmap);



		err = of_property_read_u32_index(np, "intf_mode", 1, &dwmac->intf_reg_off);

		if (err) {

			dev_err(dev, "Can't get intf mode reg offset (%d)\n", err);

			return err;

		}

	}



	return err;

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

+2 −7
Original line number Diff line number Diff line
@@ -199,16 +199,11 @@ static int sti_dwmac_parse_data(struct sti_dwmac *dwmac, 
	if (res)

		dwmac->clk_sel_reg = res->start;



	regmap = syscon_regmap_lookup_by_phandle(np, "st,syscon");

	regmap = syscon_regmap_lookup_by_phandle_args(np, "st,syscon",

						      1, &dwmac->ctrl_reg);

	if (IS_ERR(regmap))

		return PTR_ERR(regmap);



	err = of_property_read_u32_index(np, "st,syscon", 1, &dwmac->ctrl_reg);

	if (err) {

		dev_err(dev, "Can't get sysconfig ctrl offset (%d)\n", err);

		return err;

	}



	err = of_get_phy_mode(np, &dwmac->interface);

	if (err && err != -ENODEV) {

		dev_err(dev, "Can't get phy-mode\n");

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

+2 −7
Original line number Diff line number Diff line
@@ -419,16 +419,11 @@ static int stm32_dwmac_parse_data(struct stm32_dwmac *dwmac, 
	}



	/* Get mode register */

	dwmac->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscon");

	dwmac->regmap = syscon_regmap_lookup_by_phandle_args(np, "st,syscon",

							     1, &dwmac->mode_reg);

	if (IS_ERR(dwmac->regmap))

		return PTR_ERR(dwmac->regmap);



	err = of_property_read_u32_index(np, "st,syscon", 1, &dwmac->mode_reg);

	if (err) {

		dev_err(dev, "Can't get sysconfig mode offset (%d)\n", err);

		return err;

	}



	if (dwmac->ops->is_mp2)

		return 0;

drivers/net/ethernet/ti/am65-cpsw-nuss.c

+2 −7
Original line number Diff line number Diff line
@@ -2569,20 +2569,15 @@ static int am65_cpsw_am654_get_efuse_macid(struct device_node *of_node, 
{

	u32 mac_lo, mac_hi, offset;

	struct regmap *syscon;

	int ret;



	syscon = syscon_regmap_lookup_by_phandle(of_node, "ti,syscon-efuse");

	syscon = syscon_regmap_lookup_by_phandle_args(of_node, "ti,syscon-efuse",

						      1, &offset);

	if (IS_ERR(syscon)) {

		if (PTR_ERR(syscon) == -ENODEV)

			return 0;

		return PTR_ERR(syscon);

	}



	ret = of_property_read_u32_index(of_node, "ti,syscon-efuse", 1,

					 &offset);

	if (ret)

		return ret;



	regmap_read(syscon, offset, &mac_lo);

	regmap_read(syscon, offset + 4, &mac_hi);

drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c

+0 −2
Original line number Diff line number Diff line
@@ -1031,8 +1031,6 @@ static int prueth_probe(struct platform_device *pdev) 
						   (unsigned long)prueth->msmcram.va);

	prueth->msmcram.size = msmc_ram_size;

	memset_io(prueth->msmcram.va, 0, msmc_ram_size);

	dev_dbg(dev, "sram: pa %llx va %p size %zx\n", prueth->msmcram.pa,

		prueth->msmcram.va, prueth->msmcram.size);



	prueth->iep0 = icss_iep_get_idx(np, 0);

	if (IS_ERR(prueth->iep0)) {