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>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Ferenc Fejes <ferenc.fejes@ericsson.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        linux-kernel@vger.kernel.org
Subject: [PATCH net-next 01/12] net: enetc: rename "mqprio" to "qopt"
Date:   Fri, 17 Feb 2023 01:21:15 +0200
Message-Id: <20230216232126.3402975-2-vladimir.oltean@nxp.com>
In-Reply-To: <20230216232126.3402975-1-vladimir.oltean@nxp.com>
References: <20230216232126.3402975-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?zz3bo6mr1TAF7Ol3lwfiIFh+v/iJDi5p39wUG8BRQleykc4PG/Hu52suUqVz?=
 =?us-ascii?Q?koTiNYWRDUqxMUp7cVfIKTQQ5yOj02GB97nkZMcZZNmbCy3oHyrcFgrP7uEm?=
 =?us-ascii?Q?RsI08aMnsS6DFpUzRutEw7eECe4qSZ5JzjjMOjnsqkLEyjSB44QM/Fe45DmV?=
 =?us-ascii?Q?Gf//FKxnOinGQgajMJ+UNmtd95nXcb/JjGghZD+OR7XelavunhEE1T12Z159?=
 =?us-ascii?Q?UuEaF1NVshYbbmBtfnEBiewyqdRdv/0AZCVHf6EYSmfA5CJsO7JdbffjzVg1?=
 =?us-ascii?Q?bkOLlRi0g74q502tSXPSGovaf1DVIAlAAGFCFIm1wenbG4gs2E5Np1AauJu+?=
 =?us-ascii?Q?roT/cmy0fyQf9xoUePX2a73HxDw+xdbjdeAYQWqjnDi2XPnUAERoFWwFZHtM?=
 =?us-ascii?Q?Wu1Mm6EDTsu8lnuRkLBqiUA64/ApmIKUciIR53iFCtCHer22EcK2QkSAIeV+?=
 =?us-ascii?Q?A4RjSIH54C+DF2RBuqQzQAbb9O3f2sNNh6Tm6stBUra1BIvdDR+ulDWjlhGF?=
 =?us-ascii?Q?X1EIR3kpPrlveVs1NUWLU/K8l16NLICx8iG0sgR5nFGe1um2MR2OO3+bWstF?=
 =?us-ascii?Q?z7pRiFE7khdiYydAbxM8AFsXlRnO0p6PHEt/4OIY7wYFSXtnAO2Igmd8VxAm?=
 =?us-ascii?Q?PO6P4N8E44P1HT8m9DVzGkCmhGM3a8cYDJ51oxZs9Hfrxh2KDPwTU16ZngVy?=
 =?us-ascii?Q?274Eswl8oW1AtaKsRJRyvXah6DuyeELPE7bELGNVWKXOveSnTHYm0r5cAtCc?=
 =?us-ascii?Q?i0fkA3Kd6/xnF/AI/UfjEAcTC6YR/xunmkP9LW6voTiL9IhwNa/NPEgtbsPp?=
 =?us-ascii?Q?4J2Ihi2QxV9NYvkrJ4grhh3DiIPAyCqmgTwwR6ELcoL5SMb+1y/DhgU/e+zk?=
 =?us-ascii?Q?sJ3MZyNMEqfgqH8WZeUkplo/07wTa+Ov1vQCuqECRtGdxbdgWGBzlQvynXM1?=
 =?us-ascii?Q?KvEws58Zo7Uw3X64gynYhFjwPBEJntvIApZ5hn6bjADh9Xhjuz1DHs3wUa3s?=
 =?us-ascii?Q?iwH2YGxl+Cq4IbxhQXnFyWztecipMlP6/+1b1oNE4QlTH/4zwu8MB2SaCx+V?=
 =?us-ascii?Q?5i3AnZbUPVz7FN1kyetbqSOoEdZm5F0mS1VqcR7v1qHhCnXh9ye1BrHKkLOP?=
 =?us-ascii?Q?HBfFLdl8ATZkAA+LHhNMY7c4vrjfnRF8EESeeOs1XRipuQtHmlSEQasD4nfT?=
 =?us-ascii?Q?fkFymmy7EZI/P7I0aBBj6ybWobzmHsRsoqVYOIlLHjOW9wH2HfPo0tR+MTHK?=
 =?us-ascii?Q?FNS4rGANKmcoofPmrfFQ2s/zKFuC8Xo3mZyGabyQcOLTH69inpTV0FLtKQUu?=
 =?us-ascii?Q?ok5o6pIVri6DG0tc3vcRHQRfT1kbwHn9M7VG2wW+HHApWlIC6dr2uqM7wOEx?=
 =?us-ascii?Q?t1qZyFEHW9ZJp2TA3OYKsDDTKaiid/f3S1dPGx3B/tUyKcSXUlxAp/XE5uJ0?=
 =?us-ascii?Q?gvzktVAc4FBJpR7+pDE4MJxsl/eeYXFryGMKllAm+wjC4mi7zIG3tmj6g6/J?=
 =?us-ascii?Q?ZpBtkNb5vRbm5IdkIvNxZATdhhQuSUykMR0JYBw82Vd8t2dk7BnJmJdp3wQO?=
 =?us-ascii?Q?LFTLzwvk+Ip423fA/fgZOTJ0c20lNLuCvlheBfw+5JLU2BQhkoyz9/3aNWCB?=
 =?us-ascii?Q?jg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 85fbaea5-e512-4b7a-1dc8-08db10749004
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2023 23:21:42.4309
 (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: zPZa0G2r1/tF6qeQFmFhSdG7YYFDNfp8blmzkxJZOJQdSvi/1Hn9sYz1njCyDdO8evdZybbKlfWfEm7d1q2NrQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7436
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>
---
 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