From patchwork Thu Nov 23 19:31:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 169111 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp670335vqx; Thu, 23 Nov 2023 11:36:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IF+IsqcrfWZ4EuSh8JCm5vqfaAWBYgDJxgmXM5QNm7wRZoKKqHhiQZJziZrJKknjjMQ8sQ1 X-Received: by 2002:a17:902:d2cf:b0:1cc:13d0:d515 with SMTP id n15-20020a170902d2cf00b001cc13d0d515mr607182plc.20.1700768160963; Thu, 23 Nov 2023 11:36:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700768160; cv=none; d=google.com; s=arc-20160816; b=Kv0heBzgQrFEqLV2ghKWZ24UziaPfvzvT/ZT7qW8LhKRG2NF3IdNyk7a+qIrlccV9u j/NNZKTR6wSuKPN11fGayqEsAysAmAwppMWkY1aRrF/K/JQ8svj2lJHYA8lfSMzFWU/G FSYe7Lpeg3Xcddgw35WFxgUEpr79+59j0HkexCzR0wvP1sNZgJunzOD0LP8BlmEMeQmB FYXyNZxMcQCKlwEZYcHUi0MfwSvw3MTPTlrWUGQ707Ef4RdLr9c3mGZgyNrgC7oSqnl/ bZYUTHVXyQqZGOBmgeGFj8EvdjWFDVXTnugMoUdBlaR2h+s54bP8h9Qgg9rt7NGY7u3C gvGg== 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=TzbCptLRuu1GV53O4GULzqD/Pq+hy3/rRyRgiJFweEI=; fh=o6/j60XBkz0cs1N8PQkcSMZ4tgCM5mUF5G/ULMywbv8=; b=H5OQ6Zt59p/Lelo1OexBVRfPptL51GBAXSvzzjhSTZVvAJg6tOjhhKqMsMFP3+uDYB z6i0+JTKaB3ePEsvXGCfMgv0R2kKdvOSUTKNhVhHWhlYgorjehHpni928heNjx0GmIG2 46o1ed09lu6xYSgDRh7JunxrxXJ8qcT7G7NQE9AzUWSb3FdfYwfHotT049FAx8blRnAn WOlvgy5VOOh/i0ONFO9xixqh1fJ1W0Pf1aHJGEFs2y+mjKoV+H9z2u252JkOmQ25Qn8M f2rVAoEcBilxy4SsESB+BNcQHYR6JRx7dd7ZO8JpgAXQYvcDrk8p1nAraQkqjja3aHTg H72g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BQXoEmCB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id jw11-20020a170903278b00b001c624237977si1690447plb.252.2023.11.23.11.36.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 11:36:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BQXoEmCB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (Postfix) with ESMTP id 21682806624E; Thu, 23 Nov 2023 11:35:58 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230323AbjKWTfe (ORCPT + 99 others); Thu, 23 Nov 2023 14:35:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230197AbjKWTem (ORCPT ); Thu, 23 Nov 2023 14:34:42 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7A871711; Thu, 23 Nov 2023 11:34:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700768072; x=1732304072; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7v2CAg5DroP23VK/yC7/YkMVF79slYQ+EVkLEfbZi+o=; b=BQXoEmCBmncSLgJRkglMoQsPviq86QkhoO3F3Jsqr5E3OgYobX3vx2mg eqn3176poSSVu12hucYqDTaKbyrcCaZxLxKS0wQJVY3e1xVnlicHgI0yE zfj1kJq1JUrwy29JrsiGlU6LovOhXna6p30Rp9Eg1CuqDyFxdyZoRMty8 Ej1HlY2aA85YNg+k5NyyZ8tWpJQitcZcwq5ir+pRp4RJ1W0dgdI8BoklK /2uiEualYsB1AfAIhdUoXEX8QOkIIAYwp5dIvDtEqn0UEakWGp4i/LlCF P7y3LSH2vRwCYiLKy7n9+syUmZGeU25vZeL1/wc0JId/aI5QJwhVko0gU g==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="371671554" X-IronPort-AV: E=Sophos;i="6.04,222,1695711600"; d="scan'208";a="371671554" 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="771062272" X-IronPort-AV: E=Sophos;i="6.04,222,1695711600"; d="scan'208";a="771062272" 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 A1209A7A; 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 20/21] pinctrl: starfive: Convert to use grp member Date: Thu, 23 Nov 2023 21:31:48 +0200 Message-ID: <20231123193355.3400852-21-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 pete.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 (pete.vger.email [0.0.0.0]); Thu, 23 Nov 2023 11:35:58 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783384675157541791 X-GMAIL-MSGID: 1783384675157541791 Convert drivers to use grp member embedded in struct group_desc. Signed-off-by: Andy Shevchenko Reviewed-by: Emil Renner Berthing --- drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 8 ++++---- drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c index ea70b8c61679..21bfbbaede72 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c @@ -654,7 +654,7 @@ static int starfive_set_mux(struct pinctrl_dev *pctldev, return -EINVAL; pinmux = group->data; - for (i = 0; i < group->num_pins; i++) { + for (i = 0; i < group->grp.npins; i++) { u32 v = pinmux[i]; unsigned int gpio = starfive_pinmux_to_gpio(v); u32 dout = starfive_pinmux_to_dout(v); @@ -797,7 +797,7 @@ static int starfive_pinconf_group_get(struct pinctrl_dev *pctldev, if (!group) return -EINVAL; - return starfive_pinconf_get(pctldev, group->pins[0], config); + return starfive_pinconf_get(pctldev, group->grp.pins[0], config); } static int starfive_pinconf_group_set(struct pinctrl_dev *pctldev, @@ -876,8 +876,8 @@ static int starfive_pinconf_group_set(struct pinctrl_dev *pctldev, } } - for (i = 0; i < group->num_pins; i++) - starfive_padctl_rmw(sfp, group->pins[i], mask, value); + for (i = 0; i < group->grp.npins; i++) + starfive_padctl_rmw(sfp, group->grp.pins[i], mask, value); return 0; } diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c index 9d71e8c13310..60160965cd29 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c @@ -307,7 +307,7 @@ static int jh7110_set_mux(struct pinctrl_dev *pctldev, return -EINVAL; pinmux = group->data; - for (i = 0; i < group->num_pins; i++) { + for (i = 0; i < group->grp.npins; i++) { u32 v = pinmux[i]; if (info->jh7110_set_one_pin_mux) @@ -437,7 +437,7 @@ static int jh7110_pinconf_group_get(struct pinctrl_dev *pctldev, if (!group) return -EINVAL; - return jh7110_pinconf_get(pctldev, group->pins[0], config); + return jh7110_pinconf_get(pctldev, group->grp.pins[0], config); } static int jh7110_pinconf_group_set(struct pinctrl_dev *pctldev, @@ -508,8 +508,8 @@ static int jh7110_pinconf_group_set(struct pinctrl_dev *pctldev, } } - for (i = 0; i < group->num_pins; i++) - jh7110_padcfg_rmw(sfp, group->pins[i], mask, value); + for (i = 0; i < group->grp.npins; i++) + jh7110_padcfg_rmw(sfp, group->grp.pins[i], mask, value); return 0; }