[RESEND PATCH net-next v4 11/25] net: fman: memac: Use params instead of priv for max_speed
From: Sean Anderson
Date: Thu Aug 18 2022 - 12:18:31 EST
This option is present in params, so use it instead of the fman private
version.
Signed-off-by: Sean Anderson <sean.anderson@xxxxxxxx>
Acked-by: Camelia Groza <camelia.groza@xxxxxxx>
---
(no changes since v1)
drivers/net/ethernet/freescale/fman/mac.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
index 0ac8df87308a..c376b9bf657d 100644
--- a/drivers/net/ethernet/freescale/fman/mac.c
+++ b/drivers/net/ethernet/freescale/fman/mac.c
@@ -388,11 +388,9 @@ static int memac_initialization(struct mac_device *mac_dev,
struct device_node *mac_node)
{
int err;
- struct mac_priv_s *priv;
struct fman_mac_params params;
struct fixed_phy_status *fixed_link;
- priv = mac_dev->priv;
mac_dev->set_promisc = memac_set_promiscuous;
mac_dev->change_addr = memac_modify_mac_address;
mac_dev->add_hash_mac_addr = memac_add_hash_mac_address;
@@ -412,7 +410,7 @@ static int memac_initialization(struct mac_device *mac_dev,
goto _return;
params.internal_phy_node = of_parse_phandle(mac_node, "pcsphy-handle", 0);
- if (priv->max_speed == SPEED_10000)
+ if (params.max_speed == SPEED_10000)
params.phy_if = PHY_INTERFACE_MODE_XGMII;
mac_dev->fman_mac = memac_config(¶ms);
--
2.35.1.1320.gc452695387.dirty