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:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Jamal Hadi Salim <jhs@mojatatu.com>,
        Cong Wang <xiyou.wangcong@gmail.com>,
        Jiri Pirko <jiri@resnulli.us>,
        Vinicius Costa Gomes <vinicius.gomes@intel.com>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        Gerhard Engleder <gerhard@engleder-embedded.com>,
        Amritha Nambiar <amritha.nambiar@intel.com>,
        Ferenc Fejes <ferenc.fejes@ericsson.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        Roger Quadros <rogerq@kernel.org>,
        Pranavi Somisetty <pranavi.somisetty@amd.com>,
        Harini Katakam <harini.katakam@amd.com>,
        Giuseppe Cavallaro <peppe.cavallaro@st.com>,
        Alexandre Torgue <alexandre.torgue@foss.st.com>,
        Michael Sit Wei Hong <michael.wei.hong.sit@intel.com>,
        Mohammad Athari Bin Ismail <mohammad.athari.ismail@intel.com>,
        Oleksij Rempel <linux@rempel-privat.de>,
        Jacob Keller <jacob.e.keller@intel.com>,
        linux-kernel@vger.kernel.org, Ferenc Fejes <fejes@inf.elte.hu>,
        Simon Horman <simon.horman@corigine.com>
Subject: [PATCH v5 net-next 8/9] net: enetc: rename "mqprio" to "qopt"
Date:   Tue, 11 Apr 2023 21:01:56 +0300
Message-Id: <20230411180157.1850527-9-vladimir.oltean@nxp.com>
In-Reply-To: <20230411180157.1850527-1-vladimir.oltean@nxp.com>
References: <20230411180157.1850527-1-vladimir.oltean@nxp.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?qA93SM5FvQsAMd5S/6R6nhgjqXxYxNIbmJ4evwURar+O3YONovDE5m8w7ClY?=
 =?us-ascii?Q?PEslWOsczo7tG8DCGGxRHJqG3dpetMRUnFjW69U9xwV45FaLhdEFEmcTyHjR?=
 =?us-ascii?Q?X9KXjBc0P1pQ11xCqJtJA0nrsFPj+4h+LafQ/RoxDmVG2EiOiRjip3lxEvlx?=
 =?us-ascii?Q?8S5t34SIDn6vRdyprrHDABgN+ErbraLoIhChHDuOz7WMl/ShNiYvCjrbPz4Q?=
 =?us-ascii?Q?dMEO4aALNjsYkiILhTx9fd8F4vAko8bb9y8xEDlXQ3tq3PP4ikHXmSSD4stP?=
 =?us-ascii?Q?je6T1GorSe+Kex/mWEZlmk/w0WHY/C9m3no5UtKqPiu/so0KDlw3oNn7yHEF?=
 =?us-ascii?Q?gArz+evUorA9CyWho54ptKE2QLVqsNSlK8/t/SiZRgJtCeoBe5gXhH3UvbQM?=
 =?us-ascii?Q?Do5g49bL3iTINhlM1OnWjCZPsH0if4LM+J+N/ii+VMNoJhG177dxCGqD3FXL?=
 =?us-ascii?Q?M5fCge6u3Fp34WaG9eineTi3hDR3+BeIv33WQ1MczTjfXtTrCItvRtTDSFYk?=
 =?us-ascii?Q?WFbj8I5XHBFr5Mmf+TqE/v0OTKfqywi19rZKQB2R00TUljQ+5vPUg8RX2B6C?=
 =?us-ascii?Q?isMEBCdcdHeSfHRJ895OKGU0diJjiu9dDARrzJVGRQb242mBPThKV9Q2mwQ+?=
 =?us-ascii?Q?mWg1PdG/3hF5F9E1mG8zeQlUesxVlpzF762AQi9o8UN8uFBYsX1iwfvUr6/u?=
 =?us-ascii?Q?mb8NeAdnM0pNbD2SqS/ksehULsxG3i9HGXb26YPfYpPtPNkCENBVf6r12lbC?=
 =?us-ascii?Q?5Fk74q5BtajR9CQSgyoC/0knC3nnSeR6ugFglA2g1+NUdsIhLRSASuP/kWRP?=
 =?us-ascii?Q?9UAVQgVcj2cc0VwQUs/cuEcRZqqNJ3RZLCtC0rBmQkoa6SNsR/V1lI7hPbB0?=
 =?us-ascii?Q?xNMFOS3LXN1AJtMBZymdkGb68cfd0VPIUl+QSuLjfXpAXurnXgVwG2IeLSoM?=
 =?us-ascii?Q?vxxcytrmaY1RG/RszNo1ONecE43BzkkF3bvqp4OiG4nmQzVuQ1HtpRpXquLb?=
 =?us-ascii?Q?zSsYy8r83m86V5W+YCNR5ZJOpAjl5Z9+scfRfKkIdLWTchehdwNe6aijtzdb?=
 =?us-ascii?Q?2L387XaGuCezhGS6JrUcunZtqUqA78sWPUGDHzSNVCNWK3vPfF8geIQ0s0Co?=
 =?us-ascii?Q?fuPu9S67Lm8tb0J9iIQsOp/IUGDcw8wnLmLLtrhzS7gZYuE6/xYGPD8SqLUD?=
 =?us-ascii?Q?94Ap4IRemYJXMlH+YiQsASoljv5eQlKjWDYCsxW13Ng2cl3wCt6KDETXOOMi?=
 =?us-ascii?Q?Al90Y4ZpaiH4P1cKDqQrIvygCUdDvgDAQPpmgNA6trhIB5ybFKRqwCQ5NUJ2?=
 =?us-ascii?Q?Wr1rgF4JJg2M6MqfZilR4e8geCkrRjCnVHjb9eRGU4tYCTYtW3iL0qDJOw6+?=
 =?us-ascii?Q?GkR8izJA/qOJBS+t2Bphcp39Iidurm4L1n3agfS627s95/8QaLwdS7a8fADy?=
 =?us-ascii?Q?Kmi8SBV/hMN1tlZVfffuPXw6KdrSlWpzXVLMtAAXTMcBZZ0ynu85moG6eNr7?=
 =?us-ascii?Q?Cv//gxjgKQxgkEDKLyk55deP0mi4qCQjdDjOyIquG5eFE0CWWgr3y3QYSaGy?=
 =?us-ascii?Q?vbBOQFXhyYbEFYk1eSal6Vsp2TGN4+Q5ObUNjsp5T/hL+n5TviGAWMNWLtvd?=
 =?us-ascii?Q?9A=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 592095e7-a8e9-4e14-ba84-08db3ab6ecc6
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2023 18:02:33.5791
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 1py0PjVnpJF5+EvZ9yDGFrTaYsjnZRIO/s6P5l7TNSuDKCk+DMyXB+UlGJZNQhLy/u91Vo3wgMy3hk1g3Ipw4g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7829
X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS autolearn=unavailable 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

