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>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, netdev@vger.kernel.org
Cc:     Camelia Groza <camelia.groza@nxp.com>,
        linux-kernel@vger.kernel.org (open list),
        Madalin Bucur <madalin.bucur@nxp.com>,
        linuxppc-dev@lists.ozlabs.org,
        linux-arm-kernel@lists.infradead.org,
        Sean Anderson <sean.anderson@seco.com>
Subject: [RESEND PATCH net-next v4 11/25] net: fman: memac: Use params instead of priv for max_speed
Date:   Thu, 18 Aug 2022 12:16:35 -0400
Message-Id: <20220818161649.2058728-12-sean.anderson@seco.com>
In-Reply-To: <20220818161649.2058728-1-sean.anderson@seco.com>
References: <20220818161649.2058728-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?erGXD0xTFy/ZtMxSo4xvjbjXzcddqEJ2IlkLnMm5+P2aHs43OG68G1p0g7Ag?=
 =?us-ascii?Q?TelGzbBurJrvX/hZjim/xA2aFgPcQ0lZ0bm+/o18SJYIBC6WUAs7wKjaHtD2?=
 =?us-ascii?Q?Hk6c9fs/QP+UNQ/2vwFJMqMcOH3F3/dveCAfoo5C37qtsX1Y5gCWHHD8k0s4?=
 =?us-ascii?Q?8J0sAscybC2QvBAttVDXtaPzD5eQ8ox8uI+e5TMoUHyLMqqeNwLXPP88HZb0?=
 =?us-ascii?Q?3MSlQTLgSvCWSbXNLUGyJNm/yYzJCBGjR8eBw7WrSQ2ggvxN4L1n9v2iNiXk?=
 =?us-ascii?Q?TVzp7LEXbEwzQPbQc6m/vG0n/4Xsk2AfZskwy7g+cVoJWGwsNvckMNFHV0DH?=
 =?us-ascii?Q?ACl4GqAXhfeoU4PNyA7z1iHhNTavBcyTFyseiknMfPaA8R4QkKy48yGAuZ9C?=
 =?us-ascii?Q?lXD0P9oM71IbP6JMEModAE06fuMZ8+XTCi3sC5HxAZ/jqPsv/rg2J6ktq5k2?=
 =?us-ascii?Q?GV1pn0p6Z3YQsKGPaEMxO9UEIpV1Z8z/RlhdI9ss/EwdOULIiFTKSxXyAe2G?=
 =?us-ascii?Q?ZMT3LjFulNH5233GWOisJZMYf8uABBEHv3tkPm50tNkr9zzCE7gWILBB03dv?=
 =?us-ascii?Q?IXxmwJ3ww4oOYzsVTZIYAL5lOgxxQCDHGXx5pGroa0l5qHajrq1qsas7HygL?=
 =?us-ascii?Q?Y2/wT0Xv40DlTWaaS1TIbcUXKYZMsHxfX42KYeoAvp3mzblLFu3bfpJ4+M+E?=
 =?us-ascii?Q?V7TCV11sc88HWyB8rd+mO0MZiXelHOLh5Bv3lb+3+bxJxqlLCrHfNRbcNCqB?=
 =?us-ascii?Q?qIlJF0ERI3po2RvlDt3+4INj7evWLtebyat3vR4yTwpA3/chQ30D/2Rtzz7U?=
 =?us-ascii?Q?cIELkKNchWLJi6rKsmeOUBqz0HywjeSvTsoAM3yIq7zdp4KbkSSk+IYEiTqW?=
 =?us-ascii?Q?3lsls5ZCUo6UICRFmZORVD/9264OGIsjPsOLP+UrS7zYvV14xj+JjGdS1q2W?=
 =?us-ascii?Q?sKsv4KX6Hso7RO98arJmvuQ9lTerPJBAycFrAPL7+DeJyCOyDK4w8z+FNIGV?=
 =?us-ascii?Q?uUoBu2i0/Qt4qaUtznh+5EkslhwJAwWHidHwMTxtzA6ukhSjvDV30a7lzRQ9?=
 =?us-ascii?Q?8ufPVh7C6JvAEd22EKu0BdsImd3LW6He2b3d0WWW3YKIRnzEDyJsmNOEoE+R?=
 =?us-ascii?Q?MAgVFngQvNJoZD1Ggnp+0lkIu9CisARAE2JBXMwUnJey634fv6N6boUj8Fpj?=
 =?us-ascii?Q?3Ky7m5v7dTurV9TEuk2f8jGW6IGN+dZkgEX2NlnYjWd4Jsi+VxTF993fctEh?=
 =?us-ascii?Q?vsUCKvqAa4r5F+q6flGMSQDZvC2HI7GYhzmMvpgo29kzh8WQNXreE0FwCqkB?=
 =?us-ascii?Q?MQ9kVMuByXtFw8jyBLvQHAsaSuzMnzh16Mone+N4d8vkOovfjgGESJCLxhde?=
 =?us-ascii?Q?r+Wt2jrf47zWhtRZAJY0bcpz5wR/ecbEKYcvPAr2fSrW366H1Aw2sOq75Yct?=
 =?us-ascii?Q?4qDr8EZF2qoRHaUDINERonrNmglTUkZxH+RRBEdEYNwkzxLdf1KtKSw5GjL5?=
 =?us-ascii?Q?GnSplPgxT/42XU2027+nUruI9KYmd1CSd1Ly6MQe1Lpk7L4kGLWeulJ87qld?=
 =?us-ascii?Q?pLh4iBLfsdltaSm6c8AdQJ8cKaLVbF00phnWgevmgaDwzzB96S/C+9YCWleu?=
 =?us-ascii?Q?pg=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7800247a-401e-4553-01df-08da8135221c
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2022 16:17:23.3888
 (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: hL3I2lp3yxXyijirdO7nhZ5Gk1VFBgFYK8yAjgW8ihlpS/DNG1cUHYvVOp9Q0NtE1ph6TEJyDztbrjwkWYBXfA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0302MB3211
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,
        URIBL_BLOCKED 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>
Acked-by: Camelia Groza <camelia.groza@nxp.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