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:   Chester Lin <clin@suse.com>
To:     Linus Walleij <linus.walleij@linaro.org>,
        Andy Shevchenko <andy.shevchenko@gmail.com>
Cc:     Chester Lin <clin@suse.com>, NXP S32 Linux Team <s32@nxp.com>,
        linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org,
        Ghennadi Procopciuc <Ghennadi.Procopciuc@oss.nxp.com>,
        Andrei Stefanescu <andrei.stefanescu@nxp.com>,
        Radu Pirea <radu-nicolae.pirea@nxp.com>,
        =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>,
        Matthias Brugger <mbrugger@suse.com>
Subject: [PATCH v4 4/5] pinctrl: s32cc: Use generic struct data to describe pin function
Date:   Fri, 24 Mar 2023 22:36:25 +0800
Message-Id: <20230324143626.16336-5-clin@suse.com>
In-Reply-To: <20230324143626.16336-1-clin@suse.com>
References: <20230324143626.16336-1-clin@suse.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?9SNJ56bAmeNoheMN/U3dPjzXSPwbU3JKpQ28Euq0FTt9HHV8FB4f/HIuT1ZV?=
 =?us-ascii?Q?xCkEUn+kStym/VumMdav8PiFJUhhEEtFNfjkdtFbjsCK7WZ3Jel1DM4veukl?=
 =?us-ascii?Q?OFz/46HBSSqAjimt8wlyPhF93r4IyOIrkCoIef4b3fLrvbqpq1MVxXj3N8kD?=
 =?us-ascii?Q?2uhTyldjk8ZaAigrZWEAwQJRmtXBs7zB+G6shhR/E6MSlDzq2Ac86oEBavOs?=
 =?us-ascii?Q?ug39Qqz5OrGJvg4mpS7xC3GK1Lp2/uGxjsYeaqC7mcUZEvcaxjZTIJ4VSOJa?=
 =?us-ascii?Q?wV9rWaEi/k3e/p9/8WG4lRdAnmwZacfMJTByUEaayCXxwBsQiaOYgJI4L7s3?=
 =?us-ascii?Q?QHpQBYLZXvWGXb6aVQ68Vb/+OZ71/JaulOe/v5cZV0m9KlajPd3+fIqM1b86?=
 =?us-ascii?Q?/HMurfcXeid6gLsT97UyvXlzeIuf5gwIVLXpIWmhtBFRw0p4FrnXb1TFaHTm?=
 =?us-ascii?Q?uixFKFYMLEYg+uu/jBAGnW6wRXwqf8l/OcovH8j3j7xmW/FYokcs0itAyPwH?=
 =?us-ascii?Q?tvZnFXioc4ntT57bBIKqnvp30H5jMVhucF+LTB9mS281lh9IsEKYQJZvNM07?=
 =?us-ascii?Q?Wy1A1Y4IVRHS1LA0Tb7JSm3n4E6m0U6pL4JcGD2KyiunTT190QCfF8rhMFAk?=
 =?us-ascii?Q?hNW3hfddb55/f4XjWxfx5u92V1ENSsQEoL7y3Bl49EnlcEBqb3qAAEKGIX2B?=
 =?us-ascii?Q?epvC+5e14tTiLtOz0InIF+ShYtEVNPGtyRr08Nvj4tS41Jgs+PIvJafTdIR2?=
 =?us-ascii?Q?FQsTPT5tVH71+T+jY9XLBxlB3cdRn8gyrRxoEC6xsHU52PgciThu5HGyY8Pg?=
 =?us-ascii?Q?9HLmiai1+bw8/P5eO5i1P2OOKh5pCn5XlpvIxp4d1uzN2YGTa/3xWAB/mbLb?=
 =?us-ascii?Q?PyJcW3QvFFbK5s0ytftuOMBIzbGtS6eNyar17gc6P174P420sqwM0HKlnUSf?=
 =?us-ascii?Q?r2iY9iq1sFxC39VslvK+ecwDJNHpqZXKla24i3gzddzGVTUkECmWrNllr8hX?=
 =?us-ascii?Q?U10KHs9vAOjJfnhW+SgN8I8Ds4RmbNuP/cC3n9T+Kg7CX6YuQvLYX/qk4+n2?=
 =?us-ascii?Q?zGGKJ9EZffMq92yAM/i+0gcg+2M+GSnaefuK36ujZLDh4RP3xixhwX+YtRkH?=
 =?us-ascii?Q?Iamv+3qhUHQq0FL6wNxHMYvDEsyNGGp769TTByMLuileqrwjg/7C03f6LpEf?=
 =?us-ascii?Q?jqvqPoPxarkfkNHGQPdwppPHocV730ghTAjPbqjndVoWhveApzV4XQHuPgFb?=
 =?us-ascii?Q?LhW74ImGvrx+mrrIpV1sJLTJZL/+rKi6qHwQB4iW3FuK4Xv1/GkprJCloomn?=
 =?us-ascii?Q?FTSB8f/Wc3TwQN21lAOnPpPqP7AE3lG5/kUwIYLMa4YXLBKiDNW7qc353IAO?=
 =?us-ascii?Q?KOe+vqu5c2d64id7JXzpfzSrh5bJLJ0DFjliQgU1a68Ipc/Lax5Prg2pdWzp?=
 =?us-ascii?Q?1olpVEVyBUkeh5/npyxi1IVBFC5M3x+XPCeexa2OA7fN0N4mmFYVMDgkX20g?=
 =?us-ascii?Q?Qde/roW8yS8crugEOKOT7+QgopZ6l+zblIjz6Ac734xC3I2htB7a+GuZrAWX?=
 =?us-ascii?Q?ckS8oJHq5y/eTw0zOEM=3D?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bd21aa54-b754-4fad-3f6b-08db2c75580f
