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

net: stmmac: ingenic: pass ingenic_mac struct rather than plat_dat 



It no longer makes sense to pass a pointer to struct
plat_stmmacenet_data when calling the set_mode() methods to only use it
to get a pointer to the ingenic_mac structure that we already had in
the caller. Simplify this by passing the struct ingenic_mac pointer.

Reviewed-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vHHqT-0000000Djrh-0ka3@rmk-PC.armlinux.org.uk


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

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

+7 −18
Original line number Diff line number Diff line
@@ -64,15 +64,13 @@ struct ingenic_soc_info { 
	enum ingenic_mac_version version;

	u32 mask;



	int (*set_mode)(struct plat_stmmacenet_data *plat_dat, u8 phy_intf_sel);

	int (*set_mode)(struct ingenic_mac *mac, u8 phy_intf_sel);



	u8 valid_phy_intf_sel;

};



static int jz4775_mac_set_mode(struct plat_stmmacenet_data *plat_dat,

			       u8 phy_intf_sel)

static int jz4775_mac_set_mode(struct ingenic_mac *mac, u8 phy_intf_sel)

{

	struct ingenic_mac *mac = plat_dat->bsp_priv;

	unsigned int val;



	val = FIELD_PREP(MACPHYC_PHY_INFT_MASK, phy_intf_sel) |
@@ -82,19 +80,14 @@ static int jz4775_mac_set_mode(struct plat_stmmacenet_data *plat_dat, 
	return regmap_update_bits(mac->regmap, 0, mac->soc_info->mask, val);

}



static int x1000_mac_set_mode(struct plat_stmmacenet_data *plat_dat,

			      u8 phy_intf_sel)

static int x1000_mac_set_mode(struct ingenic_mac *mac, u8 phy_intf_sel)

{

	struct ingenic_mac *mac = plat_dat->bsp_priv;



	/* Update MAC PHY control register */

	return regmap_update_bits(mac->regmap, 0, mac->soc_info->mask, 0);

}



static int x1600_mac_set_mode(struct plat_stmmacenet_data *plat_dat,

			      u8 phy_intf_sel)

static int x1600_mac_set_mode(struct ingenic_mac *mac, u8 phy_intf_sel)

{

	struct ingenic_mac *mac = plat_dat->bsp_priv;

	unsigned int val;



	val = FIELD_PREP(MACPHYC_PHY_INFT_MASK, phy_intf_sel);
@@ -103,10 +96,8 @@ static int x1600_mac_set_mode(struct plat_stmmacenet_data *plat_dat, 
	return regmap_update_bits(mac->regmap, 0, mac->soc_info->mask, val);

}



static int x1830_mac_set_mode(struct plat_stmmacenet_data *plat_dat,

			      u8 phy_intf_sel)

static int x1830_mac_set_mode(struct ingenic_mac *mac, u8 phy_intf_sel)

{

	struct ingenic_mac *mac = plat_dat->bsp_priv;

	unsigned int val;



	val = FIELD_PREP(MACPHYC_MODE_SEL_MASK, MACPHYC_MODE_SEL_RMII) |
@@ -116,10 +107,8 @@ static int x1830_mac_set_mode(struct plat_stmmacenet_data *plat_dat, 
	return regmap_update_bits(mac->regmap, 0, mac->soc_info->mask, val);

}



static int x2000_mac_set_mode(struct plat_stmmacenet_data *plat_dat,

			      u8 phy_intf_sel)

static int x2000_mac_set_mode(struct ingenic_mac *mac, u8 phy_intf_sel)

{

	struct ingenic_mac *mac = plat_dat->bsp_priv;

	unsigned int val;



	val = FIELD_PREP(MACPHYC_PHY_INFT_MASK, phy_intf_sel);
@@ -165,7 +154,7 @@ static int ingenic_mac_init(struct platform_device *pdev, void *bsp_priv) 
		dev_dbg(mac->dev, "MAC PHY control register: interface %s\n",

			phy_modes(interface));



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

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

		if (ret)

			return ret;

	}