From patchwork Fri Jun 17 20:32:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 12886006 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 459C9C43334 for ; Fri, 17 Jun 2022 20:39:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tcCBgiEVZFv08QYIJ1fFx9k4t31qLHq9zxosh7wfikY=; b=ssQV5U6tC2jGbJ 5xXrFbN3IXh1QkFawaiMeJ+P3MHpUiCcpYwRa0l+yJqAV7Z6n0H9oFJctbv2mfEx4OB1Y01gLj173 K9kDN025hqF/bJQ5WaD2X8zucZXDSQ4SV5M6u+FcvQZaiO9eRxBCKE+TLC+qpFUmqC5QjG27oDhwo dvcBbUkkPrx1dcDZsFf/gaTHyjOGWCqnam4VVOO4rFEOT0UFz1bWJZAopvS6M2v5HmAXWwdid1jfO qfCL8Oy357FezFB6lVODVKdHfVLqJdRMVAnzWwt8KZZqBntLq7DgadiFOEkVcInDp0dq3RCGWJSw8 cUBfEABemaxxVlPt5NaQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o2Ij5-008yxR-Dq; Fri, 17 Jun 2022 20:37:56 +0000 Received: from mail-db5eur01on060f.outbound.protection.outlook.com ([2a01:111:f400:fe02::60f] helo=EUR01-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o2IfN-008xNk-4v for linux-arm-kernel@lists.infradead.org; Fri, 17 Jun 2022 20:34:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nzDyYzEELwRv0EWYZiJrlyadKXEulsiRIDk33Vf03iI5P+kR7BiQ48SOPvbAn9Q4IRVWYjhvW7VhE12GDQXoKW98Ld8rGXUAEI1WtZIYB5YZEZeA6QafguFBQtRV8J2QtUNpXrfG5sDof68JAcYL2y1bn1K25y6pMs3XxuaGS0GxasijN+GtdpPhVkPej5J363511cX0F0Qe8KhdYeTs60JJQgaRtmplxyhlHmGTLWYEUWDUHFRw6fdsLP/s3i4IjgPIKZ/tTy27PnfR949MYRTHkpX6hWBVlTaFZ5Gh3GVx0bS3RprJtq0xca8dlSvRj17X0n4hxm6x1QOMS7WDag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=o4mcloslbW42z+e8XXI0Uo5WJtgDwnMYv1dVra17378=; b=kfB9CzLhUAMlpHJoak91yzkbiLgPWWmu9kT38ymewT3rGNibqhHtca5v0D72s+TMn1h2E6JLp50vS0hv8SRE8Q9BBxusFKVfZUarY/lELsF2aB4xI13TyEQPVTqxi1swtOprL7PB6m1BKil18OFGsy6592ImeJdvnhDBKdBlamMdSOVVHGYVxkLA1eRLl9+SuSHETNQWiiIDLwNW338QPXE5Vgha6sXqQVMAYhLizfjLn8QR+GirzfmMlwvTvzKGevoHDzxpoj7KQj0jQQ3UpLbXndt2hcInB7RiKWgRYIrI8XNUTHCIXO5KfJCTffotw/iYTav1Z8TZnPSPadcgEQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=o4mcloslbW42z+e8XXI0Uo5WJtgDwnMYv1dVra17378=; b=GCdE6/g7rPqq/qoAOuLXnWw+N3Gzy+n0szr/Cy4GhYSliWzS3NM9yNZrDWL/Lw9oPRg9gz+pLFAuyysM2LMVNkKzPILwiOBFza+QDrcJK7aoEI39rlNfTKYWq9wqLGdv2N3hkSLOp2x6WIrRdzTLkQw9/VISFZHlVzzfsZ0TcSt+2Z/oD6NHeFTWlSqqwEjbmF6ka2scwaYYwwWSsp7ocoqygY+4MGlTF89eRdcT179ZejphH7CSEOTixzE90StZ7WdTlc6D2xgvYz6kPyrEmcwjvs29WKedJq3dGWXkVtO65CNecnkSOyIygLPz0CZiJD7G5GixhKhsI54bB1EJkg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from VI1PR03MB4973.eurprd03.prod.outlook.com (2603:10a6:803:c5::12) by AS8PR03MB6838.eurprd03.prod.outlook.com (2603:10a6:20b:29b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.16; Fri, 17 Jun 2022 20:34:00 +0000 Received: from VI1PR03MB4973.eurprd03.prod.outlook.com ([fe80::d18f:e481:f1fa:3e8d]) by VI1PR03MB4973.eurprd03.prod.outlook.com ([fe80::d18f:e481:f1fa:3e8d%7]) with mapi id 15.20.5353.016; Fri, 17 Jun 2022 20:34:00 +0000 From: Sean Anderson To: "David S . Miller" , Jakub Kicinski , Madalin Bucur , netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Paolo Abeni , Russell King , Eric Dumazet , Sean Anderson Subject: [PATCH net-next 13/28] net: fman: memac: Use params instead of priv for max_speed Date: Fri, 17 Jun 2022 16:32:57 -0400 Message-Id: <20220617203312.3799646-14-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220617203312.3799646-1-sean.anderson@seco.com> References: <20220617203312.3799646-1-sean.anderson@seco.com> X-ClientProxiedBy: BL1PR13CA0384.namprd13.prod.outlook.com (2603:10b6:208:2c0::29) To VI1PR03MB4973.eurprd03.prod.outlook.com (2603:10a6:803:c5::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0a58dcb9-4d0c-4fc1-3143-08da50a0b5eb X-MS-TrafficTypeDiagnostic: AS8PR03MB6838:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GCgKw+03vAaWjpEsm36Am7Ae1L7dPd5PdMtUoaGMdts54B4vdNKmb8xuhj0276EPtrdQ0nHlv9O0O3lUwgYzvd9Q/kqUjkQaZQNcGkSMk0JxS2w73Hwye+AkinTzJbfKzUyiGc8pOTh+VYyS1mP7nLgt6/YAYbLiY1tVbMVO5eJ93N2hP+HFHne4IMQtcZDKq0w4zRdhmNrRg++SZp4IyQoX6x36aLJfYZBsWb02PTRoTZm700SjyOvcJyu6xMJZN3aMGlVViia8O6Hd8J54G4NqcSkcGMxjEfly8Is998WMPMuawpO2XYGFR4RmCa7QHFz0Xgk/gMn/FjL14Dme1hN5YRPInA6dA5oWkBhvxZoQZvNVXFHkTHKIQNcWq+DyES2N2kGfSTH8y3a1DCC+bGpzSs6goR5wozTl4cD/iYjOdTNVRQP1tzKQDPuVtDUNcxAAyJAkwo0+6RPeW+eHQavMHwHgRGmLYusk/CGemn8X/1WmBaLc7KvYID0l+DSz4ET9mxiGU5lhvSdLTaZ1SSXPYyLrqA9ZlKSVNnKadFBu391pLBmDbambTuC4uSDfCpqp9ZhkLD0q4v3uMylfypRZJSKa5RFT9FXm7qg3/pGWTTt/38L74ZZeaNimn+ihLUS/EI//GctyP3IwQokz7V3fdlrnReHA4P0aIXE2EfZ9yKqh5kF+nZHxbvk92jAp2d9qAOEcahp3lcN/ZpwlrQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR03MB4973.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(366004)(44832011)(2616005)(38100700002)(38350700002)(8936002)(52116002)(26005)(316002)(36756003)(4744005)(6512007)(2906002)(4326008)(66476007)(6486002)(66556008)(6506007)(5660300002)(107886003)(83380400001)(8676002)(86362001)(186003)(66946007)(6666004)(1076003)(54906003)(110136005)(498600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0SjfS20Q5gL2RygVKaUDNzLymm/2j1rBbBDwiNaE7e/tsnx3pcKJHbaMMWRPKovc4gHSkjC9RRQ7HcW0ZZrZdZyiEbc4NBT82qoZOKQ8LW/tk5YvIQsJikEdG/j5wtt+x6IPi/U8H4mZdd6b8WJoqpMPMU+lkhjK1IHuwsxxbaEnTkvk89/Z/4GcbtNoAN3Zb6hkddLY31uXRT+p72xjySy8Mh9HzwpdpzAT0RXoN4KN8DCiupFtFR1tjoyzNsApcD/MXjG9qrJUxlHdNzeruS7iM3Im7ZFvTo4/LnLA2RHM4sSBMOnw7+hMVVVvLjYCOQICYTabZTrHoJsmooevFFg9RJTb2xPoABRJMlAsRHXrm8b7z5JxuiYedayvB414lDvUsUaXT2+agey+O3cCwU9UqhKgX0DwpGVyQqlUb1SUrwtNf/Jk3xl9V/XDV4Nm6f3pje+1kuo21BQi7HyXx/5F03soqvjFEQH5l8i56cN2LlJn5H2WrsS7iEPdysNyw9bzLMAEwSUw/HNOGFIq30yLvNVTwgwEvMlOL9Q//kU9HtaK4BwH5oXxiLdi7AJRQByNvr3AEykl4ZmGpYGNJgja1jGt+hysQJ6y7/kCT2flk0CSJSDKlEWJuI1iVOvYs7/FvtLTYI44v6VMC4YCecGCU3Gnp9Lrt3XvRErXTxiUdaMykBo93A/ajNuVpbQGjCS/ibZYrtf2Rh8pDnqCwodf9u3FFsrUGh+ZGqVQutpL2pHQFsrZo96UbYtATRaZbhoC2/vZ/ZBNfpt40fHuDgYCX4MDkhQaN6CP9OKa0+z55BGS13eL0qsaqtIYQWQ7PbaK/7w4Ga/rTTrTI8I8ix7bYR6n1P4wPV6hNErs+i0D4a4ZSaS24xLzoRWrp9epiSaGc5snsRTko0kWBxX4f3u2A1hml2bWB1xWFolvhNFBPmVzJ3GlwSf7nRe7h6ERkrZXzROW7YfL7IUt7y6+uHyeVkhZ2krB7wtQ0Kmw2ZWctXWyuEDp9gxGNKSJrmgIBM2mqEkp98OIrCh0oO955+LNACKJkd1ZpjLo3LhciGVzZjW52j7i5gpctvAk7geIls4rxA80KB5BFG4lspl6rUj+gVCSeav/X5hQibiHkfGeefiguhAAdI0pwYhLGf14Mlf+1ILJ1BUK0FpAcgA5dfgnRpmPmgGemBZymvFNxgNFd0N10WEsemi18baCh7pV1T5+pfShUZ8E3gbTlmnDOd6zxZgLjDErvThWbLGCuw3uOFkZGlTTvAtDCXmGjhRShfAsGeCH5mAqBBvn7dDt2PG/nVtt7dMDVGgHZPI74ZvLnISR/vfpql6vf3FJMaGIUaRo8bCNEhbaXxhaNB4pBwtC+rX3qLUM1NONZ9/YwnVsgxnQkTVRXK2zGmB8/3Jy5JNWDahSVKo7yZ4nrTtCwAFZ9cB7Kf7rzyWGEulXVR3V9OrbijhKDJBiDP6S9PR3WCCnoVnMbLIFiGgki0xO7YTpf4LD8AMbO+P8lZkz+ewlQ3356PcEKrdfF/TZf6RB680klzvPytNHfBtSRGDghi4d9zqvcRP1ZjLJyyLxce29a8Mfuw6IDmR9aXuWq5R+MhGqQ8dCUUjtVWaoAXgmDX+CzVD9rj8+zo8/Ec1/sGyAaIpSeWzffxXfpYy2iLTf0PKEs2uITMQzSjb4ItFbthfc/E8uVwrT4VUgBHtH0OHDrp0YoRkA0gGo6rCDFvlI0jwHLogfmYWbKlpJomt6w/f6DdePWVi8Qe2XpOlDP9Y= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a58dcb9-4d0c-4fc1-3143-08da50a0b5eb X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB4973.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2022 20:34:00.5925 (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: KKosuC86nijy3eGdYRtzeyh3vaw9NohczBobiQ47157LOztmBiea3BfiHyrIWkYN+rGeQmJejg9N9uNGqqwbJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB6838 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220617_133405_339102_B3EA9F08 X-CRM114-Status: UNSURE ( 9.68 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This option is present in params, so use it instead of the fman private version. Signed-off-by: Sean Anderson --- drivers/net/ethernet/freescale/fman/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c index ac26861ea2e0..b3f947f071ee 100644 --- a/drivers/net/ethernet/freescale/fman/mac.c +++ b/drivers/net/ethernet/freescale/fman/mac.c @@ -420,7 +420,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);