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>,
        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>,
        Jacob Keller <jacob.e.keller@intel.com>,
        linux-kernel@vger.kernel.org, Ferenc Fejes <fejes@inf.elte.hu>
Subject: [PATCH v3 net-next 09/13] net: enetc: rename "mqprio" to "qopt"
Date:   Mon, 20 Feb 2023 14:23:39 +0200
Message-Id: <20230220122343.1156614-10-vladimir.oltean@nxp.com>
In-Reply-To: <20230220122343.1156614-1-vladimir.oltean@nxp.com>
References: <20230220122343.1156614-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?Ib+P3AHHZCvhU+KQOmGiJWEZw4+2HeSPEkLSaR7hAJzBR6Ja4EnMpbiVJliB?=
 =?us-ascii?Q?qRhItCijMA7aqx2P1JY6XW1UawicyKx5u9unfC4W6VBM1E93kBs96W+bWJae?=
 =?us-ascii?Q?8LaXxUnvl6567uqmvTtzVyVIbJfj6eMzaU6xJOgsyOQPOgGG9EhqhLRhGJt/?=
 =?us-ascii?Q?bEpHGaCEgHG5yiogvrk7pIl1zikldRVsmukUm/kuWTUGj58Kmn6JP2m6+g6l?=
 =?us-ascii?Q?Gj86VtPp4s40j7GOXKkVnXNyLwcq1j+WZXmxJs8XzDaFroXo4WOaWZKdaiV4?=
 =?us-ascii?Q?LfR3Dxh5dgdIDJfTRpZSsyl48a1nHJDmifmqOTc1MnfG3UAugj0nTm2q8/Al?=
 =?us-ascii?Q?R3D6if1K1KfGgI+3ptjg6r9Xh7XMGUKaCIVcjrUTwm1ytevALxsG726pYW+o?=
 =?us-ascii?Q?EW0APYhaRwV/hZif8E0blLZkws7vPO125MC3TVITGTcyDthckgMSuUM96S8R?=
 =?us-ascii?Q?f0KsiWdEKqjSQsGjidyNtJzz8ifyMO8x+0PR0knSEe1j59mM0riALHrExlIj?=
 =?us-ascii?Q?/F1r2xqGNxDHOj82MTZj+goy3yM5/xff9Bs0Xre5uvsL9Pr38Th321rZFrXb?=
 =?us-ascii?Q?L2TXq+wfovfai8nFDaegD2xmGvN3fxzTVhzTVXZXrua0RZZIX9esdVOWZzCi?=
 =?us-ascii?Q?d7e+wJkvbmoQ/hF/kq+assHbtiH+7WdlJMXD5y+ZDj54oVPAHaoCuMZkWRHG?=
 =?us-ascii?Q?kNKy0BVHMNwo6a8Al8sb7CQHX5qBzRVd7K09PseVtLL1ipfcsl9djEDY2GdM?=
 =?us-ascii?Q?QEUTUBpki2j/GefCMYdxl2diVYdWqNoQlFj1IV8VuM64mcnszacyDtvPY+9z?=
 =?us-ascii?Q?EUhWT0LBJER6H0oVq3PgHuUqnL9s0HNeIZVwasYizvC7lAkNrY6KnQ2p09mX?=
 =?us-ascii?Q?xVC5fblLbFCU2qa7Kjw5CJrCwigdJn/VaPIcicZ4iavSQBNLnQVhYd+K/xIx?=
 =?us-ascii?Q?Px4HJ+Vn56Va8MlhhA3EHTg2xoSLihWGUFYBlMU2ePZyynNRc1WlaFKO350+?=
 =?us-ascii?Q?BcpkK3NuV3r6mqnRKEcaK3d8qD19fzHoRetdU2w8tIDdcLpmCUUof3iOuBff?=
 =?us-ascii?Q?cSMI0uH61P7/c/kbTtHufTdr3EcrQjUPKasKlu9brMlURuZMh+Kbf2sbpRmM?=
 =?us-ascii?Q?8eMTr/NEtpIEk46dYD7+g0ZAKKtFw9sE5dT4If/q/njmIhN8hSWOSOXrtp71?=
 =?us-ascii?Q?bapHTbVI/1AdXh7p39/+FJPZa5b0p0KZA5UlbhkLN5eMsyokzt7IPY3nVA+b?=
 =?us-ascii?Q?uPhaC1OlIcHeuoQUCfttxj97W/pzOgRqMYVswlW2cNA4sVXbXOC1xSFIdT7G?=
 =?us-ascii?Q?QK4PveqKatca+8FeGykyAlwkUWXWKUf5oL8knIenUCBNKUougi7BBOEJQO80?=
 =?us-ascii?Q?CaMzvSWgnxcsMNUDPSMJ0tCCQsKdRduKRduVzwKNQBbxbTXvzDI4SaUbLHbC?=
 =?us-ascii?Q?7crjxTYQ5BLdDGIomO1cDVcY+rxAwEKibcrs2D2r1Prt6Yomzl5vZ3pcmzEu?=
 =?us-ascii?Q?skUgf4i3vrVh0/dqs+LnVbeD9f0N3aC5XqDrKWvidKGykW2afwvmZ2hBIWmw?=
 =?us-ascii?Q?e17R5EpjpO/+a3dttyWTlJPQixDUYSRKbeJFHTu+g6ccXmjOeOQ0kcgLvqCY?=
 =?us-ascii?Q?/w=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ddea0066-5d33-404c-7627-08db133d62c1
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2023 12:24:17.5866
 (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: RXCz2ivTRlIEi+4uecV9vPQ/pAvyHvkmYU5iqBUiYH4DpQNs6t6Gh2qWxPK4yeQGDS/BWcfnAM8ERZffFbUACw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7725
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>
---
v1->v3: 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