From patchwork Tue Nov 28 19:57:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 170936 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp4192583vqx; Tue, 28 Nov 2023 12:04:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IFHSqTNRatOFVJl8JjCcbUBCMOxQDpHSmXP0X/1TrlDbErlhocUzytPfaHNG2lBXIL31Tib X-Received: by 2002:a17:90b:1b44:b0:285:b0fa:f7c6 with SMTP id nv4-20020a17090b1b4400b00285b0faf7c6mr12618371pjb.10.1701201858882; Tue, 28 Nov 2023 12:04:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701201858; cv=none; d=google.com; s=arc-20160816; b=jU1HS3pK2BdEfi7JZRAUWG/VvW0kj2Ua4Afn1wI76uI3rBPaEGUt224BlnycQ36+rn MvuZR1ZgSOOu4GynlQ0VoD2lIXrZ5jRW4THqr30HluVuE8+XwgIWOshP0XBJTc7jqsOa dSyFOUOYYzNkNJ/HkZ+Ec39N94CqmyWffFOOr+tQkUcx1I0ZrJddT+moIflxeIHnbB6M 9jqbSJbF9NstCeM28Nfkvenn2jg1MGqx64Ey87Q9pJMdXIDfAFZ3nO3pLNtfM9mIMQuZ CyRwLAj3OXT2cCRsTopWFhrTDMViqG/Swwz4xbN/hV9gCX6cDTRpm1AGhyarDgG8XZiv XV1w== 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=ZZglurXE8eBIAWZ5Qmt71vEZ26g/NDVd7tuRyT6CoII=; fh=o6/j60XBkz0cs1N8PQkcSMZ4tgCM5mUF5G/ULMywbv8=; b=jNwnPC7T42GW8PyZFbmHbdiJPv8I6RIiRJmfcj5tEyjhsD+vQu4m6EoTOq4vBtv+xe +XBayonqsSCSqDRZY/7s8sqH4TkFmBZNTfIi5ZE5uOpg0llqpBTExaMGpImRIqs0Jayx 2/lqJ70i6YWrs/8My8OkmjpPQ6cQ8CT/PpFvBoi6f4pa7wJDACIhNMgdagucRhnMB8BZ Q57jzlRGF4OlnfLK3hFmNmy55IBs+hO4tnngioPhjmJOYEgL5211jbq6354j0FEaQD8O vw81dVOA9yBrMwYvWl5GYusLL1l5YRGreRW8052/bFGNysEP1fSq1hXwEgmQwRdKN1Mr XXiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="k7jvF2/U"; 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 ot9-20020a17090b3b4900b00285fc676170si2059067pjb.19.2023.11.28.12.04.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 12:04:18 -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="k7jvF2/U"; 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 B82BF80AE524; Tue, 28 Nov 2023 12:04:15 -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 S1344555AbjK1UEG (ORCPT + 99 others); Tue, 28 Nov 2023 15:04:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344720AbjK1UEE (ORCPT ); Tue, 28 Nov 2023 15:04:04 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBC4619AB; Tue, 28 Nov 2023 12:04:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701201851; x=1732737851; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DJwJ2feXkZ/U/Pmfh4iLbq3pwB7LIbDdlMhBN+ByETk=; b=k7jvF2/URP0DOdzqCx259j5l//hUAZamT6JHXl5ULOu7VqxJI/uPcuNT UnVdSTmol7Ead+C+6wVgLrU09X8xxDfg/prAB+0SAivMGUXzn0+cZC7PV hJF4aPQbcke59tGYulJX2VDr4eeMNM6VdWFgYT5Jg5XY9XBQTINoY9TcR jBWixhZRDqTo8shjAIwa8NNcR3LFBW7MAIHFQMZGiL4s5UoRzi2FOzqms 9sRbe3arbOzm3MkNPIWx+VXSH/IQ6p5i4SzP0IEhmmH/ccfpbslkKD92J 3JxqDcKi8dheeXtTxXl6/hVJuO2EPhVo8RfplfvTdiaNEmQgNnj37sHNm g==; X-IronPort-AV: E=McAfee;i="6600,9927,10908"; a="457345630" X-IronPort-AV: E=Sophos;i="6.04,234,1695711600"; d="scan'208";a="457345630" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Nov 2023 12:02:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10908"; a="772420466" X-IronPort-AV: E=Sophos;i="6.04,234,1695711600"; d="scan'208";a="772420466" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 28 Nov 2023 12:02:28 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id C1A85B66; Tue, 28 Nov 2023 22:01:58 +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 v3 17/22] pinctrl: ingenic: Convert to use grp member Date: Tue, 28 Nov 2023 21:57:06 +0200 Message-ID: <20231128200155.438722-18-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231128200155.438722-1-andriy.shevchenko@linux.intel.com> References: <20231128200155.438722-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=ham 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]); Tue, 28 Nov 2023 12:04:15 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783839440370451115 X-GMAIL-MSGID: 1783839440370451115 Convert drivers to use grp member embedded in struct group_desc. Acked-by: Paul Cercueil Signed-off-by: Andy Shevchenko --- drivers/pinctrl/pinctrl-ingenic.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index 393873de910a..6806fede5df4 100644 --- a/drivers/pinctrl/pinctrl-ingenic.c +++ b/drivers/pinctrl/pinctrl-ingenic.c @@ -3756,17 +3756,17 @@ static int ingenic_pinmux_set_mux(struct pinctrl_dev *pctldev, return -EINVAL; dev_dbg(pctldev->dev, "enable function %s group %s\n", - func->name, grp->name); + func->name, grp->grp.name); mode = (uintptr_t)grp->data; if (mode <= 3) { - for (i = 0; i < grp->num_pins; i++) - ingenic_pinmux_set_pin_fn(jzpc, grp->pins[i], mode); + for (i = 0; i < grp->grp.npins; i++) + ingenic_pinmux_set_pin_fn(jzpc, grp->grp.pins[i], mode); } else { pin_modes = grp->data; - for (i = 0; i < grp->num_pins; i++) - ingenic_pinmux_set_pin_fn(jzpc, grp->pins[i], pin_modes[i]); + for (i = 0; i < grp->grp.npins; i++) + ingenic_pinmux_set_pin_fn(jzpc, grp->grp.pins[i], pin_modes[i]); } return 0; @@ -4293,12 +4293,12 @@ static int __init ingenic_pinctrl_probe(struct platform_device *pdev) for (i = 0; i < chip_info->num_groups; i++) { const struct group_desc *group = &chip_info->groups[i]; + const struct pingroup *grp = &group->grp; - err = pinctrl_generic_add_group(jzpc->pctl, group->name, - group->pins, group->num_pins, group->data); + err = pinctrl_generic_add_group(jzpc->pctl, grp->name, grp->pins, grp->npins, + group->data); if (err < 0) { - dev_err(dev, "Failed to register group %s\n", - group->name); + dev_err(dev, "Failed to register group %s\n", grp->name); return err; } }