From patchwork Fri Jul 15 21:59:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 12919850 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 E545CC433EF for ; Fri, 15 Jul 2022 22:24:25 +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=BFC/upyjv7Aw+x4usCKWIgK5O7OzJaTWYSwKVspLwsk=; b=w6Oboar/L3w1LM jPIdB3oD5MFrJ8BG9ji2CBGawELgyZEgNKSf5RnAZzfQW6wB66RYALfvwJBaU1x3j51DPvTbfw6fh AUFQJNP8iV4osxPCdNOa9iOvp1kMNnHo3Lo9Vb05PLB4vN4zNwbeQEG9QbPKmtR0Q44MoriOy0uWc a3MJWXtVGADjA+b+h8+1AFh6++syGXAYhnqxL5+9+8oqClPM7stXff9S9+r6SYrY+IEz0V3EKZkCt bASSSGKSU2fLvBlZIpEYwE1dDEh2ena1S+cF76QPZqOfHtR2enJuA7YKa42RmkQg2/ArBqK24SY16 v/tECpZGLRS67ImYR6DA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oCThq-00AkZt-6y; Fri, 15 Jul 2022 22:22:44 +0000 Received: from mail-eopbgr60055.outbound.protection.outlook.com ([40.107.6.55] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oCTN3-00AbL9-Re for linux-arm-kernel@lists.infradead.org; Fri, 15 Jul 2022 22:01:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZX5qQ9s4NTJCBFr295bjIGsJukRWc+nQaycgFoi6A9txQVh6wBf/wxK42KKM1k8ck8ChDJ2fBLUdAaWp6y8dTdj9YTzVTXalhSS3uqeWyDHDPp7qv5A18BwVxsun6LjGeNpnxrkko7/Dk+jU1Yftb0/nhaEVWWVhMz//ToyYRifo6tRc8JZ9vHbGSt/uCsPUh8NIsq3o+0/F08cmXcCIjn2PhsaD+Cp6YE05Ba18hhapwXXR01bt2aFDf8c+6zhQ44kHpjMNXQUeQGO69rQXvXtKIWOxCDmdwWxeo7hoAWxm15X1b4J3zBZ45fs1LTsBRJAF3zXEpRXoaCxmpRzolg== 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=6/eCJbGAHSHU8+ge017Q4V8y5RRgZqs6L3IicsKbrO0=; b=K86MvOsIt/oelAudP4ipuwx5dHAeoYk/okmDw3CDRVNZGUGzr1R5nYkrcnu0iOI2mL5PHhlo7rcjHVPOvDNjJR7OrcJbwwC/2/VWI1LhofGG4OrqQAge0CJy6kYFXRSEDsxG1IQIgNB5/X5BPDo6U/pGO4MeK8HI6TKNy04V+A7k/ojFaQw3VdYFXy9+yeOEcXO4gOeG0SwABUFtrixpZkNFRWDxn23BdYT2qhzkGXMW+djIjeI8cPAzmcKQUAQvpTyYMQ6tAXAoebRxGkjTYIyXRPvS1knciklG76hTza9lgocxD5gVn00FrwhKGexCx0eBKZWVY3zHMaKIsDtvhQ== 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=6/eCJbGAHSHU8+ge017Q4V8y5RRgZqs6L3IicsKbrO0=; b=ozr/M6mMBcKYtaBa/eEMRUrRWk1t2/pmrsZ+BYVKSL9J/slMawrcuwWOrfY/86oggbJX4qhRYSkw0KsfCc2X5FuLym4xBaJn4iSht14vIAKzXVe5k0czZC9BjJnmOm6rIAw6i1eXMCafExJ9Ftn+MjcXDMwPkga1N2J53YbsBZRW/siGOmD9LyjmgcXCQCsX5lxukL1IxeJWbyexzt2mmTAsEL1XChJFvnLaj5iY3uTt9B+usrjVQwYGsP4BpvLm1Y4eXHY+zeldGVso/Q0kWBbsgP5dcwd+6gXeyFJRdqxuABe8b+Y7bh9li8BxUOI4zHm61g0phmU33ZGSFTOmNw== 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 DB6PR03MB2902.eurprd03.prod.outlook.com (2603:10a6:6:34::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.17; Fri, 15 Jul 2022 22:01:08 +0000 Received: from VI1PR03MB4973.eurprd03.prod.outlook.com ([fe80::5c3e:4e46:703b:8558]) by VI1PR03MB4973.eurprd03.prod.outlook.com ([fe80::5c3e:4e46:703b:8558%7]) with mapi id 15.20.5438.015; Fri, 15 Jul 2022 22:01:08 +0000 From: Sean Anderson To: "David S . Miller" , Jakub Kicinski , Madalin Bucur , netdev@vger.kernel.org Cc: Paolo Abeni , Eric Dumazet , linux-arm-kernel@lists.infradead.org, Russell King , linux-kernel@vger.kernel.org, Sean Anderson 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> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220715215954.1449214-1-sean.anderson@seco.com> References: <20220715215954.1449214-1-sean.anderson@seco.com> X-ClientProxiedBy: CH2PR10CA0009.namprd10.prod.outlook.com (2603:10b6:610:4c::19) 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: 14d9ed15-2813-4189-9053-08da66ad8567 X-MS-TrafficTypeDiagnostic: DB6PR03MB2902:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gjr3X0PcLhYy0YZMKAjxL7/9uCGnUayvkOkoN4wRuAZC0p9lDbrhAycu0uHx/HTipcGoywcJ4nov28aCJvDO8q48j85H94WlECF431I9jfQzHy0dn+8ASuMMcCa2ud3dVT8n2IrCnuEKxXFt7glXHtfRGXchU214KaGabE9UVrNhlrJMiz7tMruU1wzUbCc/rmIjLF0HT9wDWgm67S57aNgT+JQjxca5tLD6/Pl9KZ33yJ4mXgch4JbOUp2+F2OO+DRZY0IKJovzjtsNGk5cA3As2Y1wzVAONR8iOiRU3elPHKhcgBNfUxUmS1TfwIC2e4ArljWAk9WGtR+U3shvqyc6VGaav838hdmddwDKmPgnToVUjgBrJIR+tQqxRzsZym/XTXFNu6M9zLkNXgQZTCUikL0LJoxOEy4/44GwV6yqA1gGS0Z2ryeYJdgn9CdqjlC//PV7HPMSCgePRPuk43lhk5qH8VnGX6l9O7tdJSa9qqxr2DqKcuMGUFxlxC71R7zz4ION2WxYW5ZCW8Yj/FqElgBL9h6JFuvabqucCdjRX9KQoCrodRxtlvfsVH6dv7SSBlWA0mMjsBuK4GRgZk7pIP0ccHsg7Jxd3Ns2mHbW6cXZ/jHD82iXAnmee2UH/sKG9pEdADNiiCluLk/PtwB0AK9lq7D82lyLZ+wj7xtqWfnaldUEOcivZzDY7tFJ9SjQegQ6Sioljf+R0kRBJjBXPwMj2Y5Sy6JtTPZq1cptse2cTik+Pu/C14MVApnAkfKFf6CFZ0odep+FFN3GO++zAFc3hlXTFSb6VxpKb3nbCUcwxkIvYWKl/HpEqYnH 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)(346002)(366004)(39840400004)(136003)(376002)(396003)(86362001)(5660300002)(83380400001)(6512007)(1076003)(107886003)(38350700002)(38100700002)(186003)(2616005)(36756003)(26005)(6486002)(52116002)(316002)(41300700001)(6666004)(478600001)(6506007)(110136005)(54906003)(2906002)(8676002)(66946007)(66476007)(66556008)(44832011)(4326008)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jJQaDf1qm1kc8wHsYeFx1/cle7t9CPMOxCPpD/0hfwBp4svuLU/vJSZZOiS0WYL9nluvfEq+XWDOG4tbzBHOM1cMSZ/NjDeRVt/E11OCHkdH/uTXFhgSuoUiHOnAWYLwGS/Zn2VJhmjXuzHOSXr/4UUU0Vvwxst8uU9cZYodllerTKT63Ys3CYN+dKMSxA+xJemHIN/AebOIRUzAmjLFASN2rTaFrsNC1KqcCmJPNHU2VTwTm2VYPFRuJfk9z90y0A/xIY3bXVWiDuytJCRmtLdj2zpcSTQmdJ1uf0hDdxC5RpjUFCX5fK7G4S+iQspjKXnWZNwnba/XJc1ic9mOXGSPzzl5sw5IgvBBXT8BaRuqgj2xAC/xOhg7W6L/CKyyfl2z7JwLXQrRHXc2PYAJg2UzI+6UZRbC4E7OuusrQ1of8P6c1IW9UE+IYratAPi0MMnsB9YRl9QFQ1RgBxIRT7B//z2ijbt4fmCmkRCkwyxanM2wE1M5Irvv1WDjHMwXgfIGTuV5YuTEQVcfW2bPODWCDWUzK2M/xCKdVTV6lUmkRfnvDMhA3R3ucPNavhqtmZXRyJmuru8r9pFhYlytP+BPvzDhlcH14DwIWILzp8rLmRdBBcdfZh/9rwSD5ioZAqHxc2+wUmPW7HRgetsKhzy7zd4yjsX382STvbAV4idEVbZCHpHoVb96WPT2rfnuRQIP6MXmcl6+4f69nj/6Ob24oYaoPOVdkZknByzbncMBf8AYkULlowp3x8e3Vv2I9aoBkfId/N02j2Eq+LiL44XftDTAmKdbJS+OBbByk5HEUjf1axcrgec0nYOMwVQKil374K9bXOe5fjACogYDMVZlM0XmEh/24bWhEWNjszIDzT8pqRtxztfzuy2iO8NZRGWBvQZqD/I6aI1OzS6fOOypdaD1XHq3/BTVIk0l5XBr8pvCgI9+yDZaFmj35oQrlQzSk1cA8zWolPf2v3Q5huXqvy1QhYhaNrjDpxYl5F7lst9NYUI/Q4BhtK/k769IFVfKPCkqeLdCa4ZM4oSTNa96L2Cg4nvvmc5B204+3sA+FT8vsnLwgoxit3fnpArGS7r4hfbRNoidmT7shzyX9RC0P/8Q0fmqzutFfEDE2rdchAZouzm8hMO40E0YezD9VcoOevAlI2W3MGoGYhVEYaKQNH8JPyR+AKoENNEeqPUSwoYOGGg7y09u8JUVuNfTixdGDcLOr+HtoW+L0LUrPO2zAvEU4wut0ix2JU37C6BEivCF48lNrKAoUDMXjsvppfNLfYzT1jXq/NV0FeDj9fTOJ2VvizQLt+wxHMtt2FJ6jxIZgxEMnTWh9X6FU4uC5vzSLcfyrZH+OLvepz6lEDq6gR4O+OZrgnkgNQd2umjnKw7Oc0dBTUWF/+y3T4OkLM2ryqeHxf2oL2X6byA4I4oB6sHyq0lOWzAbGlyz2jMk4mrr2xogq8/KMf6tExRJC9Ap4YjgAR5SIZaiaQrlkiKHH/R5ivljhsdLhSD1OYOKC4kXVP6tHdYesPlfMBmWggZDVT86TAgt/boXDtACjdDbR+LgxevCIEcRSr0zpi6Stp8+/p+V03va4onzIXua8pHikMfSKUmTTmHXnRu2hA== 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220715_150113_997490_139FA3B9 X-CRM114-Status: UNSURE ( 9.46 ) 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 Acked-by: Camelia Groza --- (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(¶ms);