Commit 34bf68a6 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: ingenic: use ->set_phy_intf_sel() 



Rather than placing the phy_intf_sel() setup in the ->init() method,
move it to the new ->set_phy_intf_sel() method.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vHHqY-0000000Djrn-1D6H@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9352f74f

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

+11 −22
Original line number Diff line number Diff line
@@ -134,32 +134,21 @@ static int x2000_mac_set_mode(struct ingenic_mac *mac, u8 phy_intf_sel) 
	return regmap_update_bits(mac->regmap, 0, mac->soc_info->mask, val);

}



static int ingenic_mac_init(struct platform_device *pdev, void *bsp_priv)

static int ingenic_set_phy_intf_sel(void *bsp_priv, u8 phy_intf_sel)

{

	struct ingenic_mac *mac = bsp_priv;

	phy_interface_t interface;

	int phy_intf_sel, ret;



	if (mac->soc_info->set_mode) {

		interface = mac->plat_dat->phy_interface;



		phy_intf_sel = stmmac_get_phy_intf_sel(interface);

		if (phy_intf_sel < 0 || phy_intf_sel >= BITS_PER_BYTE ||

		    ~mac->soc_info->valid_phy_intf_sel & BIT(phy_intf_sel)) {

			dev_err(mac->dev, "unsupported interface %s\n",

				phy_modes(interface));

			return phy_intf_sel < 0 ? phy_intf_sel : -EINVAL;

		}



		dev_dbg(mac->dev, "MAC PHY control register: interface %s\n",

			phy_modes(interface));

	if (!mac->soc_info->set_mode)

		return 0;



		ret = mac->soc_info->set_mode(mac, phy_intf_sel);

		if (ret)

			return ret;

	}

	if (phy_intf_sel >= BITS_PER_BYTE ||

	    ~mac->soc_info->valid_phy_intf_sel & BIT(phy_intf_sel))

		return -EINVAL;



	return 0;

	dev_dbg(mac->dev, "MAC PHY control register: interface %s\n",

		phy_modes(mac->plat_dat->phy_interface));



	return mac->soc_info->set_mode(mac, phy_intf_sel);

}



static int ingenic_mac_probe(struct platform_device *pdev)
@@ -221,7 +210,7 @@ static int ingenic_mac_probe(struct platform_device *pdev) 
	mac->plat_dat = plat_dat;



	plat_dat->bsp_priv = mac;

	plat_dat->init = ingenic_mac_init;

	plat_dat->set_phy_intf_sel = ingenic_set_phy_intf_sel;



	return devm_stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res);

}