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:     Russell King <linux@armlinux.org.uk>,
        Paolo Abeni <pabeni@redhat.com>,
        linux-arm-kernel@lists.infradead.org,
        Eric Dumazet <edumazet@google.com>,
        linux-kernel@vger.kernel.org,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH net-next v2 14/35] net: fman: memac: Use params instead of priv for max_speed
Date:   Tue, 28 Jun 2022 18:13:43 -0400
Message-Id: <20220628221404.1444200-15-sean.anderson@seco.com>
In-Reply-To: <20220628221404.1444200-1-sean.anderson@seco.com>
References: <20220628221404.1444200-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?wr3JTbbGTpUQUrJQNbLByUdkWM3AxwVWj/eSPxCX/a9+6cD9bK1tbbuoimRT?=
 =?us-ascii?Q?GcXCNFk2J1vVXkKc0WLYe+taAgVlbuxPWVZFrqX95q8fEZfYB27xleGXrCcT?=
 =?us-ascii?Q?xxakZdr+gqqMQyI2mxNFlRHNrzAxUJ9x57tNX0hnUyklNIuGtJckuepEllyG?=
 =?us-ascii?Q?O1OdvtntvV7+qOSAfNqASt7/hF13gPxD1R7cxxOd2z7lPH0MJ903SWoBgTTX?=
 =?us-ascii?Q?30cydqpehkxmDL/fmR5Y2jNUP9eG5JMoWIokDpLcJZsTGqPL7xAQ24tGzy+Z?=
 =?us-ascii?Q?hf+zjMSieqGQsD6IXGxB5bNroE8N3RRj9fPDVpHK1t6YloSvLgAhzvYWLI6d?=
 =?us-ascii?Q?xF3MSMb90pvF1YZuiUcNdMdqb/QuZzBNffNonENTa7dM8oWCqeTCt2t/xNuC?=
 =?us-ascii?Q?abqzIdvrCvqM9y9vVZVCVKolnQ2KkqseOq6memJ6MYKGINSEdEPUvTrwgXFQ?=
 =?us-ascii?Q?KNu9Y4i2sHk7Z7HDb7oeE5CbcnBROHKYwicdk3Z0UJeOLunmiij6u6M/p8cQ?=
 =?us-ascii?Q?nO1FDWZPlzMqyjvpTMEoepeqD87Dr9kACd+GZvByoMaGGUgFtuScaf5BZHCc?=
 =?us-ascii?Q?sbvY8TjymHGGS940sQ9L6qlW2TLE2x0mBwxE54mK8Np7oJvvL2XOmuafvdVQ?=
 =?us-ascii?Q?c6gHr1fQoFTA3RyNfnNqhlalZ9iecddsl/YT5ctK5PWT8488bN7++843qCVT?=
 =?us-ascii?Q?NEDH/HC/7pfYHZYhAfOoNUg8/LI4mZWP+yPq7CZy/7wVmiotB2zdT+82p4El?=
 =?us-ascii?Q?B8kx7jfkayOrUYjrrP0kBJuFyvChA3SZpWNciQTSWhfJHLIX17VXmgrPDji9?=
 =?us-ascii?Q?hB/ISpK350RwJrjvP0Gi8wEpMunJ6AjZwpMIh9qMTau9JmbpZSR4sEofbV3x?=
 =?us-ascii?Q?PJ4J6A/myriGspNxKstYy0qYGQLQdngGcUguPhrUuwYJ/GdKUHKxkbL7E97d?=
 =?us-ascii?Q?GbqUbvSuXiWZoUcnTNSU+ufv4vLOT0+UfVXlu4YnEnFdIh8oM6fdzilu49pM?=
 =?us-ascii?Q?8FytQN8ZTSC/p6wjRQGq8UNTYD8W62lTRft3NXufH6QYXkjkdBv3g80EcxUE?=
 =?us-ascii?Q?PDbp0uw1v2sKayOKJjgQAV3laqe6N7z86caMvrNcoLdQkO/JGKkCO5O6Fyu1?=
 =?us-ascii?Q?3mRrQlIqxTDnzlkkWSUeLvbTJZxykR9CpgxIzXmeyzb0jr5EfuTeFtXE3NvE?=
 =?us-ascii?Q?ZhttGI+PhWGKSQOmUlsdO7/g22q407uZtZKflEPqUawBFMo64jbwzvptWCYs?=
 =?us-ascii?Q?+Wgt20TSQuOUht0WhPfaSKZ7Jf0pjCgpx+J5z9UTvui1AAbc5joAuY0otpGb?=
 =?us-ascii?Q?psF9yrX9pPGrfJc0y8H4bTHM+ZbIlVkc9XPR+7rKcewvQWcTxr0KkikkDnHN?=
 =?us-ascii?Q?C8gmtpMZMKY0AJ4oviLr1qPmqtJDA/nndVOHsghVpVaGMy71LuH4ksSJTcWa?=
 =?us-ascii?Q?MIX46dP1LM/x50N8q4Sy2Q5UG7iKIQ8IRWPh35vaWwlhMD8kqfSaHiGSpx83?=
 =?us-ascii?Q?eL+AghQXeZcFJEU6dK7Hq/Jl21jkWsusitGHsHAftj4gY1BrmW3O2GoF6R+i?=
 =?us-ascii?Q?erVuw6whhU48juPfEitFrF5A4BiJLaEGAt6i9eDP0VxTTb1NUU/ek3D6f0a7?=
 =?us-ascii?Q?SQ=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f08c42db-1497-434e-6783-08da59539948
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2022 22:14:41.7350
 (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: eFAutiXMoMCuqA/XnmAPNYYmrE3ziTvFtFgz23+R/o4kzXI83OGS/HfzsR9WKMc5kaZwo/UjzhVoPbdJYbGKxg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7399
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,T_SCC_BODY_TEXT_LINE
        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