Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sean Anderson <sean.anderson@seco.com>
To:     "David S . Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Madalin Bucur <madalin.bucur@nxp.com>, netdev@vger.kernel.org
Cc:     Paolo Abeni <pabeni@redhat.com>,
        Eric Dumazet <edumazet@google.com>,
        linux-arm-kernel@lists.infradead.org,
        Russell King <linux@armlinux.org.uk>,
        linux-kernel@vger.kernel.org,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH net-next v3 24/47] net: fman: memac: Use params instead of priv for max_speed
Date:   Fri, 15 Jul 2022 17:59:31 -0400
Message-Id: <20220715215954.1449214-25-sean.anderson@seco.com>
In-Reply-To: <20220715215954.1449214-1-sean.anderson@seco.com>
References: <20220715215954.1449214-1-sean.anderson@seco.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jJQaDf1qm1kc8wHsYeFx1/cle7t9CPMOxCPpD/0hfwBp4svuLU/vJSZZOiS0?=
 =?us-ascii?Q?WYL9nluvfEq+XWDOG4tbzBHOM1cMSZ/NjDeRVt/E11OCHkdH/uTXFhgSuoUi?=
 =?us-ascii?Q?HOnAWYLwGS/Zn2VJhmjXuzHOSXr/4UUU0Vvwxst8uU9cZYodllerTKT63Ys3?=
 =?us-ascii?Q?CYN+dKMSxA+xJemHIN/AebOIRUzAmjLFASN2rTaFrsNC1KqcCmJPNHU2VTwT?=
 =?us-ascii?Q?m2VYPFRuJfk9z90y0A/xIY3bXVWiDuytJCRmtLdj2zpcSTQmdJ1uf0hDdxC5?=
 =?us-ascii?Q?RpjUFCX5fK7G4S+iQspjKXnWZNwnba/XJc1ic9mOXGSPzzl5sw5IgvBBXT8B?=
 =?us-ascii?Q?aRuqgj2xAC/xOhg7W6L/CKyyfl2z7JwLXQrRHXc2PYAJg2UzI+6UZRbC4E7O?=
 =?us-ascii?Q?uusrQ1of8P6c1IW9UE+IYratAPi0MMnsB9YRl9QFQ1RgBxIRT7B//z2ijbt4?=
 =?us-ascii?Q?fmCmkRCkwyxanM2wE1M5Irvv1WDjHMwXgfIGTuV5YuTEQVcfW2bPODWCDWUz?=
 =?us-ascii?Q?K2M/xCKdVTV6lUmkRfnvDMhA3R3ucPNavhqtmZXRyJmuru8r9pFhYlytP+BP?=
 =?us-ascii?Q?vzDhlcH14DwIWILzp8rLmRdBBcdfZh/9rwSD5ioZAqHxc2+wUmPW7HRgetsK?=
 =?us-ascii?Q?hzy7zd4yjsX382STvbAV4idEVbZCHpHoVb96WPT2rfnuRQIP6MXmcl6+4f69?=
 =?us-ascii?Q?nj/6Ob24oYaoPOVdkZknByzbncMBf8AYkULlowp3x8e3Vv2I9aoBkfId/N02?=
 =?us-ascii?Q?j2Eq+LiL44XftDTAmKdbJS+OBbByk5HEUjf1axcrgec0nYOMwVQKil374K9b?=
 =?us-ascii?Q?XOe5fjACogYDMVZlM0XmEh/24bWhEWNjszIDzT8pqRtxztfzuy2iO8NZRGWB?=
 =?us-ascii?Q?vQZqD/I6aI1OzS6fOOypdaD1XHq3/BTVIk0l5XBr8pvCgI9+yDZaFmj35oQr?=
 =?us-ascii?Q?lQzSk1cA8zWolPf2v3Q5huXqvy1QhYhaNrjDpxYl5F7lst9NYUI/Q4BhtK/k?=
 =?us-ascii?Q?769IFVfKPCkqeLdCa4ZM4oSTNa96L2Cg4nvvmc5B204+3sA+FT8vsnLwgoxi?=
 =?us-ascii?Q?t3fnpArGS7r4hfbRNoidmT7shzyX9RC0P/8Q0fmqzutFfEDE2rdchAZouzm8?=
 =?us-ascii?Q?hMO40E0YezD9VcoOevAlI2W3MGoGYhVEYaKQNH8JPyR+AKoENNEeqPUSwoYO?=
 =?us-ascii?Q?GGg7y09u8JUVuNfTixdGDcLOr+HtoW+L0LUrPO2zAvEU4wut0ix2JU37C6BE?=
 =?us-ascii?Q?ivCF48lNrKAoUDMXjsvppfNLfYzT1jXq/NV0FeDj9fTOJ2VvizQLt+wxHMtt?=
 =?us-ascii?Q?2FJ6jxIZgxEMnTWh9X6FU4uC5vzSLcfyrZH+OLvepz6lEDq6gR4O+OZrgnkg?=
 =?us-ascii?Q?NQd2umjnKw7Oc0dBTUWF/+y3T4OkLM2ryqeHxf2oL2X6byA4I4oB6sHyq0lO?=
 =?us-ascii?Q?WzAbGlyz2jMk4mrr2xogq8/KMf6tExRJC9Ap4YjgAR5SIZaiaQrlkiKHH/R5?=
 =?us-ascii?Q?ivljhsdLhSD1OYOKC4kXVP6tHdYesPlfMBmWggZDVT86TAgt/boXDtACjdDb?=
 =?us-ascii?Q?R+LgxevCIEcRSr0zpi6Stp8+/p+V03va4onzIXua8pHikMfSKUmTTmHXnRu2?=
 =?us-ascii?Q?hA=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 14d9ed15-2813-4189-9053-08da66ad8567
X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB4973.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2022 22:01:08.2066
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: XAF2TcUkX559nK/DhwigLZvo6yrn7/T7zmaF1Vc7grby1VWlXdexN4gSOiWtiDzkCkf4Ki6IkloWhbKcVk+4xw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR03MB2902
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This option is present in params, so use it instead of the fman private
version.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---

(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(&params);
-- 
2.35.1.1320.gc452695387.dirty