From patchwork Wed Oct 11 12:08:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 151388 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp498021vqb; Wed, 11 Oct 2023 05:22:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFFZPRZiQN53Pua2YMscXl7w6silvEo+KZddWeTrwS1o6SzZJ/7qCs0jrn+o7WP9C0jVO+q X-Received: by 2002:a05:6e02:5ce:b0:34f:a4f0:4fc4 with SMTP id l14-20020a056e0205ce00b0034fa4f04fc4mr20534783ils.2.1697026943676; Wed, 11 Oct 2023 05:22:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697026943; cv=none; d=google.com; s=arc-20160816; b=WWN1k9GWlzJ90KHOWB9EPiau8lWAtUjdlqKYoIcZ782caX6Irnn+X7zRIjlWquS7a2 1rMx0D/4dOLKz0twccu+Wkq8GPA2UPJtWUAbkZ5sc/eZcjOED1PJ/R1Fx0QWkCHgN6Ih GtjIiKNxG2hBDCfey3t+UOTGosZhvTcKghhBK6IjPBFUtMf1+gAvrvOQnxQ+NyXjIbMq Q0qJs/aDHj0q45Okue1u/xu1g9XISV5ZMBtqs/TKlG25VNqQtlkvNM4HSJF2FSmqaB8N tRgn+DBwtWWoYL3HCMaluS6rk9sv4PhLg/Mv1B2JiGuLDSfiXQ8Ij20gWGwyBMM4za8w Mcug== 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=fvacOMAsy6FdrV/J7pT291xHl3F2giUmTM8V2Tkqr7o=; fh=kOxmq+prcfKKX/dgMaMxTb6TRjzyc//QKXZBiaS/a94=; b=pgwQpYU1quoeLXdPDaxcp1t8YmtTU2CPGjp3ZBVqRSnU97n0cjbzagceXa5VUqUumz 7fGujTzstW8CEAXwrNXmZSZqTJRsD99sWBZ1yikqIREHSMBCI3cHF0pWWZxtvatNYUAz suvXjelyQqWB+26Ph0elis+fM2abrp0OH4UJNpA7j2uPw1IhbIB9NK1d8qUrfwBi+brN sLMLrueqy7nhdFXM+Xp28jVy4/XdeWGHpLCCVUqvPgwpsq3QAE4/WDBEs3O2s+fZLuN7 QG6minm0QJnWHRmNPQFkGP9khPCG4iHYU0AEzXL8jqaSS9xp3cAUpIZT3p6o9AhkZvzK HPtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=vZqVc+bS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id u134-20020a63798c000000b00578c9144913si13916929pgc.364.2023.10.11.05.22.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 05:22:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=vZqVc+bS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id CA82C806895A; Wed, 11 Oct 2023 05:20:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232171AbjJKMUg (ORCPT + 18 others); Wed, 11 Oct 2023 08:20:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345956AbjJKMU2 (ORCPT ); Wed, 11 Oct 2023 08:20:28 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 123AD199A for ; Wed, 11 Oct 2023 05:10:17 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40572aeb73cso63112225e9.3 for ; Wed, 11 Oct 2023 05:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1697026188; x=1697630988; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fvacOMAsy6FdrV/J7pT291xHl3F2giUmTM8V2Tkqr7o=; b=vZqVc+bSZpgKue+0l6Q1VTop2/2jZ+nZmSd/VDRiWukvrMLRnBG3PrHmC0LK8aQ9Uk Y7LVFfGVp7/nYZj7uZaZNx0Sdx4b/C5i6NmGIcmPAkZXCWFwVk52sXBvl64twnbs7zTS /G9Za2x+fJFVf/1CjNrLU3Fnh32b7Dzjk7zCGgtqazmi2bzr80AV2Di4R959h1gfvetP Lywh5EgGb3+RDcR3ZoZUXv+qOCptt4Q4gR8Ire8g7+AUuyN7+46OVFml7P03AgyaEklG OrrIHd7sUCRCvN3k3EfLF/1gtJC1GgXjd4AkxwVXMFHIQTkd/73+KgWGGVr/WRIkuK90 pXYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697026188; x=1697630988; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fvacOMAsy6FdrV/J7pT291xHl3F2giUmTM8V2Tkqr7o=; b=kW44taCe1d8D0IaECdjyZDVzxmtt1vJtKTk/x4Ki4GcWozFBiPDL0IOepKqGObRkVs aLpIhrfh4PuXDuXIkxQDn3NV+Lfv1M/kjMcVt5vvYe2+sxbb2rZZDoLOCUKPJ0tKw8Yt zwcfVG5QQ+NG0oMSPS+QVyjBROx6R05fJC1fDA20dX3T6DrSTJqCcbkuA1MHSYLFTQus y+oLdIda7tpEcpvj73PN9waWRQ5s9Fznp0YDjg0OitqRHyvOSwhfvwDtwlD6M3EsSm3f qb6OrAYiDp6O6KpX6ZDzJkftYq8z9bwU++2RMqTIQ8XkUzMLwgY6FWJW2sFesAd3EGV/ qexw== X-Gm-Message-State: AOJu0YyoW8LgmpJOCuUBTOV4tjah003RFkYlofJZ/3ARU4dYPu8jFj7Y Mo5lHSW2807NHnwhQNy54IkvLQ== X-Received: by 2002:a7b:cb8b:0:b0:3fb:e189:3532 with SMTP id m11-20020a7bcb8b000000b003fbe1893532mr18370414wmi.20.1697026188168; Wed, 11 Oct 2023 05:09:48 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:e551:3946:26fc:f94]) by smtp.gmail.com with ESMTPSA id w21-20020a05600c015500b0040652e8ca13sm19012253wmm.43.2023.10.11.05.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 05:09:47 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v2 44/62] pinctrl: change the signature of pinctrl_match_gpio_range() Date: Wed, 11 Oct 2023 14:08:12 +0200 Message-Id: <20231011120830.49324-45-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231011120830.49324-1-brgl@bgdev.pl> References: <20231011120830.49324-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE autolearn=ham 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: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 11 Oct 2023 05:20:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779461724504095601 X-GMAIL-MSGID: 1779461724504095601 From: Bartosz Golaszewski Modify pinctrl_match_gpio_range() to be in line with public GPIO helpers and take a pair of GPIO chip & offset as arguments. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/core.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 2eebd86ca2bc..dbc59e409439 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -292,13 +292,15 @@ static inline int gpio_to_pin(struct pinctrl_gpio_range *range, /** * pinctrl_match_gpio_range() - check if a certain GPIO pin is in range * @pctldev: pin controller device to check - * @gpio: gpio pin to check taken from the global GPIO pin space + * @gc: GPIO chip structure from the GPIO subsystem + * @offset: hardware offset of the GPIO relative to the controller * * Tries to match a GPIO pin number to the ranges handled by a certain pin * controller, return the range or NULL */ static struct pinctrl_gpio_range * -pinctrl_match_gpio_range(struct pinctrl_dev *pctldev, unsigned gpio) +pinctrl_match_gpio_range(struct pinctrl_dev *pctldev, struct gpio_chip *gc, + unsigned int offset) { struct pinctrl_gpio_range *range; @@ -306,8 +308,8 @@ pinctrl_match_gpio_range(struct pinctrl_dev *pctldev, unsigned gpio) /* Loop over the ranges */ list_for_each_entry(range, &pctldev->gpio_ranges, node) { /* Check if we're in the valid range */ - if (gpio >= range->base && - gpio < range->base + range->npins) { + if ((gc->base + offset) >= range->base && + (gc->base + offset) < range->base + range->npins) { mutex_unlock(&pctldev->mutex); return range; } @@ -395,7 +397,7 @@ static int pinctrl_get_device_gpio_range(struct gpio_chip *gc, list_for_each_entry(pctldev, &pinctrldev_list, node) { struct pinctrl_gpio_range *range; - range = pinctrl_match_gpio_range(pctldev, gc->base + offset); + range = pinctrl_match_gpio_range(pctldev, gc, offset); if (range) { *outdev = pctldev; *outrange = range;