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 3/5] pinctrl: s32cc: embed generic struct pingroup
Date:   Fri, 24 Mar 2023 22:36:24 +0800
Message-Id: <20230324143626.16336-4-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?0/qxAM1Bw4O96uboU/sgeR0+NzlL9/fF7IoQswweVROZZphcSD363bl+GAMA?=
 =?us-ascii?Q?79XD6v7pSn1rTVT85QYUD9aTDYaxlS5FQSGzyw7nE2Pxm4IJ9Uefqc0MogSN?=
 =?us-ascii?Q?k69KGb0L3sQRJNRTkdd2Q/p2V0MTuLBZYTRPwvd6DZPEDUWOyY9hhYqOyHsI?=
 =?us-ascii?Q?7s6Gc0JZt5G6IVQaBwPO+9Lo33a2wfcFLTGjEJlGhEvA0lvEH1lk29hBPCF/?=
 =?us-ascii?Q?aLV1n6FD2JmnmrwupwrX9CyZRdMFpuWd/+Q1S3ZCUhZjnBEfwCMnLPLosZ0I?=
 =?us-ascii?Q?Bvd24w/Yy6TfOzXp89MoNqiAtUoj1oIhNNemxvIMlHjVdQ/s3q/iC+JEPuHH?=
 =?us-ascii?Q?rezZJArWplPg0aMhw8BgO2v2wmlLvOAdRe3oAGMN4u81ppYb/2rJ8b19J5fr?=
 =?us-ascii?Q?sW7YNUaPinMEcufs5ExxQNmvhRelkQCEgOLM+UZ6y11aH/KiCX6Ae0FR7xkk?=
 =?us-ascii?Q?lazdzT69SJCUWxLwuFjK+xB4BZWglRHNiGZDd79h1ozvfotg9NSItfvZiuk+?=
 =?us-ascii?Q?6vUWiRGWsed8aFMOQ4vTHKaNIbpJEomnKyU7VV/5SHBIFXBlJ4MffOEkI16i?=
 =?us-ascii?Q?vaH/KKYjmiJe4R6/kZDFky2JsutNRGz6M4Jueu+lh8Gm6027MKlR3E/l9ItH?=
 =?us-ascii?Q?hYYH2YeSvWHgV00c5FfdpYSk9KabwC7ffo0ub44BV0ZzBy6Hhz7gk0wDtfK8?=
 =?us-ascii?Q?7s6hIrCMB0XDY53w6cLn7GSVX8PC5H/75+OmDCUplodAoo5HioaVg2sVqeP8?=
 =?us-ascii?Q?CW2oTCHHkdgbNbMAf+6/MibcDldKQb977ntrV82w1MfHYmhGN3BzB6AtFilW?=
 =?us-ascii?Q?QY0iP9V55BLzQZ/Z9vVQOHvSfxoAkcY30oG3zUxCrvc1yZAQgSMI/u8P+WR0?=
 =?us-ascii?Q?K+HGy+3jbrbOfDNXQ0JsKEu4frPyifj7VtDXUx1I1G2cUa/E1lhXc+doCA4I?=
 =?us-ascii?Q?6WPKcpLIlA3lYVJgJzokX9wdGl2SxpXUxMDZsg/64eBXVP4XQeZm3X1Q+F9M?=
 =?us-ascii?Q?5Oi15Kl9CMxSHx7pNwag7svQ2EgiUfe0wAdiGSSO2l8jcTAbdV+BZTap5aij?=
 =?us-ascii?Q?Ya8sC2/OuEBBuV6CPcu7Tqu9HnOtXk5hBKWefHXuiBzzq1Orkwx55SCdRX2k?=
 =?us-ascii?Q?lot1FORlJS0pDGvZ2BW0oRRVAHK8amVF/OQcJ1HhOhgdu/ovnfSqH4msJ2e2?=
 =?us-ascii?Q?H0GP14j3OK/Q2LcDPrvIF0zkrtGRUj5+jaLcJscEC18k2j1EPZfkUgZvvHXz?=
 =?us-ascii?Q?qhijuL9Vgi0OhbFpTLuiDcUEw9ZTd9+G9qXKFDYHTMI1tpEseBUC1nUqljOR?=
 =?us-ascii?Q?r9kwV+aLV7R1IwPtSRo/bGaJILGwCX6iUAxSGUFNg960wiMt/DPXTygBWkpG?=
 =?us-ascii?Q?72VBjg1wqHxD3Ve/DmwyUDQ4QebjH1vRQYimniCc3wSIZYSTnyOCgy8+YKv7?=
 =?us-ascii?Q?/riThc4chPPFlSS/xOoTcOuOCu31fwB40G+p+2raJyxEGYwmkhCzVcG4U9y9?=
 =?us-ascii?Q?277aEYW0cXRBjmP7TxmGdU6sAgNrP/A0vKp9Gf3reGZvl2nG+Xat3T6sLPJw?=
 =?us-ascii?Q?R4zYaALfDkWmj4HtAzM=3D?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5ec24fef-1540-470d-f56f-08db2c75520f
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:40.4817
 (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: /HxWb8pfFh85CLfifHJMdGiwpuNX9NkgUBfvqGCCv+StCumILXJ0+cN/GG9iniUu
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7454
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

Use generic data structure to describe pin control groups in S32 SoC family
and drop duplicated struct members.

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   | 12 ++----
 drivers/pinctrl/nxp/pinctrl-s32cc.c | 57 +++++++++++++++--------------
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/drivers/pinctrl/nxp/pinctrl-s32.h b/drivers/pinctrl/nxp/pinctrl-s32.h
index 545bf16b988d..850cd668f406 100644
--- a/drivers/pinctrl/nxp/pinctrl-s32.h
+++ b/drivers/pinctrl/nxp/pinctrl-s32.h
@@ -15,16 +15,12 @@ struct platform_device;
 
 /**
  * struct s32_pin_group - describes an S32 pin group
- * @name: the name of this specific pin group
- * @npins: the number of pins in this group array, i.e. the number of
- *         elements in pin_ids and pin_sss so we can iterate over that array
- * @pin_ids: an array of pin IDs in this group
- * @pin_sss: an array of source signal select configs paired with pin_ids
+ * @data: generic data describes group name, number of pins, and a pin array in
+	this group.
+ * @pin_sss: an array of source signal select configs paired with pin array.
  */
 struct s32_pin_group {
-	const char *name;
-	unsigned int npins;
-	unsigned int *pin_ids;
+	struct pingroup data;
 	unsigned int *pin_sss;
 };
 
diff --git a/drivers/pinctrl/nxp/pinctrl-s32cc.c b/drivers/pinctrl/nxp/pinctrl-s32cc.c
index 36f323f87785..e65c88162d7f 100644
--- a/drivers/pinctrl/nxp/pinctrl-s32cc.c
+++ b/drivers/pinctrl/nxp/pinctrl-s32cc.c
@@ -188,7 +188,7 @@ static const char *s32_get_group_name(struct pinctrl_dev *pctldev,
 	struct s32_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
 	const struct s32_pinctrl_soc_info *info = ipctl->info;
 
-	return info->groups[selector].name;
+	return info->groups[selector].data.name;
 }
 
 static int s32_get_group_pins(struct pinctrl_dev *pctldev,
@@ -198,8 +198,8 @@ static int s32_get_group_pins(struct pinctrl_dev *pctldev,
 	struct s32_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
 	const struct s32_pinctrl_soc_info *info = ipctl->info;
 
-	*pins = info->groups[selector].pin_ids;
-	*npins = info->groups[selector].npins;
+	*pins = info->groups[selector].data.pins;
+	*npins = info->groups[selector].data.npins;
 
 	return 0;
 }
@@ -314,23 +314,23 @@ static int s32_pmx_set(struct pinctrl_dev *pctldev, unsigned int selector,
 	grp = &info->groups[group];
 
 	dev_dbg(ipctl->dev, "set mux for function %s group %s\n",
-		info->functions[selector].name, grp->name);
+		info->functions[selector].name, grp->data.name);
 
 	/* Check beforehand so we don't have a partial config. */
-	for (i = 0; i < grp->npins; i++) {
-		if (s32_check_pin(pctldev, grp->pin_ids[i]) != 0) {
+	for (i = 0; i < grp->data.npins; i++) {
+		if (s32_check_pin(pctldev, grp->data.pins[i]) != 0) {
 			dev_err(info->dev, "invalid pin: %u in group: %u\n",
-				grp->pin_ids[i], group);
+				grp->data.pins[i], group);
 			return -EINVAL;
 		}
 	}
 
-	for (i = 0, ret = 0; i < grp->npins && !ret; i++) {
-		ret = s32_regmap_update(pctldev, grp->pin_ids[i],
+	for (i = 0, ret = 0; i < grp->data.npins && !ret; i++) {
+		ret = s32_regmap_update(pctldev, grp->data.pins[i],
 					S32_MSCR_SSS_MASK, grp->pin_sss[i]);
 		if (ret) {
 			dev_err(info->dev, "Failed to set pin %u\n",
-				grp->pin_ids[i]);
+				grp->data.pins[i]);
 			return ret;
 		}
 	}
@@ -606,8 +606,8 @@ static int s32_pconf_group_set(struct pinctrl_dev *pctldev, unsigned int selecto
 	int i, ret;
 
 	grp = &info->groups[selector];
-	for (i = 0; i < grp->npins; i++) {
-		ret = s32_pinconf_mscr_update(pctldev, grp->pin_ids[i],
+	for (i = 0; i < grp->data.npins; i++) {
+		ret = s32_pinconf_mscr_update(pctldev, grp->data.pins[i],
 					      configs, num_configs);
 		if (ret)
 			return ret;
@@ -641,9 +641,9 @@ static void s32_pinconf_group_dbg_show(struct pinctrl_dev *pctldev,
 
 	seq_puts(s, "\n");
 	grp = &info->groups[selector];
-	for (i = 0; i < grp->npins; i++) {
-		name = pin_get_name(pctldev, grp->pin_ids[i]);
-		ret = s32_regmap_read(pctldev, grp->pin_ids[i], &config);
+	for (i = 0; i < grp->data.npins; i++) {
+		name = pin_get_name(pctldev, grp->data.pins[i]);
+		ret = s32_regmap_read(pctldev, grp->data.pins[i], &config);
 		if (ret)
 			return;
 		seq_printf(s, "%s: 0x%x\n", name, config);
@@ -736,6 +736,7 @@ static int s32_pinctrl_parse_groups(struct device_node *np,
 	const __be32 *p;
 	struct device *dev;
 	struct property *prop;
+	unsigned int *pins, *sss;
 	int i, npins;
 	u32 pinmux;
 
@@ -744,38 +745,38 @@ static int s32_pinctrl_parse_groups(struct device_node *np,
 	dev_dbg(dev, "group: %pOFn\n", np);
 
 	/* Initialise group */
-	grp->name = np->name;
+	grp->data.name = np->name;
 
 	npins = of_property_count_elems_of_size(np, "pinmux", sizeof(u32));
 	if (npins < 0) {
 		dev_err(dev, "Failed to read 'pinmux' property in node %s.\n",
-			grp->name);
+			grp->data.name);
 		return -EINVAL;
 	}
 	if (!npins) {
-		dev_err(dev, "The group %s has no pins.\n", grp->name);
+		dev_err(dev, "The group %s has no pins.\n", grp->data.name);
 		return -EINVAL;
 	}
 
-	grp->npins = npins;
+	grp->data.npins = npins;
 
-	grp->pin_ids = devm_kcalloc(info->dev, grp->npins,
-				    sizeof(unsigned int), GFP_KERNEL);
-	grp->pin_sss = devm_kcalloc(info->dev, grp->npins,
-				    sizeof(unsigned int), GFP_KERNEL);
-	if (!grp->pin_ids || !grp->pin_sss)
+	pins = devm_kcalloc(info->dev, npins, sizeof(*pins), GFP_KERNEL);
+	sss = devm_kcalloc(info->dev, npins, sizeof(*sss), GFP_KERNEL);
+	if (!pins || !sss)
 		return -ENOMEM;
 
 	i = 0;
 	of_property_for_each_u32(np, "pinmux", prop, p, pinmux) {
-		grp->pin_ids[i] = get_pin_no(pinmux);
-		grp->pin_sss[i] = get_pin_func(pinmux);
+		pins[i] = get_pin_no(pinmux);
+		sss[i] = get_pin_func(pinmux);
 
-		dev_dbg(info->dev, "pin-id: 0x%x, sss: 0x%x",
-			grp->pin_ids[i], grp->pin_sss[i]);
+		dev_dbg(info->dev, "pin: 0x%x, sss: 0x%x", pins[i], sss[i]);
 		i++;
 	}
 
+	grp->data.pins = pins;
+	grp->pin_sss = sss;
+
 	return 0;
 }
 
-- 
2.37.3