X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3439.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2023 14:37:50.4653
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 26+vXZZ0nTDy17eiOUXcItIuS0aGlFyHCZPA9lW3ukcvdWDhhutcQzPaCZaew30U
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8623
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

Replace struct s32_pmx_func with generic struct pinfunction since they
have the same data fields.

Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Chester Lin <clin@suse.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
(No change since v3)

 drivers/pinctrl/nxp/pinctrl-s32.h   | 14 +-------------
 drivers/pinctrl/nxp/pinctrl-s32cc.c | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/drivers/pinctrl/nxp/pinctrl-s32.h b/drivers/pinctrl/nxp/pinctrl-s32.h
index 850cd668f406..2f7aecd462e4 100644
--- a/drivers/pinctrl/nxp/pinctrl-s32.h
+++ b/drivers/pinctrl/nxp/pinctrl-s32.h
@@ -24,18 +24,6 @@ struct s32_pin_group {
 	unsigned int *pin_sss;
 };
 
-/**
- * struct s32_pmx_func - describes S32 pinmux functions
- * @name: the name of this specific function
- * @groups: corresponding pin groups
- * @num_groups: the number of groups
- */
-struct s32_pmx_func {
-	const char *name;
-	const char **groups;
-	unsigned int num_groups;
-};
-
 /**
  * struct s32_pin_range - pin ID range for each memory region.
  * @start: start pin ID
@@ -52,7 +40,7 @@ struct s32_pinctrl_soc_info {
 	unsigned int npins;
 	struct s32_pin_group *groups;
 	unsigned int ngroups;
-	struct s32_pmx_func *functions;
+	struct pinfunction *functions;
 	unsigned int nfunctions;
 	unsigned int grp_index;
 	const struct s32_pin_range *mem_pin_ranges;
diff --git a/drivers/pinctrl/nxp/pinctrl-s32cc.c b/drivers/pinctrl/nxp/pinctrl-s32cc.c
index e65c88162d7f..8373468719b6 100644
--- a/drivers/pinctrl/nxp/pinctrl-s32cc.c
+++ b/drivers/pinctrl/nxp/pinctrl-s32cc.c
@@ -364,7 +364,7 @@ static int s32_pmx_get_groups(struct pinctrl_dev *pctldev,
 	const struct s32_pinctrl_soc_info *info = ipctl->info;
 
 	*groups = info->functions[selector].groups;
-	*num_groups = info->functions[selector].num_groups;
+	*num_groups = info->functions[selector].ngroups;
 
 	return 0;
 }
@@ -785,8 +785,9 @@ static int s32_pinctrl_parse_functions(struct device_node *np,
 					u32 index)
 {
 	struct device_node *child;
-	struct s32_pmx_func *func;
+	struct pinfunction *func;
 	struct s32_pin_group *grp;
+	const char **groups;
 	u32 i = 0;
 	int ret = 0;
 
@@ -796,18 +797,19 @@ static int s32_pinctrl_parse_functions(struct device_node *np,
 
 	/* Initialise function */
 	func->name = np->name;
-	func->num_groups = of_get_child_count(np);
-	if (func->num_groups == 0) {
+	func->ngroups = of_get_child_count(np);
+	if (func->ngroups == 0) {
 		dev_err(info->dev, "no groups defined in %pOF\n", np);
 		return -EINVAL;
 	}
-	func->groups = devm_kcalloc(info->dev, func->num_groups,
+
+	groups = devm_kcalloc(info->dev, func->ngroups,
 				    sizeof(*func->groups), GFP_KERNEL);
-	if (!func->groups)
+	if (!groups)
 		return -ENOMEM;
 
 	for_each_child_of_node(np, child) {
-		func->groups[i] = child->name;
+		groups[i] = child->name;
 		grp = &info->groups[info->grp_index++];
 		ret = s32_pinctrl_parse_groups(child, grp, info);
 		if (ret)
@@ -815,6 +817,8 @@ static int s32_pinctrl_parse_functions(struct device_node *np,
 		i++;
 	}
 
+	func->groups = groups;
+
 	return 0;
 }
 
-- 
2.37.3