]> git.itanic.dy.fi Git - linux-stable/commitdiff
net: fman: memac: Use params instead of priv for max_speed
authorSean Anderson <sean.anderson@seco.com>
Thu, 18 Aug 2022 16:16:35 +0000 (12:16 -0400)
committerJakub Kicinski <kuba@kernel.org>
Fri, 19 Aug 2022 23:35:55 +0000 (16:35 -0700)
This option is present in params, so use it instead of the fman private
version.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Acked-by: Camelia Groza <camelia.groza@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/freescale/fman/mac.c

index 0ac8df87308a881abc3194f394251388a44c5586..c376b9bf657d5c1710e103b4f0c7240721a25d24 100644 (file)
@@ -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(&params);