To gain access to the larger encapsulating structure which has the type
tc_mqprio_qopt_offload, rename just the "qopt" field as "qopt".

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Ferenc Fejes <fejes@inf.elte.hu>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
---
v1->v5: none

 drivers/net/ethernet/freescale/enetc/enetc.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index 2fc712b24d12..e0207b01ddd6 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -2644,12 +2644,13 @@ static void enetc_reset_tc_mqprio(struct net_device *ndev)
 
 int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
 {
+	struct tc_mqprio_qopt_offload *mqprio = type_data;
 	struct enetc_ndev_priv *priv = netdev_priv(ndev);
-	struct tc_mqprio_qopt *mqprio = type_data;
+	struct tc_mqprio_qopt *qopt = &mqprio->qopt;
 	struct enetc_hw *hw = &priv->si->hw;
 	int num_stack_tx_queues = 0;
-	u8 num_tc = mqprio->num_tc;
 	struct enetc_bdr *tx_ring;
+	u8 num_tc = qopt->num_tc;
 	int offset, count;
 	int err, tc, q;
 
@@ -2663,8 +2664,8 @@ int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
 		return err;
 
 	for (tc = 0; tc < num_tc; tc++) {
-		offset = mqprio->offset[tc];
-		count = mqprio->count[tc];
+		offset = qopt->offset[tc];
+		count = qopt->count[tc];
 		num_stack_tx_queues += count;
 
 		err = netdev_set_tc_queue(ndev, tc, count, offset);
-- 
2.34.1