From patchwork Thu Nov 23 19:31:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 169107 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp670126vqx; Thu, 23 Nov 2023 11:35:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IHqc5Hx8MaaWDk7shme6QPUlkYSTelpgBmB/uRN6dkagsAq/X5h8lNJMP0zMJxGJGO273QG X-Received: by 2002:a05:6808:3194:b0:3b6:3d44:4d75 with SMTP id cd20-20020a056808319400b003b63d444d75mr525767oib.22.1700768132226; Thu, 23 Nov 2023 11:35:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700768132; cv=none; d=google.com; s=arc-20160816; b=jVRWjMwwop1W4OamuG6v4soN9J7sPNrqUZJL4pc4KSm5ucVbOtHXqCpZ9xiQhKrh/5 LQHt7KeoS6tpY0rK/X9CCgKVPFhSM65Hx4o3LSTeZXkONHiYSpBAsZhVPVH/o1sNlLma 9P6FNPx7gSpgZEQa4RkUcwKTc0OwEqM84NJC3pRzgVR10PURH/knX59TQ1CaspXVVUNW VNjru6dzu7sDh3i23bNVabNX5KsQFHvQoUM13nrXz71U7i3nqPpTAuCK7/+c1D9BqAr4 TaaLR5lnsIim9klqM0f/qxSGQ5opRlBX37cdw7e+h5+KP7y4HbFk2vy9algfWc2Ks7ti 3IVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=p1M43IP9OCd6RwU9m/d+ufBtKieIOsmZ5ZZ/ADpS1WM=; fh=o6/j60XBkz0cs1N8PQkcSMZ4tgCM5mUF5G/ULMywbv8=; b=ljkGehyx8gHxlTawrvzE1WiuD9IUbuRzzfJ+8mjVu1oRxpbFQwFNzpGbFlx8I38t6l yiNWqVTyLRVK9D1ZHV22fJCDVUjt5c0Cw8dBeyHnBxffrkvnZP0sQMLvoUAn85Rx2smY pVC41ibz0tSODreOSsRjmxWqXBcB5eVSJbgy5dvZrbaCWj2o/LGUcXSLrkG+/HKnokIx WHDaC7lr0p9AE22om/Bz5GA9sDU7jU085YDVv3OvWTIed118Jm5BiynqjD5ZrxvzO/Mm f6rYiclcB5zqmLnoFDqK2OBger/38oi7wNNOwI8Cq7s4wiKUtwe+SWtlYee7Jl2Gzxtk BP7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=endpb3Ra; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id h33-20020a632121000000b005c1b58a321asi1897094pgh.411.2023.11.23.11.35.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 11:35:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=endpb3Ra; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 931968292BCC; Thu, 23 Nov 2023 11:35:29 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229462AbjKWTfO (ORCPT + 99 others); Thu, 23 Nov 2023 14:35:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231139AbjKWTe0 (ORCPT ); Thu, 23 Nov 2023 14:34:26 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 346CFD48; Thu, 23 Nov 2023 11:34:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700768067; x=1732304067; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=F5NaZOUNJt2aC961gQWly0juK4lUdpP0X8wiQRn5/3c=; b=endpb3RafU4R5u4wJKU85NMtW4eRgrjV274jWlHYIa2EzN7nHmHW7/xB 5xauFtfH8ZCYtt2vKIBgevV290KbZylBblnHMsZlOOE9XeVQKEHnGDd0A b7Jin6jjU0r+zFnTNMDKo9phoHsYzaIGPFF1FmjHyvoQUBzukFRjwvE6i JEsfLlp4Y6l3/u4LMM8i/75BUtP85kidc3Pk99AKt7NRHLp+G/p49Q7w2 22tM446uE9uOkzJtviFlw3L23KAl9Seqq7HSfYQ5fjqMtb7ZNuF+2Yr7i i3qlauQKSuYVuKvklEBEvhnfmuQD8bMkJtVM3I80LMqWBEpdtq3Ji+Ul2 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="371671509" X-IronPort-AV: E=Sophos;i="6.04,222,1695711600"; d="scan'208";a="371671509" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2023 11:34:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="771062270" X-IronPort-AV: E=Sophos;i="6.04,222,1695711600"; d="scan'208";a="771062270" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 23 Nov 2023 11:34:17 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 596B78D6; Thu, 23 Nov 2023 21:33:59 +0200 (EET) From: Andy Shevchenko To: Linus Walleij , Bartosz Golaszewski , Andy Shevchenko , Rasmus Villemoes , =?utf-8?q?Jonathan_Neusch?= =?utf-8?q?=C3=A4fer?= , Krzysztof Kozlowski , =?utf-8?q?Uwe_Kleine-?= =?utf-8?q?K=C3=B6nig?= , Geert Uytterhoeven , Biju Das , Claudiu Beznea , Jianlong Huang , linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, openbmc@lists.ozlabs.org, linux-mips@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-renesas-soc@vger.kernel.org Cc: Ray Jui , Scott Branden , Broadcom internal kernel review list , Dong Aisheng , Fabio Estevam , Shawn Guo , Jacky Bai , Pengutronix Kernel Team , Sascha Hauer , NXP Linux Team , Sean Wang , Paul Cercueil , Lakshmi Sowjanya D , Andy Gross , Bjorn Andersson , Konrad Dybcio , Emil Renner Berthing , Hal Feng Subject: [PATCH v2 15/21] pinctrl: imx: Convert to use grp member Date: Thu, 23 Nov 2023 21:31:43 +0200 Message-ID: <20231123193355.3400852-16-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231123193355.3400852-1-andriy.shevchenko@linux.intel.com> References: <20231123193355.3400852-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 23 Nov 2023 11:35:29 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783384645261905419 X-GMAIL-MSGID: 1783384645261905419 Convert drivers to use grp member embedded in struct group_desc. Signed-off-by: Andy Shevchenko --- drivers/pinctrl/freescale/pinctrl-imx.c | 31 +++++++++++-------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c index 9099a7c81d4a..4245189b59a5 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.c +++ b/drivers/pinctrl/freescale/pinctrl-imx.c @@ -42,7 +42,7 @@ static inline const struct group_desc *imx_pinctrl_find_group_by_name( for (i = 0; i < pctldev->num_groups; i++) { grp = pinctrl_generic_get_group(pctldev, i); - if (grp && !strcmp(grp->name, name)) + if (grp && !strcmp(grp->grp.name, name)) break; } @@ -79,9 +79,9 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev, } if (info->flags & IMX_USE_SCU) { - map_num += grp->num_pins; + map_num += grp->grp.npins; } else { - for (i = 0; i < grp->num_pins; i++) { + for (i = 0; i < grp->grp.npins; i++) { pin = &((struct imx_pin *)(grp->data))[i]; if (!(pin->conf.mmio.config & IMX_NO_PAD_CTL)) map_num++; @@ -109,7 +109,7 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev, /* create config map */ new_map++; - for (i = j = 0; i < grp->num_pins; i++) { + for (i = j = 0; i < grp->grp.npins; i++) { pin = &((struct imx_pin *)(grp->data))[i]; /* @@ -263,10 +263,10 @@ static int imx_pmx_set(struct pinctrl_dev *pctldev, unsigned selector, if (!func) return -EINVAL; - npins = grp->num_pins; + npins = grp->grp.npins; dev_dbg(ipctl->dev, "enable function %s group %s\n", - func->name, grp->name); + func->name, grp->grp.name); for (i = 0; i < npins; i++) { /* @@ -423,7 +423,7 @@ static void imx_pinconf_group_dbg_show(struct pinctrl_dev *pctldev, if (!grp) return; - for (i = 0; i < grp->num_pins; i++) { + for (i = 0; i < grp->grp.npins; i++) { struct imx_pin *pin = &((struct imx_pin *)(grp->data))[i]; name = pin_get_name(pctldev, pin->pin); @@ -526,7 +526,7 @@ static int imx_pinctrl_parse_groups(struct device_node *np, pin_size = FSL_PIN_SIZE; /* Initialise group */ - grp->name = np->name; + grp->grp.name = np->name; /* * the binding format is fsl,pins = , @@ -554,19 +554,17 @@ static int imx_pinctrl_parse_groups(struct device_node *np, return -EINVAL; } - grp->num_pins = size / pin_size; - grp->data = devm_kcalloc(ipctl->dev, - grp->num_pins, sizeof(struct imx_pin), - GFP_KERNEL); + grp->grp.npins = size / pin_size; + grp->data = devm_kcalloc(ipctl->dev, grp->grp.npins, sizeof(*pin), GFP_KERNEL); if (!grp->data) return -ENOMEM; - pins = devm_kcalloc(ipctl->dev, grp->num_pins, sizeof(*pins), GFP_KERNEL); + pins = devm_kcalloc(ipctl->dev, grp->grp.npins, sizeof(*pins), GFP_KERNEL); if (!pins) return -ENOMEM; - grp->pins = pins; + grp->grp.pins = pins; - for (i = 0; i < grp->num_pins; i++) { + for (i = 0; i < grp->grp.npins; i++) { pin = &((struct imx_pin *)(grp->data))[i]; if (info->flags & IMX_USE_SCU) info->imx_pinctrl_parse_pin(ipctl, &pins[i], pin, &list); @@ -613,8 +611,7 @@ static int imx_pinctrl_parse_functions(struct device_node *np, i = 0; for_each_child_of_node(np, child) { - grp = devm_kzalloc(ipctl->dev, sizeof(struct group_desc), - GFP_KERNEL); + grp = devm_kzalloc(ipctl->dev, sizeof(*grp), GFP_KERNEL); if (!grp) { of_node_put(child); return -ENOMEM;