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 v3 5/6] pinctrl: s32cc: Use generic struct data to describe pin function
Date:   Thu, 23 Mar 2023 22:48:32 +0800
Message-Id: <20230323144833.28562-6-clin@suse.com>
In-Reply-To: <20230323144833.28562-1-clin@suse.com>
References: <20230323144833.28562-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?8n6QPhWcFA+BtNYB0yJ6iSme1XTr9lrOioRp821tNksTVOhSaYh2uwM+p8wK?=
 =?us-ascii?Q?8YCpjbYB/9+lKAkrYCZb+1xqm2H2Ddx463CFlKNmgAQtnIstynPCx6pmRg1P?=
 =?us-ascii?Q?5FaZK8BX8dasg/aK9eh5EPt/fi7//OR7Nu2ruBZU90uE8Lwc2PhHnuSxl7QS?=
 =?us-ascii?Q?wX94dQ3rtia8MZmjSN+t8iiWU6IuNRGB2HSfBRdWAP+rWFGpkYqgjBlrnS3A?=
 =?us-ascii?Q?lOQ7xys3YBmlBL/sSIOb265jSK6cc1aECAExXZauogdRj7krmM961lBFvkX9?=
 =?us-ascii?Q?sb+/oeab3sZ1DKCBuwoNrSN65nPz6qzkviqOWJdJhfo9d/Kn9OXNH8yIWgS5?=
 =?us-ascii?Q?84Fjzw49R6QkazXYbMHHyaJASG39t08GDApUx8E10y16GUzIX80t4Efj8onZ?=
 =?us-ascii?Q?cVZse0mjI+4daLHFGaXbgagmwFDClEhx6hnql92TzAFGGZKCCceGxMpY9kJE?=
 =?us-ascii?Q?DynDLpsr27w6s8y/qrrdAtGy/AgXR1mjmTqZeWTxmCVg9PYzRM3+sKIdKCRF?=
 =?us-ascii?Q?g3fdtMYJepXXEO84902U9dPdOAbb35iHfgJhJ2gT1fNe0+kwjncNATLzxmq2?=
 =?us-ascii?Q?7ABUtSnUWqoxcIpeEZTiEnYMM/WmWfanYeh8KhgRHbxUUrPjPxJ/DyJjO/e+?=
 =?us-ascii?Q?ropwxXvBy8hHWK3sJuTo/XbcKvzLEYHVLqOup2ljkj5RWXbAkSYNqAdLNTXD?=
 =?us-ascii?Q?rTFtI9xuivJwWIRqKzIrs91d2NWqSVoyOoXSZcPL8C/NiYb5bAZVS7CqTr4w?=
 =?us-ascii?Q?qBwZsRDEQImQ1mVusA5M+sfQZ1OJyCfZQM0LR01SSD1x8khs2i2m21fcB5bs?=
 =?us-ascii?Q?FMpg9E4k1hsDf2me/eR0ngSaZgafO4+N9d+YnwPYGwmiad7x+yvfhzLa7oks?=
 =?us-ascii?Q?LZAouREpPLDr6S98TLzBAntHF1yJclgwyYM2w+HirzavIMQKSz5/rFiCtjzT?=
 =?us-ascii?Q?lnWAj7L0urLrO7apdgShyu0NB7Ak0snYq5KVTWfCKzEjOmg2Rzhrvqf+PRuR?=
 =?us-ascii?Q?76pI0N7TNvLKGFbXVbsoFzjCiNruHJCyr3iTVtQiVCBKZ20/0Vjdw9T4CULe?=
 =?us-ascii?Q?9uMIcVcPo4sGn0M6Ej5nzlFpmaH0VhoWALQ8G8UrNsYvqiS2Us+lIgmQkMop?=
 =?us-ascii?Q?rq+2QwrUhLGgzX2cjViWE4hsYSnbHcnIMFpY8rtgwzZwhqOGfHX0VKmsv7KA?=
 =?us-ascii?Q?+Y0osRhvrtbXClWy5y4k7Qk6Qkwf/4CRcLxgAVmiVqqU9I7d+5ov1YLdulMi?=
 =?us-ascii?Q?NqD6/nYlauyCaIf2WMWbLL5eWaJtj9S1nWYzEIRNGetxnvrsq+egdsB6UHlg?=
 =?us-ascii?Q?N3LkV+03Pc7t1zXnyft3fl6mQAZvMcWcoBY8uw5DdNevriT6vEe2FBNGBgSq?=
 =?us-ascii?Q?Ww2fxQR5kpdXdz+3CYiKAPTVk0y6S5G+PYenpDRT9fw++Mv59pOLsD88Wj42?=
 =?us-ascii?Q?l0OGcoUPkXzdCWlkC4TTOBSSJga7/AnN8qrvGHQSu3AjiFbJJKLz9hOvEjPM?=
 =?us-ascii?Q?CJaV08omfoULUk4g/VSA5D/6tzh9/jAVgltpjPC+N/KP7bIUgQ4FLp8ZrAJC?=
 =?us-ascii?Q?qOQR0xsLx3vOr0FKU/o=3D?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 82adb6c0-8611-4115-9c9f-08db2badd70a
X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3439.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2023 14:49:44.4721
 (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: mO2GH/Gi+nMJwlPU3+PEWPmH6BjdeBkv1uPx29i+8jXiGar7kJmQFQ0T4tIqmykY
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9254
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>
---
Changes in v3:
- Separate the generic pinfunction patch from [PATCH v2 4/4]
- Fix the data type declaration and remove unncessary type casting
  developed in v2.

 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