From patchwork Tue Oct 3 14:50:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147943 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2140035vqb; Tue, 3 Oct 2023 07:53:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmUV4mKDpi3EtYVv92Ge6iyj8HeNM9c9/tPI7kE5lzQL+wQtDnaBJszgLL8utKaxJhoN5s X-Received: by 2002:a05:6358:710:b0:143:27e:d3cf with SMTP id e16-20020a056358071000b00143027ed3cfmr18421841rwj.4.1696344820696; Tue, 03 Oct 2023 07:53:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344820; cv=none; d=google.com; s=arc-20160816; b=K20/GKtZLzar5UdZvQWF1G4bDG+2EzCmTWpyqgYxPEl6vvRWV4PALrJMCjZTNJt/69 1aMqdJHa+DL67ehLoM2PmXl+nMzWPmsNuXCRAsBYTFbqIdSv1zcck7Qx4UZsogUWs00I g2/75z4rOKCaSk1QJBRhGQnnk0hphnVPdC6FyNGChVrjtvAKLKrkOjDGpZcTsaDGsiIa kRfH54iYUL9nT40nPgrTjI46GdZ1IIFkR8TGgdXa7UprUVY1Xc/kzX58ty+lR+gNsOL0 1CBwNIOHOwqZRCR3VNbhfEUuFgT6n6ArKlXBmLz9pcQwu72PRSXR9e/dt1pcsq3VrLyF Dfgg== 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=DyuhYPCwOLu0O2gzn4k4yrcKyM3Az3Y2GYcVhizJ7Sc=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=pp5np7Oy1/8SIaJBmSHPC8S1ibHDAoy6RxNnZT/Gzg10R9dcWV7xZaMRcWlk4GEGtA EuWzv6pAGeidPcDQczeP23FT9UoQknwHiUdxryyKgaydtWO8TUJfCAohG6xdavqOzj59 nSKJTnJWZXwYDVv/yj1lOhLDjZ9tsuapXSGVJpHFfuKgGu/1razHJ7TluaZtmz/nJDb4 tecB+C4WXlp3Ovhy9IgElCEOfXcXe0PqAXGUY+g+haMAXRwMp3PMQ7RdsJDFmBxmxL7X 9O7DIJyhdfmvf2lyVxlcyzhNPBaeBuXm1aBMe9DscfJeafVD0oCjGGiJ/QoL0R/5FrGF vp6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=QadaSl02; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id g7-20020a056a000b8700b0068e41f07f33si1717153pfj.94.2023.10.03.07.53.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:53:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=QadaSl02; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 018298135BF6; Tue, 3 Oct 2023 07:53:23 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240188AbjJCOvc (ORCPT + 17 others); Tue, 3 Oct 2023 10:51:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240185AbjJCOv2 (ORCPT ); Tue, 3 Oct 2023 10:51:28 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 333BEAC for ; Tue, 3 Oct 2023 07:51:24 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-406618d0991so9903735e9.2 for ; Tue, 03 Oct 2023 07:51:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344682; x=1696949482; 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=DyuhYPCwOLu0O2gzn4k4yrcKyM3Az3Y2GYcVhizJ7Sc=; b=QadaSl02uf8qvyaoJZ7OL5fB0k/E0gBR02Wo0GjtPEsH8nLsCm1Ci/zwfVf+oILIG+ a6OHpB/WYOb/bdJA9/Rw7SBxE/nGGpmhfZacEFDy/PJWLx3BUK5QDRNJMQHWSNlyIZf2 7ThH6PygPj64YD8NXejDZzwd08VeQ9hHvRrooD8LkYARWP81RapY5v5SToTnPZUAwYfI 43Cb4TeOSiAFCbtOPv9O+9HkH/Pan9nLjviUeVq2jqObi6x463thIxkj3lHA2JTUIPwY 3eALhQkNqJdEDQxOx0cxV6jhOCUNTTQOSs2kHQVFSS7crfBHA5rKzD1cQ75N6JhxuMJd PTWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344682; x=1696949482; 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=DyuhYPCwOLu0O2gzn4k4yrcKyM3Az3Y2GYcVhizJ7Sc=; b=p+6t9CyaqcXLLcgz0Kr1dbO1tYAhnRq+tsVWEu8p17YE8N1PtqTU0Reve6eryLb7fJ 44Hr0g9ZIfYA4XGU2gi2gtOUHbw5wcNr1mSR8Jr4TLV0zgszck0GHqN+d2R7zEtzX7NV Q0esAiOiabXU59ln0YmhZqKioouBvzXwv5SO9uBC3yx1YNpMxWVPQUV8j3IRDeQXMqXN z+6gpv2Gerb+Cr9ALUf5Oa2IGf7sAFCU+S4pbeAl6FPzs0b2ln86bSjFzKvL4xCsZIps 1uGe9SCnQno2JXoUGj/dYIG8WNWsb4SoEFBWBds3X09jcsWufVtrzlfVUm37vCvPGQjt oSjQ== X-Gm-Message-State: AOJu0YwnbcIO81D8VgsN5tuWERYtogEJAXJ2ApdaNNl9E6PH6bJLRXSm 7a0R8NXaEcSxpgtz86TztZ7txeWmKvfMC8lbQlc= X-Received: by 2002:a1c:4c1a:0:b0:401:23fc:1f92 with SMTP id z26-20020a1c4c1a000000b0040123fc1f92mr13196023wmf.25.1696344682502; Tue, 03 Oct 2023 07:51:22 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:22 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 01/36] pinctrl: remove unneeded extern specifiers from consumer.h Date: Tue, 3 Oct 2023 16:50:39 +0200 Message-Id: <20231003145114.21637-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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]); Tue, 03 Oct 2023 07:53:23 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746466363506532 X-GMAIL-MSGID: 1778746466363506532 From: Bartosz Golaszewski The 'extern' specifiers are not needed for function declarations. Remove all of them from the pinctrl/consumer.h header. Signed-off-by: Bartosz Golaszewski Reviewed-by: Linus Walleij --- include/linux/pinctrl/consumer.h | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index 4729d54e8995..22eef0a513ce 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -25,27 +25,27 @@ struct pinctrl_state; #ifdef CONFIG_PINCTRL /* External interface to pin control */ -extern bool pinctrl_gpio_can_use_line(unsigned gpio); -extern int pinctrl_gpio_request(unsigned gpio); -extern void pinctrl_gpio_free(unsigned gpio); -extern int pinctrl_gpio_direction_input(unsigned gpio); -extern int pinctrl_gpio_direction_output(unsigned gpio); -extern int pinctrl_gpio_set_config(unsigned gpio, unsigned long config); +bool pinctrl_gpio_can_use_line(unsigned gpio); +int pinctrl_gpio_request(unsigned gpio); +void pinctrl_gpio_free(unsigned gpio); +int pinctrl_gpio_direction_input(unsigned gpio); +int pinctrl_gpio_direction_output(unsigned gpio); +int pinctrl_gpio_set_config(unsigned gpio, unsigned long config); -extern struct pinctrl * __must_check pinctrl_get(struct device *dev); -extern void pinctrl_put(struct pinctrl *p); -extern struct pinctrl_state * __must_check pinctrl_lookup_state(struct pinctrl *p, - const char *name); -extern int pinctrl_select_state(struct pinctrl *p, struct pinctrl_state *s); +struct pinctrl * __must_check pinctrl_get(struct device *dev); +void pinctrl_put(struct pinctrl *p); +struct pinctrl_state * __must_check pinctrl_lookup_state(struct pinctrl *p, + const char *name); +int pinctrl_select_state(struct pinctrl *p, struct pinctrl_state *s); -extern struct pinctrl * __must_check devm_pinctrl_get(struct device *dev); -extern void devm_pinctrl_put(struct pinctrl *p); -extern int pinctrl_select_default_state(struct device *dev); +struct pinctrl * __must_check devm_pinctrl_get(struct device *dev); +void devm_pinctrl_put(struct pinctrl *p); +int pinctrl_select_default_state(struct device *dev); #ifdef CONFIG_PM -extern int pinctrl_pm_select_default_state(struct device *dev); -extern int pinctrl_pm_select_sleep_state(struct device *dev); -extern int pinctrl_pm_select_idle_state(struct device *dev); +int pinctrl_pm_select_default_state(struct device *dev); +int pinctrl_pm_select_sleep_state(struct device *dev); +int pinctrl_pm_select_idle_state(struct device *dev); #else static inline int pinctrl_pm_select_default_state(struct device *dev) { From patchwork Tue Oct 3 14:50:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147918 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2138970vqb; Tue, 3 Oct 2023 07:51:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEkx2naRO/wPllU9x98N/+65Gcppo5dyQS8N5v2oYQc2A8fCO03rt5zp2PI78zvwsg2SfYq X-Received: by 2002:a05:6870:14d3:b0:1be:ceca:c666 with SMTP id l19-20020a05687014d300b001bececac666mr18766402oab.14.1696344705192; Tue, 03 Oct 2023 07:51:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344705; cv=none; d=google.com; s=arc-20160816; b=Rwz+J8XJ8bzdNAA9xQZImgPq/iuXu23WA17BcQt2HYcKjBUhbDxJ1b1qSuLsyjEj/P Rs0Y6seepA3c4s08fxCYJf2oLHV2Bv5tzoOaieUIZtf1U9tCz7VucdDHU3eePj50Ht+i YBip8PMAaiVvLAB4LIOXE0pvW5sQWtBWHR6CgXkoixQC3kdvlT273o4H6dF/ZP7x8iQA uEZdR2A8/ZB+sgMHcCEIBuYVE9ar6IKXvBw4DpNElQYgMwURtl1R7o4VqnffL2AxZqiZ aFI/b4/uqHdx9gm+994W3+n3yDgAAU3NzEzb4bsYbwMyZes4kx5MHW6pVpq2ATNXdS7v SkBw== 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=N1EqDAqCtBZo7z2kLkJw7lL/39F321nZ+hBeSnpopZ4=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=XveJ6bcWZlnb6WJ19+aD2zauc+q3Zwh1O1OlMe5l6Pn8Q9c4JkZyZpifqdtJAOgNpN OK3+qy94sZmTB6vkpyM9Qhcb9xLtPB4s2898eoHXT1o3WUxf7uNPCS606kRELsuMzs84 7/IslTNxW55hREi5lFDrOhcFNHn5599HRGOC9rNVK34cHsL62vGJ5IHRQlpzpSLQR206 oVyg3wBRS8UrpCH1Gk2v5PsYbWS8J3YcjSHd7TLSBnNJC0gcl/TUoo0kH4AYrJzJD6Ot c/jfuooDE9yFNVadb/Ee+4WMMg7t4dTihsFsOJ3MMaLCXZH3Caq6/WVv+27RsGtNKGCr dMSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=DP2d5evg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id o15-20020a637e4f000000b0057c7d7036b8si1632934pgn.389.2023.10.03.07.51.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=DP2d5evg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 4AF81819A6AC; Tue, 3 Oct 2023 07:51:44 -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 S240232AbjJCOvj (ORCPT + 17 others); Tue, 3 Oct 2023 10:51:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240195AbjJCOv3 (ORCPT ); Tue, 3 Oct 2023 10:51:29 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CA74A1 for ; Tue, 3 Oct 2023 07:51:25 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-405524e6768so9942675e9.2 for ; Tue, 03 Oct 2023 07:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344684; x=1696949484; 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=N1EqDAqCtBZo7z2kLkJw7lL/39F321nZ+hBeSnpopZ4=; b=DP2d5evg8RtAb17yHhsEp3qKo1t4rhF+2w4AzVJLqvnM/OdRCymOQFSSjAT/0MhTol DdbyN7xG1UWtq8BHc2vtk0eZ6acIfavd9xfmz4K8jPXwVLTlDOmThlGZ4DIDqPwZ59vc OjF9ol31iLwPXMrja0cCEW4doGyG0P8kstygs7kUG84n2PyQsNYiXjblqbwTHr4lUPmx eQ3SLXlPrSh6VhlxrJa+R0QIiV1JCUmd9VRR9ncq2T1PNm5Q2pSNOvHaaaT8owoO7NnB 9mvzmipwTnruPJeROvR4ZD9bOGc+EeoPlTUjOm7SiEVfyBpckWfF0/xbZ6F+eqfgYGqW ImCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344684; x=1696949484; 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=N1EqDAqCtBZo7z2kLkJw7lL/39F321nZ+hBeSnpopZ4=; b=I3K/zL6nYjUVZUSrmWRv3/+Zv+sQHp06H0FNH9U/5yNOkscjBkbCaCL/LlOW34qryW MwYx8yN8+GK1GLhPWchQENSDcMXZ3t50Rn6+2XrYqjgYDq1HxCj0GKx7WgA5OF/gxcey d+27RW8ibI/kYV/W3AJfrl/m5U3aBqmwLrSCiw6HdaQbPgp7xEsKRVkqDAHRK4jOMErx VGW6+vZSSS94Jq+UYOUjtQIZ4zKDJ3Q6hu8XgPggiTh6xdrhmu81E9jUs/5dL40mRIo9 46BZj/X5Q0ww5xwFsfTnUSa/gIJVdTcogSFI+QIfeeP+UdQoS4twrz3gyP/fvZiv+eyz kFHg== X-Gm-Message-State: AOJu0YwQ4sATal5u8j9eAXJq8d57nK8jZtlkiwSKosnwU1xasi6NNS3I Z5bi+W366o6BaM+Su0Mj4w0wN1ISi8CW5bdL/5E= X-Received: by 2002:a7b:cbc9:0:b0:405:1ba2:4fcb with SMTP id n9-20020a7bcbc9000000b004051ba24fcbmr13493031wmi.16.1696344683602; Tue, 03 Oct 2023 07:51:23 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:22 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 02/36] pinctrl: provide new GPIO-to-pinctrl glue helpers Date: Tue, 3 Oct 2023 16:50:40 +0200 Message-Id: <20231003145114.21637-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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=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: 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]); Tue, 03 Oct 2023 07:51:44 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746345553386562 X-GMAIL-MSGID: 1778746345553386562 From: Bartosz Golaszewski Currently the pinctrl GPIO helpers all take a number from the global GPIO numberspace - of which we're trying to get rid of as argument. These helpers are almost universally called from GPIOLIB driver callbacks which take a pointer to the backing gpio_chip and the controller-relative offset as arguments. Let's provide improved variants of these functions that match the GPIOLIB signatures as the first step in removing the older flavor. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/core.c | 107 ++++++++++++++++++++++--------- include/linux/pinctrl/consumer.h | 46 +++++++++++++ 2 files changed, 124 insertions(+), 29 deletions(-) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index e2f7519bef04..679f48c5beeb 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -781,14 +782,13 @@ bool pinctrl_gpio_can_use_line(unsigned gpio) } EXPORT_SYMBOL_GPL(pinctrl_gpio_can_use_line); -/** - * pinctrl_gpio_request() - request a single pin to be used as GPIO - * @gpio: the GPIO pin number from the GPIO subsystem number space - * - * This function should *ONLY* be used from gpiolib-based GPIO drivers, - * as part of their gpio_request() semantics, platforms and individual drivers - * shall *NOT* request GPIO pins to be muxed in. - */ +bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset) +{ + return pinctrl_gpio_can_use_line(gc->base + offset); +} +EXPORT_SYMBOL_GPL(pinctrl_gpio_can_use_line_new); + +/* This function is deprecated and will be removed. Don't use. */ int pinctrl_gpio_request(unsigned gpio) { struct pinctrl_dev *pctldev; @@ -817,13 +817,21 @@ int pinctrl_gpio_request(unsigned gpio) EXPORT_SYMBOL_GPL(pinctrl_gpio_request); /** - * pinctrl_gpio_free() - free control on a single pin, currently used as GPIO - * @gpio: the GPIO pin number from the GPIO subsystem number space + * pinctrl_gpio_request_new() - request a single pin to be used as GPIO + * @gc: GPIO chip structure from the GPIO subsystem + * @offset: hardware offset of the GPIO relative to the controller * * This function should *ONLY* be used from gpiolib-based GPIO drivers, - * as part of their gpio_free() semantics, platforms and individual drivers - * shall *NOT* request GPIO pins to be muxed out. + * as part of their gpio_request() semantics, platforms and individual drivers + * shall *NOT* request GPIO pins to be muxed in. */ +int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset) +{ + return pinctrl_gpio_request(gc->base + offset); +} +EXPORT_SYMBOL_GPL(pinctrl_gpio_request_new); + +/* This function is deprecated and will be removed. Don't use. */ void pinctrl_gpio_free(unsigned gpio) { struct pinctrl_dev *pctldev; @@ -846,6 +854,21 @@ void pinctrl_gpio_free(unsigned gpio) } EXPORT_SYMBOL_GPL(pinctrl_gpio_free); +/** + * pinctrl_gpio_free_new() - free control on a single pin, currently used as GPIO + * @gc: GPIO chip structure from the GPIO subsystem + * @offset: hardware offset of the GPIO relative to the controller + * + * This function should *ONLY* be used from gpiolib-based GPIO drivers, + * as part of their gpio_request() semantics, platforms and individual drivers + * shall *NOT* request GPIO pins to be muxed in. + */ +void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset) +{ + return pinctrl_gpio_free(gc->base + offset); +} +EXPORT_SYMBOL_GPL(pinctrl_gpio_free_new); + static int pinctrl_gpio_direction(unsigned gpio, bool input) { struct pinctrl_dev *pctldev; @@ -869,14 +892,7 @@ static int pinctrl_gpio_direction(unsigned gpio, bool input) return ret; } -/** - * pinctrl_gpio_direction_input() - request a GPIO pin to go into input mode - * @gpio: the GPIO pin number from the GPIO subsystem number space - * - * This function should *ONLY* be used from gpiolib-based GPIO drivers, - * as part of their gpio_direction_input() semantics, platforms and individual - * drivers shall *NOT* touch pin control GPIO calls. - */ +/* This function is deprecated and will be removed. Don't use. */ int pinctrl_gpio_direction_input(unsigned gpio) { return pinctrl_gpio_direction(gpio, true); @@ -884,13 +900,21 @@ int pinctrl_gpio_direction_input(unsigned gpio) EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input); /** - * pinctrl_gpio_direction_output() - request a GPIO pin to go into output mode - * @gpio: the GPIO pin number from the GPIO subsystem number space + * pinctrl_gpio_direction_input_new() - request a GPIO pin to go into input mode + * @gc: GPIO chip structure from the GPIO subsystem + * @offset: hardware offset of the GPIO relative to the controller * * This function should *ONLY* be used from gpiolib-based GPIO drivers, - * as part of their gpio_direction_output() semantics, platforms and individual + * as part of their gpio_direction_input() semantics, platforms and individual * drivers shall *NOT* touch pin control GPIO calls. */ +int pinctrl_gpio_direction_input_new(struct gpio_chip *gc, unsigned int offset) +{ + return pinctrl_gpio_direction_input(gc->base + offset); +} +EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input_new); + +/* This function is deprecated and will be removed. Don't use. */ int pinctrl_gpio_direction_output(unsigned gpio) { return pinctrl_gpio_direction(gpio, false); @@ -898,14 +922,22 @@ int pinctrl_gpio_direction_output(unsigned gpio) EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output); /** - * pinctrl_gpio_set_config() - Apply config to given GPIO pin - * @gpio: the GPIO pin number from the GPIO subsystem number space - * @config: the configuration to apply to the GPIO + * pinctrl_gpio_direction_output_new() - request a GPIO pin to go into output + * mode + * @gc: GPIO chip structure from the GPIO subsystem + * @offset: hardware offset of the GPIO relative to the controller * - * This function should *ONLY* be used from gpiolib-based GPIO drivers, if - * they need to call the underlying pin controller to change GPIO config - * (for example set debounce time). + * This function should *ONLY* be used from gpiolib-based GPIO drivers, + * as part of their gpio_direction_output() semantics, platforms and individual + * drivers shall *NOT* touch pin control GPIO calls. */ +int pinctrl_gpio_direction_output_new(struct gpio_chip *gc, unsigned int offset) +{ + return pinctrl_gpio_direction_output(gc->base + offset); +} +EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output_new); + +/* This function is deprecated and will be removed. Don't use. */ int pinctrl_gpio_set_config(unsigned gpio, unsigned long config) { unsigned long configs[] = { config }; @@ -926,6 +958,23 @@ int pinctrl_gpio_set_config(unsigned gpio, unsigned long config) } EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config); +/** + * pinctrl_gpio_set_config_new() - Apply config to given GPIO pin + * @gc: GPIO chip structure from the GPIO subsystem + * @offset: hardware offset of the GPIO relative to the controller + * @config: the configuration to apply to the GPIO + * + * This function should *ONLY* be used from gpiolib-based GPIO drivers, if + * they need to call the underlying pin controller to change GPIO config + * (for example set debounce time). + */ +int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, + unsigned long config) +{ + return pinctrl_gpio_set_config(gc->base + offset, config); +} +EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config_new); + static struct pinctrl_state *find_state(struct pinctrl *p, const char *name) { diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index 22eef0a513ce..c95c13983376 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -17,6 +17,7 @@ #include struct device; +struct gpio_chip; /* This struct is private to the core and should be regarded as a cookie */ struct pinctrl; @@ -26,11 +27,20 @@ struct pinctrl_state; /* External interface to pin control */ bool pinctrl_gpio_can_use_line(unsigned gpio); +bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset); int pinctrl_gpio_request(unsigned gpio); +int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset); void pinctrl_gpio_free(unsigned gpio); +void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset); int pinctrl_gpio_direction_input(unsigned gpio); +int pinctrl_gpio_direction_input_new(struct gpio_chip *gc, + unsigned int offset); int pinctrl_gpio_direction_output(unsigned gpio); +int pinctrl_gpio_direction_output_new(struct gpio_chip *gc, + unsigned int offset); int pinctrl_gpio_set_config(unsigned gpio, unsigned long config); +int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, + unsigned long config); struct pinctrl * __must_check pinctrl_get(struct device *dev); void pinctrl_put(struct pinctrl *p); @@ -68,30 +78,66 @@ static inline bool pinctrl_gpio_can_use_line(unsigned gpio) return true; } +static inline bool +pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset) +{ + return true; +} + static inline int pinctrl_gpio_request(unsigned gpio) { return 0; } +static inline int +pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset) +{ + return 0; +} + static inline void pinctrl_gpio_free(unsigned gpio) { } +static inline void +pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset) +{ +} + static inline int pinctrl_gpio_direction_input(unsigned gpio) { return 0; } +static inline int +pinctrl_gpio_direction_input_new(struct gpio_chip *gc, unsigned int offset) +{ + return 0; +} + static inline int pinctrl_gpio_direction_output(unsigned gpio) { return 0; } +static inline int +pinctrl_gpio_direction_output_new(struct gpio_chip *gc, unsigned int offset) +{ + return 0; +} + static inline int pinctrl_gpio_set_config(unsigned gpio, unsigned long config) { return 0; } +static inline int +pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, + unsigned long config) +{ + return 0; +} + static inline struct pinctrl * __must_check pinctrl_get(struct device *dev) { return NULL; From patchwork Tue Oct 3 14:50:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147916 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2138917vqb; Tue, 3 Oct 2023 07:51:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF828VP1GHxpc58j8KndymvYdNVA2VvvkeILNhjJ0IFbGs9/dibZ1/WY7TDBXjmOWBM2b5W X-Received: by 2002:a17:903:258e:b0:1c3:73aa:618b with SMTP id jb14-20020a170903258e00b001c373aa618bmr14190141plb.9.1696344699521; Tue, 03 Oct 2023 07:51:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344699; cv=none; d=google.com; s=arc-20160816; b=WAak8bS9J772FS68AENetiQr4vXtF7fPgpBERdHEMYFqdoN36aFpAAtNv5cD5C9SJO uSWZn2vPssgB5q7Wd2/t19x//rNATCdeocXVL8Tw5GXfhpBA59SybLRxfdjdHAlzk0xi z0Ra3BM44T8e6SmJBatmoDlIM9v7NRHgwdbuQE3JDEc8MTl9L/bqjzuIEH0hozVygPTw s1R3rn9y4CPady7oRl5iVf8WAFPSclCbCiGqgB2Dc8ZfWXK9/OW61WMEJVWCevtnJ8eT qeu3phOsBsmnZW8gtBxkVnOeXT61bppaVD6kELh5Sx8o9MlWkMKM0QmJrx14ZyuinhzD U3UA== 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=m+cAT0NJxUIuqflU1cBfM6vQPrUJJd4UlghEqs5YsBY=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=W2nB+cn6wmzlLdXCTxNq4XPJf0e88Tgew8Ja+T3SCeGutwa4HJbqxwPEGo/BeJPFvc rC0pw08iUQD4K08mj9yycI+fDFEbB3X3udXIJBKgidYS45Tuk/4Uc79wbbytS17e3AC3 /2Gz68feNzrGnLNBe3DwGELxNIAZRCD/dKJ91HizDeFGwWNhCWztYYaO3Mv1LVz8UhIm sdEfjvF7RoZk6w1dZpgdJFXclMtNoL8F2sTkdMF+3wpFFN62vatmMt3GVZuWYeStvplb qLAfqhWn6UKl7WgL5+jZ9gawZfaI3S9lEOUWFPVrMpqcXYSU6dZfHhIN+qCUcVHfDkqs FLPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=LFNdR+dp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id f4-20020a170902684400b001c3ba275321si1587062pln.76.2023.10.03.07.51.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=LFNdR+dp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 6957A819A699; Tue, 3 Oct 2023 07:51:38 -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 S240198AbjJCOvf (ORCPT + 17 others); Tue, 3 Oct 2023 10:51:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240186AbjJCOv2 (ORCPT ); Tue, 3 Oct 2023 10:51:28 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6A75AB for ; Tue, 3 Oct 2023 07:51:25 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40666aa674fso10075725e9.0 for ; Tue, 03 Oct 2023 07:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344684; x=1696949484; 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=m+cAT0NJxUIuqflU1cBfM6vQPrUJJd4UlghEqs5YsBY=; b=LFNdR+dp4rIVI1EYTfKCEFUufwfItUQ9v/T8U0/sMedgyzvNAZTZJpsRGBUBGkZAJi gJagrqCK1lf9vndHIqNkIGbeGseePrXKlrzL726CLqTD3+7KGynrfFRMHeE/EcHauTCi P8JJe8BBS78kH6N+BiJR6jdl5hSJGg/hntlzfHHahaLhZoDhCaISyTpbhk4EFLXoFO4U jBjsCOWlY3BGBWNt6osytY7te3GyFMbqWKzl4cXkdZdbrlx3AnieG5g9ex2Sua/TCloy 9j94/cEfpZygogEmUI4SkrPKXNFxgPCnwEjW8GELXO+LjLXRNUYOnusEVZUBXCJARS7O g7mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344684; x=1696949484; 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=m+cAT0NJxUIuqflU1cBfM6vQPrUJJd4UlghEqs5YsBY=; b=dyn6ZsWFz7YeikmHcpgyW++SDepdcS4ONrx7eKdNX94ku5Z3cPZFPR0Vo3m+l2D2dV WCLLsS+AZdcE6/Vxv6sxJp2tS0hpPz8B/F5De21h09Ne20ISlhs4Fv2oiFU4HBKS1vrt 46xHbLhxi/XFHtiv+pnB8XM1Bv/52qcSconoFfVt882O8AkHaF+XtYNgvNSbuzCz4ouQ JVlk4Rc4BLqH6Wp0yw7K8cvlX6bcnnaRCZAytru8Qi5POTC/w3sdZdLMtodtOjTiefTU E+uyi/4X2G5XFUQ90gruQUZyzCzWlgBQx83oxM+G10exdViLrd717zV6gX05gFVJbGD6 n7gw== X-Gm-Message-State: AOJu0Yw6j99liRFrhg42ITWX6lnImlwnuo/aVBuqdP+dEEVT2lCp67ck azJkDXY2AneRWGicsCi0YOLqNA== X-Received: by 2002:a05:600c:ac9:b0:402:f55c:faee with SMTP id c9-20020a05600c0ac900b00402f55cfaeemr12308302wmr.26.1696344684393; Tue, 03 Oct 2023 07:51:24 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:24 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 03/36] gpiolib: generic: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:41 +0200 Message-Id: <20231003145114.21637-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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]); Tue, 03 Oct 2023 07:51:38 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746339642811897 X-GMAIL-MSGID: 1778746339642811897 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski Reviewed-by: Andy Shevchenko --- drivers/gpio/gpiolib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 7c27a1efc1b0..511f6220071d 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1854,7 +1854,7 @@ int gpiochip_generic_request(struct gpio_chip *gc, unsigned int offset) return 0; #endif - return pinctrl_gpio_request(gc->gpiodev->base + offset); + return pinctrl_gpio_request_new(gc, offset); } EXPORT_SYMBOL_GPL(gpiochip_generic_request); @@ -1870,7 +1870,7 @@ void gpiochip_generic_free(struct gpio_chip *gc, unsigned int offset) return; #endif - pinctrl_gpio_free(gc->gpiodev->base + offset); + pinctrl_gpio_free_new(gc, offset); } EXPORT_SYMBOL_GPL(gpiochip_generic_free); @@ -1883,7 +1883,7 @@ EXPORT_SYMBOL_GPL(gpiochip_generic_free); int gpiochip_generic_config(struct gpio_chip *gc, unsigned int offset, unsigned long config) { - return pinctrl_gpio_set_config(gc->gpiodev->base + offset, config); + return pinctrl_gpio_set_config_new(gc, offset, config); } EXPORT_SYMBOL_GPL(gpiochip_generic_config); From patchwork Tue Oct 3 14:50:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147917 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2138960vqb; Tue, 3 Oct 2023 07:51:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IErFB+6bgbzioFos5q95XaqIZmWFWbFHuNGV59FcyLStkiKrmbOaSIgIzBl6Hv7X+BnkoF3 X-Received: by 2002:a17:903:2445:b0:1c4:fae:bf4a with SMTP id l5-20020a170903244500b001c40faebf4amr16836050pls.16.1696344704249; Tue, 03 Oct 2023 07:51:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344704; cv=none; d=google.com; s=arc-20160816; b=U+GKEf5i75jfpSOWZtc1J4857WfWz24JxEsjCrZaezlD2prBdWV5PP8gbDc8gAzpBZ 30q+It2P2W0lStJoe9wumsRL00MAruRiuirdQI6JCLfeX1Ohcd3C0kJoCvzT3hEWfeHP YSGEs7uRWKC05cnO5LAHwtUY4CqwQ3/rBjunY7yyy6lDD3h/2ue+t1dy4g/aiVwt0NyA 6J2Gl7fEE354jzhpOZnHex0gkr4VRqook7CYLv+5toUbvfWSS5aVmXfmdJ1w9eea+CBn w70k9e+/s8v9ETlKWqXZ7MGpBF90wxPsJS9F2OHE6eFGTJMwwCRVtMxigXICHgwHchp1 47dg== 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=YhFi4LGhC2Y5nFrUut/uRJGJvyUMlfTO1AC2VY89hk8=; fh=YUoJqI9bwQiwY05flNJ/0hnSZHR/oHyv05rJ14tRcQo=; b=k6yoZeVzG5bgmtMZvizXFmU3xFJQKQzc8bWKoBv95TzVsHlqfj7PIX07KOb1GA/fdb oFwvSwr0wI2IQORhjdWKciSONy+iycN/jzyreJC1JDAtlOXspNiaAQRjqZZ9oc/37hiW IsRxQsYpZcnSHIzPbgDxwzsY0SYqbdBnhQ7106AzkfXELDHvYlJ+0VQ3NJCewz1KzkQd IS0yBRwfSN5OVehER0WcW+0gwrmJrUZLb5Vjt5nEyXnnORUbSLBuNE6aoGXtZhwGMW1H HxvNdUAXDaAJ3c4c0PZodPc/RPDCd1Te8akUkgZKELtDWb2qUPAkzoHGqXfZnqT1Hzm+ QIog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=iuvyjCbZ; 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 e6-20020a170902b78600b001c5bb1f0cccsi1489220pls.275.2023.10.03.07.51.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:44 -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=iuvyjCbZ; 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 AC5DA819A69E; Tue, 3 Oct 2023 07:51:43 -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 S240203AbjJCOvg (ORCPT + 17 others); Tue, 3 Oct 2023 10:51:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240197AbjJCOv3 (ORCPT ); Tue, 3 Oct 2023 10:51:29 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3DAAAF for ; Tue, 3 Oct 2023 07:51:26 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4064876e8b8so10425265e9.0 for ; Tue, 03 Oct 2023 07:51:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344685; x=1696949485; 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=YhFi4LGhC2Y5nFrUut/uRJGJvyUMlfTO1AC2VY89hk8=; b=iuvyjCbZ78hdbjmZ0dri6ZMBHVwGLWdrU60z4En12fGtM4w10l3wqAWLJBP2mL6bak kDMkgLbKCdovizExDeH4YikokkSLdoxrmDkwnTWGNiouuy/WX3EBCtHSi3fPU+e40Ejj mZ7Za5VTFyUJpHhnr6YyE0RRXUQyOMgkg5ue5LxKZhVIvLYnrNsRChHSmMV3tt3B752g NwKnAsXAGLvmKqLmn5HeD1iugQHA8KOsrvAkLkUypFb9m/r+OW15a4pRcwwQgz+eN5u+ HtAzzxMwBuD+oychOBL9Jpt/vhviSIHhPWkKhcYS89yu0VE2XV03dZPMpOmP7ZRlIb0X fURg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344685; x=1696949485; 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=YhFi4LGhC2Y5nFrUut/uRJGJvyUMlfTO1AC2VY89hk8=; b=UBW7eQX/JaYqVIUf9EQXi4maH2cPjVa7aZZO0nTwnMrvJHJGTbKRyUahconFLBhDpr js03PDYzQBlfCcA+dXvd72jaivgRxRuUoNtP0/vhD8cOqbsFsMHmc7zrD8hb6w17OrnN D8Mm+auOiNbwksopZOjl11ysh7e0tO97KUCg3wRV2DVJIVSbpq1qRNqdJLEj1SLFIY1E HfMiu7mEejtsYcZrLIPKsDeQh71CYaqS9QGsY+bDC/G6GrAlsizeAjgRpsAhVGfcQOnE 3xiBnXoHekwR+C7h3bIMGgQbb9z+A/i+mx1OGr2qaWPIZ7fMTHpaTtVTCAegLzBUSAML jBHg== X-Gm-Message-State: AOJu0Yz2g8fB0SciNHSAM0Rvc1JBVkPm6IOG9tSm9wkQIFlYcfi6NPaL IFLRMdV+IcKgDx7IcU40zvgEkA== X-Received: by 2002:a05:600c:3d98:b0:406:52e4:cd23 with SMTP id bi24-20020a05600c3d9800b0040652e4cd23mr12565592wmb.0.1696344685191; Tue, 03 Oct 2023 07:51:25 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:24 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Kent Gibson Subject: [PATCH 04/36] gpio: cdev: use pinctrl_gpio_can_use_line_new() Date: Tue, 3 Oct 2023 16:50:42 +0200 Message-Id: <20231003145114.21637-5-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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]); Tue, 03 Oct 2023 07:51:43 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746344450604426 X-GMAIL-MSGID: 1778746344450604426 From: Bartosz Golaszewski Use the improved variant of pinctrl_gpio_can_use_line() which takes a pointer to the gpio_chip and a controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpiolib-cdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c index 31fc71a612c2..54ee075410db 100644 --- a/drivers/gpio/gpiolib-cdev.c +++ b/drivers/gpio/gpiolib-cdev.c @@ -2287,8 +2287,7 @@ static void gpio_desc_to_lineinfo(struct gpio_desc *desc, * FIXME: find a non-racy way to retrieve this information. Maybe a * lock common to both frameworks? */ - ok_for_pinctrl = - pinctrl_gpio_can_use_line(gc->base + info->offset); + ok_for_pinctrl = pinctrl_gpio_can_use_line_new(gc, info->offset); spin_lock_irqsave(&gpio_lock, flags); From patchwork Tue Oct 3 14:50:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147919 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139009vqb; Tue, 3 Oct 2023 07:51:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6gfDcq5K61RxUq4U1HcPTJCTucZ5xrKgJMks7cBTtJue3UpZDUbGsHYlQDj8Hof6jlvvy X-Received: by 2002:a05:6a20:8426:b0:163:5bfd:ae5b with SMTP id c38-20020a056a20842600b001635bfdae5bmr14416907pzd.15.1696344708984; Tue, 03 Oct 2023 07:51:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344708; cv=none; d=google.com; s=arc-20160816; b=EHIz41LdhjcCc9xezGw8Uu+Bb5XRqQ01dL5u/VAWlu5Fc3wVpk0B3SW71y6ggxeo07 xvHPhFyzbFuTqGs2sOBvtpimnyDzL0vc4Tc7emafY5OWadIBd0vmx5rxrPBPzzhjspFw aHm7uDAios4SXa9e87uK2S9pIghpWKQ8ZM+z5y677q5LFy1cpLAHHx/nPALEXNPkzblZ k1IRhn3LgzV8j52Uzv+CS1v6z/ZeiLIh/W7b29u7JQYrnTj/dCTdjdjBiU+1USC8bEQ7 J7vt11cVdQ9wdPhfPIetKnkkCMOFEplnJXzmehRuMx+35c4qK6AwYVnwJ8nJzdae1/pG ky5Q== 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=rnSyRFONQXZbzLQecSY8AhAVmo1bzeslrd4fJIiBj1I=; fh=z6bgZyqOow+nNia7mcl9/7DzvK1ceF8lVZIvlvlpIII=; b=hosIEH0Lj1iU/gcE2/VH9ZpunwgB0CWqY8n4TyDBPsC0/yoNP6Wnf0VN4EzZrgx+zs /299Nm4fi6ny5LG/T/ndPW2+RMNqyCf4WATw/zNYMHkZFa5IJ6mOUi7IH/OuG69EVfK2 bylQW8EhTkJO/9foJMWvnzvEadEBBnXA9m6ElyQ34dwcWBf7nbYaaBkjkOhl0rSk5Qdn NxhCH2TyOx0y4u+AYekBLEmtCFzmOYXvPkbNBNfeHRPOU/L7FA3XzOWxlTytBotLVPRw R35ZJnEcN8PZgyLROpEDPmEwzBU5b1BbEl8wckzWKnUT26hXlA8+KvVXGZ053EY7g46F tCAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=nkWeGlNP; 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 eb15-20020a056a004c8f00b0068fb8704b9csi1607423pfb.28.2023.10.03.07.51.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:48 -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=nkWeGlNP; 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 32FB7819A6BE; Tue, 3 Oct 2023 07:51:48 -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 S240255AbjJCOvm (ORCPT + 17 others); Tue, 3 Oct 2023 10:51:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240167AbjJCOvb (ORCPT ); Tue, 3 Oct 2023 10:51:31 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE1C2AC for ; Tue, 3 Oct 2023 07:51:27 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-406618d0991so9904345e9.2 for ; Tue, 03 Oct 2023 07:51:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344686; x=1696949486; 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=rnSyRFONQXZbzLQecSY8AhAVmo1bzeslrd4fJIiBj1I=; b=nkWeGlNPg9NhNQMbp/rbOyfILXGNkPONAHimAntMyErTQoFonUnwOz3UE9B34jiSqa jFS20SxF8B8lWS/wf+ZI79vZStYwXw9jQDTzRC6QN/pHdvlvwF8fylTAn9SD0TZg3NXF Ly6zmpt/u2/T37iNCTGgdtxfMCWwXTsOweDv1B1xJTU20EcHJHQTmwKUQnLjtfqWzG90 srzU+/kbSZlCQpWnOD2Wfx0hIohFH+qr/8NGb4ZIuQNA+oVfTyVe5zW2EQ++NxPgkQ/u v3L85FFRUtnBuMAAaQgvzNGXLdTBUq7CLRizvmGCAhl3tfcCK41HBmlnk7Op/TWyJDJh InJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344686; x=1696949486; 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=rnSyRFONQXZbzLQecSY8AhAVmo1bzeslrd4fJIiBj1I=; b=jt3MHLujl6hVvg5+9qZ56WoE+moWBWwwbUy7jRKbCu5m9QdjwbBRdMSprDutEfCz/N CQc5RpAe3hqL2tvxnt8ej7kElr7f0pq0N8S4icAKcreNq2qAW79Tb7Hmm9mlzsK2RS81 ErYaefu9rFPzzPXLvd61eO7gchXFxI8nzPQ+nPJ1ctFIQuMzjGarSVFa8gFMTW5K5BCi 4yrabjnDfstIsIpmyIC8TMSBhOw4HDz9IvaqyZpD4a6AEyoTtXnm0g9Pl6DYeYZMRk8u AtsdQwAhbnWqXzmCISYz7Tv+cV2OKxQgsc/HtQRV5ir6N9rlMS31+hNvGQuiTa4OwWYr 7AQA== X-Gm-Message-State: AOJu0YxejvqeWQMeuR6xrleHAaQbgWloxW6fB6Y7cs2bVGRmFsBbUeP/ V2uUf8VVYL2mZLYcCQOO8f2HYg== X-Received: by 2002:a05:600c:2113:b0:405:1ba2:4fd1 with SMTP id u19-20020a05600c211300b004051ba24fd1mr14474158wml.24.1696344686324; Tue, 03 Oct 2023 07:51:26 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:25 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Geert Uytterhoeven , linux-renesas-soc@vger.kernel.org Subject: [PATCH 05/36] gpio: rcar: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:43 +0200 Message-Id: <20231003145114.21637-6-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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=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: 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]); Tue, 03 Oct 2023 07:51:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746349709523304 X-GMAIL-MSGID: 1778746349709523304 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski Reviewed-by: Geert Uytterhoeven Acked-by: Geert Uytterhoeven --- drivers/gpio/gpio-rcar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index d8b1baae6357..47121e1a6d4e 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c @@ -275,7 +275,7 @@ static int gpio_rcar_request(struct gpio_chip *chip, unsigned offset) return error; } - error = pinctrl_gpio_request(chip->base + offset); + error = pinctrl_gpio_request_new(chip, offset); if (error) pm_runtime_put(p->dev); @@ -286,7 +286,7 @@ static void gpio_rcar_free(struct gpio_chip *chip, unsigned offset) { struct gpio_rcar_priv *p = gpiochip_get_data(chip); - pinctrl_gpio_free(chip->base + offset); + pinctrl_gpio_free_new(chip, offset); /* * Set the GPIO as an input to ensure that the next GPIO request won't From patchwork Tue Oct 3 14:50:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147920 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139043vqb; Tue, 3 Oct 2023 07:51:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFC5RNAItveTK5eVPvNqEfP9lcEW4nO/eDl8N+IwT/a5E72qcyqYDjBm3OWknLZelYjWVfR X-Received: by 2002:a92:ca0f:0:b0:349:927a:5d85 with SMTP id j15-20020a92ca0f000000b00349927a5d85mr20820115ils.22.1696344712035; Tue, 03 Oct 2023 07:51:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344712; cv=none; d=google.com; s=arc-20160816; b=N8lm9KQeckBmyLkfLheCpjqhsFfnrcVtfcO268x5l/yb3Kd9GnkWdUSS35REDu1/dB riML7A5HNJVDwTu8IUTBli4ZxPTJG2yiKoNJYDQAjL0YsieYTc203Q0XwFfXBKm0Hjjv HjrKQa/HNtfd4ccUSl4VKXi6D/5mXrsAR5zt3EaGz51rJvuzr7DXgF62/knGBsT8NvhL +VPmymH2rsBuo5s+mjfR7VXhsxRcVWeU//I8fwNIC6w0J14/t9YI0h+pKpjbw0a3Tn80 bfodVCRpRl5KEqJ+TNa8E1z9CKu75U0vMdIA3bQy6H6v0afb8flqpwox7XuEqOEEN3iM /7eQ== 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=PJlcPxZYJ+2xOtgJ5lT3aANbc/q/A7LyEHQjQgc784Q=; fh=tb500ZjyadxnvEnw/hHeu0CvYvhKN88Zbhux+Jw2dzY=; b=voyE4BsORBGELQ3TjSIN20f8ecwN18/kbnmoA6sZgrUHQff2iUCNBoVflBs7F01mQ/ TrXjctjuZrzT1ruqZZj94CrRnuqBWGcjBtbQLKPFdlI5yVJqvm9kOrxGQVxTVvfvxGtJ Rse0915lv25XOQPXjfipsFC9RokWO2J9MMZV+Y8sj23FRyUKBLafnq92KKKRyBRppkwd Pgq3BiXDRWiMrVx11O5E7kG/3/z4A02a/hMBAmhDsq22mEV6SPLeA/hIVKooSvG1GNw7 pODvxPkjd4J6j7wZj7m5drHbbrMO7PhIOuxFuMlmD88dGkRZ9krqUeHxmUWBxE5WktIi LoSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=mhvYEiRo; 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 j70-20020a638049000000b005859bd29c5bsi1621553pgd.723.2023.10.03.07.51.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:52 -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=mhvYEiRo; 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 38E97819DFC8; Tue, 3 Oct 2023 07:51:51 -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 S240211AbjJCOvr (ORCPT + 17 others); Tue, 3 Oct 2023 10:51:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240171AbjJCOvb (ORCPT ); Tue, 3 Oct 2023 10:51:31 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A42D2AD for ; Tue, 3 Oct 2023 07:51:28 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-406618d0991so9905095e9.2 for ; Tue, 03 Oct 2023 07:51:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344687; x=1696949487; 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=PJlcPxZYJ+2xOtgJ5lT3aANbc/q/A7LyEHQjQgc784Q=; b=mhvYEiRo+bhT1rWAYnR8WLllDeWvqTbzz/90S2v0hSmggFXzFQNY/fdLu7EfFwgWKx ckFLG0P4Xe+4JJIlUtJ9k7B3O4TpolDGUx2uoPQySc9rDixQgqaJKVR7vshb4UsyG54r naM82a4Y4sJ+OUDHvYDsYRudrErD+xbhh79mWENSWeBayfyd72JwUGQl1jiDmOE0FiBO bByHJu72Nje06GfvJmkQZ9ir5qBF62p6I5ARxKuxyDZRH+KTDCQQrDDDsJ0O0UpOWeze AfD7uoBrdri/LL4YoC/CyOg+0LSrxa35GujlBRTtSqZqBq92NiyyNPn9WwLq2SFtOM7y 5JvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344687; x=1696949487; 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=PJlcPxZYJ+2xOtgJ5lT3aANbc/q/A7LyEHQjQgc784Q=; b=J+MW/ToaJ+g7Ml49tJc+7rqlW0OygotLTGoapyuYhmd5vgYi7TqTru+ezB5uX4+h4I Wr95GagwebwDPdxXigYe1VLkSyBhQoT+hy9NiKFCrJHnm3hRAOeZu9pkNhYJLGidWqU7 ev/QLOnS8SE+5J48KVH8Ufp5NKj5fFLbOeCIFIN17tAa2hT+8Kk9BCcb0NtB6yYdQooR 4kywACsGRH1ZGPEcWKmDQFK5khj3NfO/O+WuHuuf9P59HjezMk8w4qZHU4ucydOCSIWG wEo6lVdmWqHYyXWcrQkZVoCDoJLrGHkmDxmeHHEcZzHtMD4Wd2cb6mnHIv7lFi6kCW97 Wj9w== X-Gm-Message-State: AOJu0YzRJW0BswFjU5LL3KYeeGBh/DI5CWhZInsw8bOycfioLrOQQ9iL 1nbOpiAgSSgx4LwZc8B+Xzjqmg== X-Received: by 2002:a05:600c:2948:b0:405:3f06:c07e with SMTP id n8-20020a05600c294800b004053f06c07emr12250441wmd.15.1696344687198; Tue, 03 Oct 2023 07:51:27 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:26 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Thierry Reding , Jonathan Hunter , linux-tegra@vger.kernel.org Subject: [PATCH 06/36] gpio: tegra: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:44 +0200 Message-Id: <20231003145114.21637-7-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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]); Tue, 03 Oct 2023 07:51:51 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746352865082059 X-GMAIL-MSGID: 1778746352865082059 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-tegra.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c index ea715582bcf3..08951ddcd294 100644 --- a/drivers/gpio/gpio-tegra.c +++ b/drivers/gpio/gpio-tegra.c @@ -139,14 +139,14 @@ static void tegra_gpio_disable(struct tegra_gpio_info *tgi, unsigned int gpio) static int tegra_gpio_request(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_request(chip->base + offset); + return pinctrl_gpio_request_new(chip, offset); } static void tegra_gpio_free(struct gpio_chip *chip, unsigned int offset) { struct tegra_gpio_info *tgi = gpiochip_get_data(chip); - pinctrl_gpio_free(chip->base + offset); + pinctrl_gpio_free_new(chip, offset); tegra_gpio_disable(tgi, offset); } @@ -179,7 +179,7 @@ static int tegra_gpio_direction_input(struct gpio_chip *chip, tegra_gpio_mask_write(tgi, GPIO_MSK_OE(tgi, offset), offset, 0); tegra_gpio_enable(tgi, offset); - ret = pinctrl_gpio_direction_input(chip->base + offset); + ret = pinctrl_gpio_direction_input_new(chip, offset); if (ret < 0) dev_err(tgi->dev, "Failed to set pinctrl input direction of GPIO %d: %d", @@ -199,7 +199,7 @@ static int tegra_gpio_direction_output(struct gpio_chip *chip, tegra_gpio_mask_write(tgi, GPIO_MSK_OE(tgi, offset), offset, 1); tegra_gpio_enable(tgi, offset); - ret = pinctrl_gpio_direction_output(chip->base + offset); + ret = pinctrl_gpio_direction_output_new(chip, offset); if (ret < 0) dev_err(tgi->dev, "Failed to set pinctrl output direction of GPIO %d: %d", From patchwork Tue Oct 3 14:50:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147921 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139083vqb; Tue, 3 Oct 2023 07:51:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH4/z2lH8VYn554MH+7RUQ650EtspnRLOupdRHFzhVYJ/btXzEnE1uNVNkS8c6FuMj2YzVk X-Received: by 2002:a17:902:ed4c:b0:1b8:76ce:9dab with SMTP id y12-20020a170902ed4c00b001b876ce9dabmr11438035plb.41.1696344715880; Tue, 03 Oct 2023 07:51:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344715; cv=none; d=google.com; s=arc-20160816; b=gXmp5e5n28GhbvBYTDGV5PuCu9xWnWv8UL4uSQqLG0UZGDhQ7Y0rRFZJWzs+Yo1s57 lKNvIZbERsm65Tof4oWDQkuX6umZpuTrI6G6eeK1l1JZrt+dcDZQkwdOFFWyKAVRXT9H oXUGFscmqmVnluIEW20umZlD04JU+irwXAxLiVJ53gbAn4w6L53pCd/Qj3Luzb/A0TD+ nnmGA7lE7t3btBBTA8gcomCK1z3/5QuQYMR2W3oUGEn8j1Tl/VDaw59jlAgNUGYwHaPG QdEx4p0GNDRWcDqenXbRxK0kbu/xsaOjKwH9aym/18cLqMRBrE4746ZQcWCvWswXzn7i BiYA== 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=H58FBovONkBFAtGhn37zN4A9drmVE/E2kcDVb0X5d1o=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=cPiF3UW39T36p/KlTaELoq6gifQtFJwfBEcw0zXKCcrENC5PRgX7V7dw9LppeuIaDU i7bWJDnIVwxhHJUilOiRjh0LDebpa13IUMMtgYv0f5yQnyjq8leBj8XwUWf4e1ey9dQC 3L6iquLvGmE32AgrT6pILCCdKOzdI9uQMVNb1dQjRBCuGCsXS3HoqIa6OWt9g//2Hyqq /W9AlJ0VN6QIfThf3tLJv/UYJtnMKeuu5zf/WUIxOtRPFrpaL6q3My30cJCpZe4vWxJM iD3D6Op6wSp3kCgFFG+8xeeJkeorJpM7Wmi7bGdpZIA/DqYFvabkKrZjJwB20vVCPEk9 sRRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=N8tJVom9; 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 s21-20020a170903215500b001b8a8f359fcsi1461961ple.208.2023.10.03.07.51.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:55 -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=N8tJVom9; 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 2F6CC819A6B8; Tue, 3 Oct 2023 07:51:55 -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 S240246AbjJCOvu (ORCPT + 17 others); Tue, 3 Oct 2023 10:51:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240184AbjJCOvc (ORCPT ); Tue, 3 Oct 2023 10:51:32 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7735CB0 for ; Tue, 3 Oct 2023 07:51:29 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4053c6f0db8so9760185e9.3 for ; Tue, 03 Oct 2023 07:51:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344688; x=1696949488; 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=H58FBovONkBFAtGhn37zN4A9drmVE/E2kcDVb0X5d1o=; b=N8tJVom9Re4DmqsnYQNTN025giyqow9d/SCsYtRMq/oHzFozLNHkKcj/OLJTLw/Gp4 JlGu10feB5oGneyc+CxLykBY+UDVlpm94koxalHnmAhjisp6VeYpDpNxFmeuYpjClRFH BLcZ3Tpu9Hiwc6ZQEo9L4YWZSfnrT/VnslioZN7WppV0YcW1Tq6UwVsq6QzX8pf9EX8v vkNxB53kLweKmBIghp+VhrWcEKaOacKHl0H282pu0uKsC6SXVzzI4O3yJ1663MBQndOT Aeq4KZOYuQ+AswMOFlUVAGPes/IvMj+Aw1PiNSKOgJT3LahwisO7DGZNkLsnKlnmNMy1 3J5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344688; x=1696949488; 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=H58FBovONkBFAtGhn37zN4A9drmVE/E2kcDVb0X5d1o=; b=cf0NxEXcZUobUbthXtXv9NwaZ0MBGOtI1W3E4SiwoYBRlQlFJpCbSRbft8b7mlz2wf XOiFe3g8y9xfHkg7ixjL6gw7bc2JNt1V5l/JuLn5m0I7hLZuxMXhEvoOmiiC5b2olpWO Kx8er9DGTaaTS3NcrnM/vtk0z+pygicCqWTKt3vh0Jx8Gf8jHaw6FyhA8j6L4xCzw15D 34WHwNUL6EhN1Sgc+kP1flZziqVMrkVkqlpn1fQ7HqdV3vSu4fUGagNXZ0c9VMNofdP/ 0Pf+FZkOBftVhD40DRHgHoLBUfyRYl1PHqcxf9mdOd+hrtMMJ/SZ/egh9+5RWLdywVaG Vadw== X-Gm-Message-State: AOJu0Yyd+ryGLFh0H+hHqYRof6cGjQmeRkQjAW5hC+KV3162wRpN86fr 03pUur//L6SUfE9SCr8CN/6KQg== X-Received: by 2002:a05:600c:1d9d:b0:406:5463:3f51 with SMTP id p29-20020a05600c1d9d00b0040654633f51mr12476502wms.25.1696344687920; Tue, 03 Oct 2023 07:51:27 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:27 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 07/36] gpio: em: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:45 +0200 Message-Id: <20231003145114.21637-8-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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]); Tue, 03 Oct 2023 07:51:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746357127526684 X-GMAIL-MSGID: 1778746357127526684 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-em.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c index 858e6ebbb584..35c65ff43f71 100644 --- a/drivers/gpio/gpio-em.c +++ b/drivers/gpio/gpio-em.c @@ -229,12 +229,12 @@ static int em_gio_to_irq(struct gpio_chip *chip, unsigned offset) static int em_gio_request(struct gpio_chip *chip, unsigned offset) { - return pinctrl_gpio_request(chip->base + offset); + return pinctrl_gpio_request_new(chip, offset); } static void em_gio_free(struct gpio_chip *chip, unsigned offset) { - pinctrl_gpio_free(chip->base + offset); + pinctrl_gpio_free_new(chip, offset); /* Set the GPIO as an input to ensure that the next GPIO request won't * drive the GPIO pin as an output. From patchwork Tue Oct 3 14:50:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147923 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139116vqb; Tue, 3 Oct 2023 07:51:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHgBYOFNdHv42RKLrm7cTui0jnCvZlrh3n2tpd7PDX9yBMl8uG/fIKw476IMZsMKyv7gD1F X-Received: by 2002:a05:6a20:4284:b0:162:4f45:b415 with SMTP id o4-20020a056a20428400b001624f45b415mr18797839pzj.51.1696344718672; Tue, 03 Oct 2023 07:51:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344718; cv=none; d=google.com; s=arc-20160816; b=qL8MANwihblEtEav4ImUiUWVxRvmXkqnqrj8cUZTG0BIJHTjkG5TVR9AivNe7l7MqV 4dWaqHlasJHxdQRNJmjY+QpSCwheqy8tFj9ctKAIGI6HwxXxN3qPxe0Bv7t/+pVEWelu 24mK+NdgozGaJwYnfIf1w6iHKRALkZZrvTXC7pR52DRWXyCNV17N10nF8V7NQETAlvt9 9FXSbLbmYQwDMaHlP//V2OC8NcHsB5iGbfv+bxAC/n9qfCSKEVu2CgPG5Nidp1DeDBHW I4UwrkFQ/OL0PaJy8VxFzTdeadZdd9E8DncMgvnSJYeGKujCMfegBefklUgPzbl2c4GJ WU6w== 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=GdtmVBU6kbuKuNlqmo+NUmCZOtJiKsXYzRDePE/dKQY=; fh=hbZuELJbXWIM5e/N4D/KRXopoIKbPibjNuvPVI4PX74=; b=KRyfD42C7rVNLsvMOFJyN+VplrkOw9KZgURLwE6861zsGMrxIa38AZleFd30538JJ8 2KBKoT7cqB83GEw4gq6KcRNvWQvnQiPKymX5Y9wRoUkEJBdvMLpBojaKZnxBQUXah7VL RcIuqZE2SbpIx3Qs6i16qcTInNUF16hbJ6SWyAFdWQnK/R3d7dfJINnvoeV9G8MFfVsa xlSRs23XRSvFz490NnBWP46q4D6E1njvJR+EMZVb/kkwFeFmeYvtaDQ9/jQ4TSMLRH4G Elrxz1EYWw7QjSbU0ZUhqWIqAoq2S53PRLjJ9xXE4FjnGdrSd8h54JS1t0WBiJKn46Ei 2mfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=jXakqBkh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id t32-20020a056a0013a000b0068e4a646d2csi1749818pfg.252.2023.10.03.07.51.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=jXakqBkh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 1DDF082A6776; Tue, 3 Oct 2023 07:51:58 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240274AbjJCOv4 (ORCPT + 17 others); Tue, 3 Oct 2023 10:51:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240119AbjJCOvd (ORCPT ); Tue, 3 Oct 2023 10:51:33 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63147A1 for ; Tue, 3 Oct 2023 07:51:30 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40535597f01so9824635e9.3 for ; Tue, 03 Oct 2023 07:51:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344689; x=1696949489; 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=GdtmVBU6kbuKuNlqmo+NUmCZOtJiKsXYzRDePE/dKQY=; b=jXakqBkhtEuN7DMEJBXvkGRe3XTKFUaJCKM9DlRt4KV1JxCVzMivj8ykB5NGFX8qj2 V2bmXI7B/a41CKjup4pl1DYO0EbcgybwJv10wfFsSEc/lg3i1RNHPhIuyOOfFA+O5RXI pi5EWXBPs8ElaXlZUGRpZYN57mxP4oZISOilmm+qCgdk17VpyQCkI7xSnAUjzZWofuLV /Wlp4fetyMcUTxP8eX14IKOC3wFKJSk1ctxL+Zidu1w6IpQlszmiK8JD1aOVwmzFniTL vlQVP/DDI+zWn4w3pBkjhV0ycm1hYDbbxKxZ9OSeu7kotG/ZgAecoa7BRQnk3YxdCbZW ifqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344689; x=1696949489; 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=GdtmVBU6kbuKuNlqmo+NUmCZOtJiKsXYzRDePE/dKQY=; b=qbuHOVaEjbVyNwNpZc7LnJTdzvFsvC84Dv62kQVtAqIQikhNKBVe135+fPTeBMN8Ij HKJpxZPxXQ7saygSToYyl4NDuJN4hodV9n2vTW39w/2whO4fn00iyP2WMQsa/31MoUe2 17N0SNHpjxwqds3eSfmCwfau5yNs0knCHPRGRis7MRu7NcLIU740gvGzE3wyyVaEs2by gcuCVA2gt0tinh7wnb1LCqpeZRXUvM7px2JPej2XJhnKLWbaTvtaKIoiUuYolNT5AT2k w17ji+Sa5S0LWOPQxiMmXDf0TF4KK7lOxqUSn2wAGx51BkC8OUyQw6h4LaYoxd5ea0bN 1o/A== X-Gm-Message-State: AOJu0YxJoSnhHchsjZFFJ2KMTppQk0xIdzxYQlDB+GQNprhueUCJKjsT 0dTR4onSiiuadJUDQ4aR72Lubl/G0CqXxus0V0g= X-Received: by 2002:a7b:ce95:0:b0:401:b2c7:349b with SMTP id q21-20020a7bce95000000b00401b2c7349bmr13017389wmj.7.1696344688864; Tue, 03 Oct 2023 07:51:28 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:28 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Joel Stanley , Andrew Jeffery , linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH 08/36] gpio: aspeed: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:46 +0200 Message-Id: <20231003145114.21637-9-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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=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: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 03 Oct 2023 07:51:58 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746359753644055 X-GMAIL-MSGID: 1778746359753644055 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski Reviewed-by: Andrew Jeffery Acked-by: Uwe Kleine-König --- drivers/gpio/gpio-aspeed.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c index da33bbbdacb9..d3aa1cfd4ace 100644 --- a/drivers/gpio/gpio-aspeed.c +++ b/drivers/gpio/gpio-aspeed.c @@ -750,12 +750,12 @@ static int aspeed_gpio_request(struct gpio_chip *chip, unsigned int offset) if (!have_gpio(gpiochip_get_data(chip), offset)) return -ENODEV; - return pinctrl_gpio_request(chip->base + offset); + return pinctrl_gpio_request_new(chip, offset); } static void aspeed_gpio_free(struct gpio_chip *chip, unsigned int offset) { - pinctrl_gpio_free(chip->base + offset); + pinctrl_gpio_free_new(chip, offset); } static int usecs_to_cycles(struct aspeed_gpio *gpio, unsigned long usecs, @@ -973,7 +973,7 @@ static int aspeed_gpio_set_config(struct gpio_chip *chip, unsigned int offset, else if (param == PIN_CONFIG_BIAS_DISABLE || param == PIN_CONFIG_BIAS_PULL_DOWN || param == PIN_CONFIG_DRIVE_STRENGTH) - return pinctrl_gpio_set_config(offset, config); + return pinctrl_gpio_set_config_new(chip, offset, config); else if (param == PIN_CONFIG_DRIVE_OPEN_DRAIN || param == PIN_CONFIG_DRIVE_OPEN_SOURCE) /* Return -ENOTSUPP to trigger emulation, as per datasheet */ From patchwork Tue Oct 3 14:50:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147922 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139100vqb; Tue, 3 Oct 2023 07:51:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEkNd+C5uVCczTtqZqEAJSRte72OlKCJv9O+/FXCITsvgLWncu8FwCUmtyGD/8zVz6VIoaW X-Received: by 2002:aca:1016:0:b0:3ae:4d0:7f06 with SMTP id 22-20020aca1016000000b003ae04d07f06mr15592561oiq.16.1696344717125; Tue, 03 Oct 2023 07:51:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344717; cv=none; d=google.com; s=arc-20160816; b=Yv6FEu8z9vQR92KVD+qRYrH+3wbSrTrbXdWNel1TCk6DPBfBFCZwADM/YCMs/WU4Lo EzixxQIc2n0Y+DX9B1c9AF6AberScedfYnAO26VuydcUFbHYV3ZtBqSv+60RVUF9hF2l JrCqu5Mtll4tqQZJLEuPCu3VDE6vSbPycoRTaLDq+AmVtvMjqbCTFJIuqXojP5ezXhDG tBTWVS4EXf3Iww+FILZcA/2jTAax+R+hdKlpMO8tBZaLbEPfygptzhXFnugcn0Pjgpo1 BZ8xsswsrNSw/o15U02BYGZTpVqIVF5/kSjs9g6dr7fEic89HoGf5e6iFh7fChdB8Bf4 QVdQ== 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=OPe8AHR8wi1voZ8KVZNMBYnfWuXXWrqVYf9QOeCgRow=; fh=LHnPbAWj9J1KMSDNimQK/Ps7GYXo9t3I9NwzaguYS/4=; b=HCeHAO8t0AC1WhAEPoFC4Lw52Id/bONRar7t7b+L4hcJgg5AAsC30w2wa9V6K7uU2U creNBe4kVQ/pa+WD6X28K2aSbNdf9uU5Qs+Gniod3eDyl59Ud1sYvhBR6GA5DMKPAjIx DN+nOkH5vaIpz7aAGzJM+5spA+Bgjdx/iYIPCNYola2fB21MChlFGJlp7cWzdcu1cRfV EJCxt5NsEdtFQ7Icr9uL+u00G0eAaCKei+R0v4ZHQT8yG5LhzXbysk2OGIbqdxPqdwQj b3Rf298R3rGKSKRoNatCRLOg0AZpNEytgg2OEd5Gg8e/72+Ju373p7bC8DThZddhkyQe LjLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=Rxs9TAGJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id l65-20020a633e44000000b005655bf61e32si1598858pga.23.2023.10.03.07.51.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=Rxs9TAGJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 84202819DFCF; Tue, 3 Oct 2023 07:51:56 -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 S240247AbjJCOvx (ORCPT + 17 others); Tue, 3 Oct 2023 10:51:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240208AbjJCOvi (ORCPT ); Tue, 3 Oct 2023 10:51:38 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41A29B7 for ; Tue, 3 Oct 2023 07:51:31 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4054496bde3so10012775e9.1 for ; Tue, 03 Oct 2023 07:51:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344689; x=1696949489; 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=OPe8AHR8wi1voZ8KVZNMBYnfWuXXWrqVYf9QOeCgRow=; b=Rxs9TAGJdbi2gKUKE0Ia70WFSl84rtSF5PPgjoUU46x6sPf+ErBKZ/VWWnG3ePBxJ8 ATfREpXhj5hsKgAPiuK3usk1Ujp8xBvxqdRv1nKWSSG/ixFOUgHcZ67GvbOVAF9XZ2gx KZPNxTnnDQ+Xm1Etk9SE8bCH4hGeTOimyNMqVxJZEbL+sGu9CZym48+oTE+9eJEmuH60 A2OOmpbaDQlLRHhdpb56Yrd+NZAeGP9v3Ppll4YoY9+WAdjyE9PZBT3N0vduCSZRpQLh ytudJKuxrZG3DxNfDgBvP/cLIDc1HINKyOHowV0XpQCAMSxdxQG/BwtJ1lc8vDzPY3l1 czEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344689; x=1696949489; 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=OPe8AHR8wi1voZ8KVZNMBYnfWuXXWrqVYf9QOeCgRow=; b=C8rz10uKnCwWUUnEe92i9sow9N1ySR7Y4c5l2sTupCqClCUpySV75bBKPADjSkuq7i dDmAU52IAVh3iYtiW1nnDrjBaKM+pkADhVN8btXoZWR6kg007ku/Mv2jXxvQus8LV1YG ZOkGG1l13LMa8hD3kfaEsPZbi4JN4ZQYAhM87ewyOhZn/5yEjkpap6FtSt/XDXTXFmSP u8rD5VZl0cQewXz2CD1u0musrh+07mR4xgENFgHTHeJShzh0L05x6CVB6qc+aQBVHcg4 tyUgXxusNXzW6XwxUV+p29XzWp3hlLVGoFPGWEIm4ybO1Qxw1Aa2KqowNDX+QciKAgEs axjQ== X-Gm-Message-State: AOJu0Yy+znFWMABgJn5ytNjYh0zUmMjqYUN+TiZ5t1zM9l1GHSc+nSrZ DEaWNA0lXskxe86cKUBcxf2OoQ== X-Received: by 2002:a05:600c:2948:b0:405:3f06:c07e with SMTP id n8-20020a05600c294800b004053f06c07emr12250543wmd.15.1696344689690; Tue, 03 Oct 2023 07:51:29 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:29 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , linux-pwm@vger.kernel.org Subject: [PATCH 09/36] gpio: mvebu: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:47 +0200 Message-Id: <20231003145114.21637-10-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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]); Tue, 03 Oct 2023 07:51:56 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746357844983982 X-GMAIL-MSGID: 1778746357844983982 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski Acked-by: Uwe Kleine-König --- drivers/gpio/gpio-mvebu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c index 67497116ce27..8fada9cd258a 100644 --- a/drivers/gpio/gpio-mvebu.c +++ b/drivers/gpio/gpio-mvebu.c @@ -345,7 +345,7 @@ static int mvebu_gpio_direction_input(struct gpio_chip *chip, unsigned int pin) * Check with the pinctrl driver whether this pin is usable as * an input GPIO */ - ret = pinctrl_gpio_direction_input(chip->base + pin); + ret = pinctrl_gpio_direction_input_new(chip, pin); if (ret) return ret; @@ -365,7 +365,7 @@ static int mvebu_gpio_direction_output(struct gpio_chip *chip, unsigned int pin, * Check with the pinctrl driver whether this pin is usable as * an output GPIO */ - ret = pinctrl_gpio_direction_output(chip->base + pin); + ret = pinctrl_gpio_direction_output_new(chip, pin); if (ret) return ret; From patchwork Tue Oct 3 14:50:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147924 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139171vqb; Tue, 3 Oct 2023 07:52:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQU4X+d5GWIRVZC2mBpxwu7O9zRFeGhhdy4ftY5c5Xfu5x07yafV38QlspjPzk8jkOhJMX X-Received: by 2002:a05:6830:1452:b0:6c4:8441:f90 with SMTP id w18-20020a056830145200b006c484410f90mr14959850otp.24.1696344725013; Tue, 03 Oct 2023 07:52:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344724; cv=none; d=google.com; s=arc-20160816; b=LfpDE3ol47YKFiyhtc1gkOKZZyYXVJwq1hvRMsWmGmX2YVg8GbKDHJZcCHXVUKkUrs ZJ8Uuk83+tOczisZp0gfLQ4+XlUkUTiNP1f9fUfD4SL39RlX3nwDsdCCoXBUljQ27Ss+ 80fLrg6sH2WE/nb4kXGaSnPOFMfIyjztZim2baFhp03kyQP7fctsa7ybt/FL8zw5qF7m PheU2V3LiGaiENlAWGcFXLcvmPkuuv3hOiz+ofthM0s1Ytqff3p8MhMNfRRctE0dEWd7 Lhuhc0cWYu/Fx9xFJRHXgH8MdalpMIi3BnIr6YLyg4NarkpIQj5cCUydm/e4Ct45vIhz GWJQ== 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=n2xq1c7gkK7UBvFiiWYtPT4/dVB/RGOfCXDnH3L0uQ8=; fh=VIk+var6XpNeJ7hfig1APfL5ODiH7P/JWDFCBZorXCI=; b=vdDeVgj+2AezXsb64f62xcqbrhVQT5bSISl2w49/L1LNhF9RyootOCr2DEgbmh4Xie dS4CL2TQzstJsBUUtFkMDZNSpTGZMhymqxyDruDqDykQ91eFI2OLQpp6EzzNeD/7obX9 p039FLLspeQOpnHKWRAscdDLqIGzMHvm8T86KSf7ANT4K6bM/f/ELXKsoALkyhiN66I/ u73c1B9EnKiYfHK93gtoaj12q4ArtTD9NUrX0Oz7SfPTL5ef6TjNUwzsm8lqo62JG8c7 6dZM6ovH9QGKWlu6RNyhMfzP3ecP5Ua9J7Gw6mCgWx86r7WBH7HlrnuIf9kVqT+b1vh9 CVlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=E8TWi5Zz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id i73-20020a636d4c000000b00563ee04bbafsi1540796pgc.837.2023.10.03.07.52.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=E8TWi5Zz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 07BA982A8551; Tue, 3 Oct 2023 07:52:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240277AbjJCOv6 (ORCPT + 17 others); Tue, 3 Oct 2023 10:51:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240213AbjJCOvi (ORCPT ); Tue, 3 Oct 2023 10:51:38 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 103BEBB for ; Tue, 3 Oct 2023 07:51:32 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40651a72807so9984385e9.1 for ; Tue, 03 Oct 2023 07:51:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344690; x=1696949490; 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=n2xq1c7gkK7UBvFiiWYtPT4/dVB/RGOfCXDnH3L0uQ8=; b=E8TWi5ZzdtTPUndB5aIkSwrT+UoIbnDE16ENBJkYNXs6f8Ypr7JDmSpftSUvrHaVhG 051ke8Dx72b/a6WG5H6+8pY5pxWAVShfVLId9I1gBngjEHqSzRLVBVrFf63bhqrh3YNm oO2U1tc5d6c5miWAnvG/E7HvAuEHtqqBZMUloVmUAMGyD+7wQp4SUCtuddgTr/LyGzQI /7nhlkaKWaJUKO+CjVoCzTHPRm1MJJoOna/IXgBfpagkg6jIgIXIgNhbU+mddCSEc4fp M1Ro5lCtEe3UEJ7Auo2TGFnQc0FNT29PjyHhvn8lpvcYa8dfqAD92Del8LPrqJAJJ6TD GpZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344690; x=1696949490; 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=n2xq1c7gkK7UBvFiiWYtPT4/dVB/RGOfCXDnH3L0uQ8=; b=AVM8HVrqXrRpnXJoJuWlVoft4iraqYOmyukE42CypNQskr0RqjQzPZO6iscx67YkuR 3Y5AI9qSAC8+0D5wXuUvdGoVGiEX/MKXlIEO0ZRGvtOvmFGGfa1Xs3Os+c0AYnhmHRem WAuD89WHhSiq7Uq4jBtFkeX3KGvf/Qs1WlCzO3SblMUxtb3czRXUvEGKd4pkU0vSXg3s RWBa5gROSb+glA3QWPThdgyTCibYgPvSnwPrFXW+Lhno3B0QYQ8rB6rYfcZNaWsFomEQ 9hhAzJcpG7LdNjXWafwuXTYpbGtcRVwVt1KkiseG3m1pmS95C6d6Xm7/a9rxiEwGcHhY JMIw== X-Gm-Message-State: AOJu0YxuR7T/fWS60JOsIb/OnlxRSjNJQpKwkBQSIkzXXBzyPnMRuFTd VDXM5jddL1UzXM7lhZpyOkjBE0sSMtw4polHxfI= X-Received: by 2002:a05:600c:21ca:b0:405:3b1f:9691 with SMTP id x10-20020a05600c21ca00b004053b1f9691mr14309451wmj.11.1696344690515; Tue, 03 Oct 2023 07:51:30 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:30 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Robert Jarzmik Subject: [PATCH 10/36] gpio: pxa: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:48 +0200 Message-Id: <20231003145114.21637-11-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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 (howler.vger.email [0.0.0.0]); Tue, 03 Oct 2023 07:52:04 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746366220526474 X-GMAIL-MSGID: 1778746366220526474 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-pxa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index cae9661862fe..2fd797b91270 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c @@ -260,7 +260,7 @@ static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset) int ret; if (pxa_gpio_has_pinctrl()) { - ret = pinctrl_gpio_direction_input(chip->base + offset); + ret = pinctrl_gpio_direction_input_new(chip, offset); if (ret) return ret; } @@ -289,7 +289,7 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip, writel_relaxed(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET)); if (pxa_gpio_has_pinctrl()) { - ret = pinctrl_gpio_direction_output(chip->base + offset); + ret = pinctrl_gpio_direction_output_new(chip, offset); if (ret) return ret; } From patchwork Tue Oct 3 14:50:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147927 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139387vqb; Tue, 3 Oct 2023 07:52:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGPC8uNviyn5HiRpdireripUX0qlzAOC7Y8Xy61M/1AFOKvLA7+w0uOuxZ+I/lS52wEsGZC X-Received: by 2002:a05:6a00:b50:b0:68f:cc47:fcd7 with SMTP id p16-20020a056a000b5000b0068fcc47fcd7mr17091505pfo.28.1696344749139; Tue, 03 Oct 2023 07:52:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344749; cv=none; d=google.com; s=arc-20160816; b=gpq5WQEPZBEvh8/s04c+tM6ht4gmaVPTzg+mdoMnB3iBQOLKKEu9samGc2v2Ow9zGu IOFLJ2kSp8urYY81GkMuQz8BypeZuAjphBVHFf5fYQrCNpXm+wOUgmbi+9dLh3k197CT f+JIOlMT2fkTkRK8KcpNnltyAP/GXQ50lfI+AFLWtxD1/O/OCpfPm1VPdpZkJVDFZx6m a67VVFXj67WdqiczcvYoM2D2o3fZ54OrE3zfaWYiSO9ZFWJl2oyJzdv5m/tECheLeaZo eoUcjPIgD9AkwxJXnQAqwY3kYUXmbsrHdOltJiD/D6/eHJUN4vXiYtP5CtnXPT0EKdGE 8qfw== 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=0LC9FxBCiC3OrfTLsSY8qEZzHDKeEz4Ow69tozPBiOU=; fh=i8s9joTDW7kzVrwG+9heqXI3pTy/Xs0lHlN+hguXk7Q=; b=FAYkP3XEiQxxqEqt/n+70nTD7jRslw+Oj3oT8BBtMoBMg5IxAUlYZ9tGR7OJY9Hbvj cN29C1fSPS5V8y4UL4V+IB3RsdaGwLJ5EV9TCUxCa6y3Rv7grfMhxRfyCDS4/zRnTLpo 5mHEXmMVQYKiYKYbTyRlVLJs6HEkNIrlC0VUuCGgLgFaE+scMruwtevPrL8NXLlLon0v CKNCFywfPdHdi3sHHFZGnDMYq2fcwfuUyMRd7HK5e1KTgFLCzqPNZcwhwjgsgXMqtZ5q iNZkAZOCUunnMCVa/nwZuYT70p2v5ji18iWj8p/AESOhvKhP9/UV4dysZoDHLtiNohOa MVmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=DfhEG8N1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id z1-20020a63c041000000b005859ed0e6f4si1552913pgi.471.2023.10.03.07.52.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=DfhEG8N1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 1AA5E82A8573; Tue, 3 Oct 2023 07:52:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240398AbjJCOwS (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240214AbjJCOvi (ORCPT ); Tue, 3 Oct 2023 10:51:38 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D503DCE for ; Tue, 3 Oct 2023 07:51:32 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-405361bb94eso10662615e9.0 for ; Tue, 03 Oct 2023 07:51:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344691; x=1696949491; 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=0LC9FxBCiC3OrfTLsSY8qEZzHDKeEz4Ow69tozPBiOU=; b=DfhEG8N1TQ+niwpn2oiprZQFtUsQK2ddMZuHmy9NfocuNqdyQhQVTRDBQmGDeDqLW1 yh79XKB4TcNaY/xP2awyPUVku2hl5Ah6cSFvyfj4AmRCUn7DUwfHCXTfdblyNxGdAwEU YIr2rHiuVc52fxJilYzRbsroo7BMOrtxOjiyrTwcGA2Es1cdoXpGs/fGNmz5PR8ii0ty +mzTspe+ChH9puSyXQskjEpMJZHaA4FZlhmk5iSlxmTSzyza9RGTNwHa1Rrgbd7X5tkN 6DfVk2OlfiG8d+31JcvgBu8if5ZLhTc5Esf6UbOBfOxu6QN/26fdor5ihXRNDfUfR0YT x9+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344691; x=1696949491; 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=0LC9FxBCiC3OrfTLsSY8qEZzHDKeEz4Ow69tozPBiOU=; b=FQBxmdeSp5fdLFIf+/C6zsv8H5WDLYE6CzCHeNG8YDkplmyKguCQoGFxzpTOd0HCnM p23ZPrnOyJ6tnY3rW+eBD96rBqy4MFgjr8c4fSuNeX4/l6Tx20rEhZmyklg9yqcigQej pA4q1TOjZUbFaVPp5VRwm33yOv0anb5wJvEhZ6Fdxw0YR2Q6FDJj3EDTRWl0dAbgCnbw wd3hpTCiT6LjAFb54fZUowbAXEbjAudkgbiCvKSEuexKaLA7WRs5YXm987r1ttyUp+p6 39A3XnRMZRHE8nTo7F+dudaf02YhTZIJKEK/3Kn+r4ptHK6toQ50KA1Upqt5oZ52pigB hWaw== X-Gm-Message-State: AOJu0YxR7iLVzH2DBUUKKXPRxkK43/DTqIDZVRjq8nPICLA25CCKSsgS /xvlJsrm8Su7oYReeL1UHlFSg/gQu1yoDySBTnY= X-Received: by 2002:a05:600c:2317:b0:402:f5c4:2e5a with SMTP id 23-20020a05600c231700b00402f5c42e5amr13357135wmo.37.1696344691351; Tue, 03 Oct 2023 07:51:31 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:30 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Heiko Stuebner , linux-rockchip@lists.infradead.org Subject: [PATCH 11/36] gpio: rockchip: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:49 +0200 Message-Id: <20231003145114.21637-12-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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=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: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 03 Oct 2023 07:52:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746391857711801 X-GMAIL-MSGID: 1778746391857711801 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski Acked-by: Heiko Stuebner --- drivers/gpio/gpio-rockchip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c index 23040a8cea34..3576793f0bd9 100644 --- a/drivers/gpio/gpio-rockchip.c +++ b/drivers/gpio/gpio-rockchip.c @@ -159,9 +159,9 @@ static int rockchip_gpio_set_direction(struct gpio_chip *chip, if (input) - pinctrl_gpio_direction_input(bank->pin_base + offset); + pinctrl_gpio_direction_input_new(chip, offset); else - pinctrl_gpio_direction_output(bank->pin_base + offset); + pinctrl_gpio_direction_output_new(chip, offset); raw_spin_lock_irqsave(&bank->slock, flags); rockchip_gpio_writel_bit(bank, offset, data, bank->gpio_regs->port_ddr); From patchwork Tue Oct 3 14:50:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147926 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139358vqb; Tue, 3 Oct 2023 07:52:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG0eBeNFUSJwadyT3EvBwPQzinUz+6sCMK76fo2nb5tXzbUl9ycNBTWNZAYRyOaUh1NjZPa X-Received: by 2002:a05:6a00:2e9c:b0:68f:c078:b0c9 with SMTP id fd28-20020a056a002e9c00b0068fc078b0c9mr5067655pfb.11.1696344745147; Tue, 03 Oct 2023 07:52:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344745; cv=none; d=google.com; s=arc-20160816; b=N/vX/zzH+wod9LlPy4IeubvP9NaqEzU6IpmIM4TOHbkXl5/6csV43NBQZNT3A/Ne4b CGTQtp8UPAR6tWlozTBA/zD8HNYp60LOzzw6zWDsg5euAjVkePqhNH/O0ndLNf+GZB5m A4GamzUPkueMKL8EirsHacz6mDs9ZjPE6dlY/2rU/fBh/CLq1wtkvhT9cXN310a59IUG 6gX/eKPYnn2xE9kjd6OqUPpw2/Klnm7IIS4xLbfCTwpVrUFKGp09NfvdGyH7WFno9Kk9 T6hjUWg2w6Q4laomZtyU5Y1WGjjq415ioepBg4rd9LAlkCil6U6/dH7eW7dymHAQV3kQ K3ow== 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=f3PAik/MdMnmd6nJXEVGIJx0ZjjbAy5Xj5U2rnqb3Ps=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=Wb3VNXLZOVdoYFmFJLEjz4r72CBBiTY1OuW+ur3mtXCv3m57DDlfn3jh3GCqpJ4hER 5SfFyW0nNoIYlDUIOTSli3BLni32sp9WY5fziwwA3lrEQn11NqFCD/jNHS4gL/cBk0Yl Cjm1cgdMbQ/a33BNOBiEAemBVGKY7YkGDKOTrh+cgsL2EnCx3dp1tj/nluydWUUK8GeC rUMVS8j4GyDAZ0DvvKt2THgWE98ZJal28+6xHMKXHpmsSkuiAvAVFCXfeNbgIx5WU4+I NufRnMu+78afL1lxpO6U7S+4GPI6Cj8xeuuJ0Fv8JL/z5iR9OQDvAGXCV6t4+Ju6Ujaj S4sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=JNb9y+4U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id eh6-20020a056a00808600b0068e3fe64a03si1551653pfb.308.2023.10.03.07.52.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=JNb9y+4U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 48EFC82A677B; Tue, 3 Oct 2023 07:52:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240361AbjJCOwO (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240194AbjJCOvi (ORCPT ); Tue, 3 Oct 2023 10:51:38 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A08DDD for ; Tue, 3 Oct 2023 07:51:33 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4065f29e933so10252625e9.1 for ; Tue, 03 Oct 2023 07:51:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344692; x=1696949492; 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=f3PAik/MdMnmd6nJXEVGIJx0ZjjbAy5Xj5U2rnqb3Ps=; b=JNb9y+4Ud+Jnj2+QOSYSdULPNKXQs/YgHtozr9VkTXRXX42Fch1p+5K8umy7vtcnWS 0Kqwx1hFIqKXcW4ZwbcODQq8fsiPy1u2l/EY3beSC0zS2WU71hncPTgi+vZ+kBXHtw0l YXCYBBeyMfnnLsv68J9xiDrNCMryk6ARMZv2jsMt/o8hWhNAO0JqPKaNNLWrTlQI+Shj /5+d0KGqbWZhzZcH12PmEYm2Y160u4oOqaCjFONfEN62sZpr+gCrvKTDsjaE2qlxG94u cwvvhyO/4uE0SwoOvZ745JyQVHd/CxqLznKKPB8r/o9I4WUtXjIMpHZ5AtBaTdg1sXb5 mIxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344692; x=1696949492; 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=f3PAik/MdMnmd6nJXEVGIJx0ZjjbAy5Xj5U2rnqb3Ps=; b=SEBCGKI2fZ4qd1Ea991X1vrCE1JevmBwIiJZurKN/xJWWHrRdiHlnTcoEtroh+LPQV MjFsCGUWaxWgdjK7gNcK+EgmWnd1QORjBHhImD9A04hTgJpT9sXdr90vm7GBPFu41FDF hh7qSDiM3gVNihQ3e+c5XBF5MXUSGO1Zjc2CqUcayJ1JevtVVEq+KrOIC64q2KAYy4M4 AC924lYkvAplo0RpTZZxxZBEuNnQnNZxr1un+ByL4qVeVkWdX4SsZctsgrFuujh4y0nc fyeG8jL779DbJP/2HlNQxU8AKAJrNmogBlgEKy+wAcfs8J3ePIbD5Cshlv5tyJIfL8cb hrAg== X-Gm-Message-State: AOJu0Ywbp+9zluFOkKF/msTHMMp2Pks/M0rtKxwi039zsr0T2mH5aQuT PX7BKUoRBDhbHl/qpoKdCR/EwQ== X-Received: by 2002:a1c:7c0b:0:b0:3fe:2b8c:9f0b with SMTP id x11-20020a1c7c0b000000b003fe2b8c9f0bmr11782685wmc.23.1696344692136; Tue, 03 Oct 2023 07:51:32 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:31 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 12/36] gpio: vf610: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:50 +0200 Message-Id: <20231003145114.21637-13-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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 (howler.vger.email [0.0.0.0]); Tue, 03 Oct 2023 07:52:24 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746387534496179 X-GMAIL-MSGID: 1778746387534496179 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-vf610.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c index dbc7ba0ee72c..32142b9564f9 100644 --- a/drivers/gpio/gpio-vf610.c +++ b/drivers/gpio/gpio-vf610.c @@ -116,7 +116,7 @@ static int vf610_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR); } - return pinctrl_gpio_direction_input(chip->base + gpio); + return pinctrl_gpio_direction_input_new(chip, gpio); } static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, @@ -134,7 +134,7 @@ static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, vf610_gpio_set(chip, gpio, value); - return pinctrl_gpio_direction_output(chip->base + gpio); + return pinctrl_gpio_direction_output_new(chip, gpio); } static void vf610_gpio_irq_handler(struct irq_desc *desc) From patchwork Tue Oct 3 14:50:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147946 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2140234vqb; Tue, 3 Oct 2023 07:54:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFnr1+xVcStQ2evXYxT6vgwdp+X29iia5VBujO71KYATC/EYOBuUCIVPCKKshANNSMbe0QQ X-Received: by 2002:a05:6e02:1a4d:b0:352:5fcb:1401 with SMTP id u13-20020a056e021a4d00b003525fcb1401mr16328837ilv.8.1696344841753; Tue, 03 Oct 2023 07:54:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344841; cv=none; d=google.com; s=arc-20160816; b=RiFW037+Ne4nQMwguO9J5QVI9FBJt+cKeXb8B6uGr/b9IHgNdHyMQVsNIu2ek3kpOv upKDPAYmgPxxVc++i5NBHckz4WGu0aMbnlket6YbLAzkdt7zBI2F0F3CiDvEMOuqGUEy e1lnlrMPln9lZMc++E2qaN0G/z4lk8Jn6qfdkEbt74S5OB2KY1DnY6uUsmQ/l8zvbLl9 HBtxX/rVghq2Zn9C/jCuwkREVRI22Zh2uxOKsafzJNldOutbXc9EsCchxHqlRdrrnIbL guztXDX3FOKRUK6ot/Byg8y+E3wo1SwaohzXs9VKtOZxR1zCWM8QUNGFw2HxeK4X92BR 04eQ== 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=R6f2Ek6wUAMXrQ0iQTwEIlp72Yx/GmOv3RdXzeN7wCE=; fh=drsXJwg3u8I7VCd9MWrRAzXPeSq/nqQsJrVqG+FmGr8=; b=Rx86dtEXS7xRqGk2DzanurQMG5UaWwkOj4HJ2nIP1XNtFqBnLh+ytG19EpRkfD8q/H 9JPvwUW6cFvj7uMjPmwbT5QQEbzV0LmHpZvtTB2iG6A90UILIKArOEoz2FiDOHy0wHvo ldLRog0U6NecqdxPOfvvod7yUNlCTR1rHYOImk+/krc5QlfH6p/kJe3oaniV02Crxb7/ W67F3+fFPBwwVLxc2G4ToL4hzejgfH5q/eMJNOzXNGMSXPyTNsgwO+LticzNCQQUUM2S zHXlKsuek3zTMI+ao0eNgShvzd74oxm09pqbjThux1SpFCfwTQf7Bw21Rrsqy5NWlgta jigA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b="VsljBR/L"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id v185-20020a6389c2000000b00578f1ab2287si1581797pgd.354.2023.10.03.07.54.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:54:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b="VsljBR/L"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id ADBFA8133D08; Tue, 3 Oct 2023 07:53:39 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240289AbjJCOwB (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240224AbjJCOvj (ORCPT ); Tue, 3 Oct 2023 10:51:39 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B97DFE5 for ; Tue, 3 Oct 2023 07:51:34 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40572aeb6d0so9992685e9.1 for ; Tue, 03 Oct 2023 07:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344693; x=1696949493; 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=R6f2Ek6wUAMXrQ0iQTwEIlp72Yx/GmOv3RdXzeN7wCE=; b=VsljBR/L4p91DUJCiMBygW13RIDBc/oKl2Vh8llIXH3rz92aHYFX/C3Sa/QeeOmf1E m07hfTQuDS7d0YhyU7Z7NwKwh/jfYcqbbihJxmjMZ+29euOn1CJTA3wm1PrSIp4xRds9 UMSTyhQ9W8yaeHdpbEZOBNjAIGv3h3OqTz8xOfrW/0oeLsrzm2wK0yJ4swV0y4+gkst7 w8GfOzMYvknSAIO6g9axC3YZCITqP8p6xkvENq+hYOjAKEvHulU8s9WfcqeVcZ/YbxU3 pMzoEQVrAy+ixwosu5SfeHrS1bLF2Yo4RcK57EidHQVCDy2mrl/fLyteLFHMc3e/1JgN K0kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344693; x=1696949493; 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=R6f2Ek6wUAMXrQ0iQTwEIlp72Yx/GmOv3RdXzeN7wCE=; b=NtxmKqKfFb+GvYW1JJbjbue+xgoknKBLEr6AB6jrxYPo75/XBHkZoNAt9a+UesHXyh 0Z5ggh+iGT6l0qrCWM1c/ia/DfXtZU+boCtg3IkoRZSIRD8i84hlgwb5tBEzvoJtkG+B czU3EC3ZMNWog1gvr6AZ8pfhtZ6kaHP6qbrUp8k+KiWmlO8tFg4lmGFaJQ+TXJO90Nfd oAOLclwl4bvmVz3+hpP+jo1hj3DRdlhpO9VjadqTgcH8G14lgsw6ZcB5vrjUMM2YZV/m e6uViwSfVwHKs2bOn3kfMN9GnxlmeBk5RAJDN9TfxR6QIBmJZ/fiipxXgJPd/MYVi4l+ CoyQ== X-Gm-Message-State: AOJu0Yxk0bnnNgUlB0lvzfu00K+R/JzcVXuXfzgqAnjwbix+TVfn2LF3 +KhidYJQw71WSVJFTlDnEnZf2Q== X-Received: by 2002:a05:600c:b56:b0:401:be70:53b6 with SMTP id k22-20020a05600c0b5600b00401be7053b6mr12193455wmr.15.1696344693054; Tue, 03 Oct 2023 07:51:33 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:32 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Avi Fishman , Tomer Maimon , Patrick Venture , Tali Perry , Nancy Yuen , Benjamin Fair Subject: [PATCH 13/36] pinctrl: nuvoton: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:51 +0200 Message-Id: <20231003145114.21637-14-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Tue, 03 Oct 2023 07:53:39 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746488648613963 X-GMAIL-MSGID: 1778746488648613963 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 8 ++++---- drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c index 8bdd0124e2eb..62134a7f0b4e 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c @@ -171,7 +171,7 @@ static int npcmgpio_direction_input(struct gpio_chip *chip, unsigned int offset) struct npcm7xx_gpio *bank = gpiochip_get_data(chip); int ret; - ret = pinctrl_gpio_direction_input(offset + chip->base); + ret = pinctrl_gpio_direction_input_new(chip, offset); if (ret) return ret; @@ -188,7 +188,7 @@ static int npcmgpio_direction_output(struct gpio_chip *chip, dev_dbg(chip->parent, "gpio_direction_output: offset%d = %x\n", offset, value); - ret = pinctrl_gpio_direction_output(offset + chip->base); + ret = pinctrl_gpio_direction_output_new(chip, offset); if (ret) return ret; @@ -201,7 +201,7 @@ static int npcmgpio_gpio_request(struct gpio_chip *chip, unsigned int offset) int ret; dev_dbg(chip->parent, "gpio_request: offset%d\n", offset); - ret = pinctrl_gpio_request(offset + chip->base); + ret = pinctrl_gpio_request_new(chip, offset); if (ret) return ret; @@ -211,7 +211,7 @@ static int npcmgpio_gpio_request(struct gpio_chip *chip, unsigned int offset) static void npcmgpio_gpio_free(struct gpio_chip *chip, unsigned int offset) { dev_dbg(chip->parent, "gpio_free: offset%d\n", offset); - pinctrl_gpio_free(offset + chip->base); + pinctrl_gpio_free_new(chip, offset); } static void npcmgpio_irq_handler(struct irq_desc *desc) diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c index da21f6a45888..0b6d6964087e 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c @@ -173,7 +173,7 @@ static int npcmgpio_direction_input(struct gpio_chip *chip, unsigned int offset) struct npcm8xx_gpio *bank = gpiochip_get_data(chip); int ret; - ret = pinctrl_gpio_direction_input(offset + chip->base); + ret = pinctrl_gpio_direction_input_new(chip, offset); if (ret) return ret; @@ -186,7 +186,7 @@ static int npcmgpio_direction_output(struct gpio_chip *chip, struct npcm8xx_gpio *bank = gpiochip_get_data(chip); int ret; - ret = pinctrl_gpio_direction_output(offset + chip->base); + ret = pinctrl_gpio_direction_output_new(chip, offset); if (ret) return ret; @@ -198,7 +198,7 @@ static int npcmgpio_gpio_request(struct gpio_chip *chip, unsigned int offset) struct npcm8xx_gpio *bank = gpiochip_get_data(chip); int ret; - ret = pinctrl_gpio_request(offset + chip->base); + ret = pinctrl_gpio_request_new(chip, offset); if (ret) return ret; @@ -207,7 +207,7 @@ static int npcmgpio_gpio_request(struct gpio_chip *chip, unsigned int offset) static void npcmgpio_gpio_free(struct gpio_chip *chip, unsigned int offset) { - pinctrl_gpio_free(offset + chip->base); + pinctrl_gpio_free_new(chip, offset); } static void npcmgpio_irq_handler(struct irq_desc *desc) From patchwork Tue Oct 3 14:50:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147945 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2140201vqb; Tue, 3 Oct 2023 07:53:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFRnPEz9UTHgf3zhk78H0snrtrx23slDEkUGePTd8JBpJAa/eER6jLvRaVXLemNedfCyp+n X-Received: by 2002:a17:903:228e:b0:1c6:2655:625d with SMTP id b14-20020a170903228e00b001c62655625dmr4788699plh.15.1696344837355; Tue, 03 Oct 2023 07:53:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344837; cv=none; d=google.com; s=arc-20160816; b=ujbhoNXRsDVhD1qOMy5qsdzeCtVc1o7zZNL13BEToFi2KY5rw8Om22ByHMOtqjN8bP 0JgrknpqHJYIEeUsXDT9VRNoP6430+iDs+Ro+xM1JSGZ/5MsIpy9VxCDXlYUGZb1rqB3 SuRp8HnveUTfOTsSfgxIuEqRHSJ61CGzmD0DWvMqQANDoovQ+cJcF77ZxXt4j2Ftrq8l +yhjaeFV0YvPLKdwUl+bYXLy5vzqb+dwe8+8QOlfQxCAdfNe3DgiPtkiJSbhks8G9uDY mVuSMwjCNUNS+aGB4/VBvShYhdWW7oIkcXQx4zHyhguBFu30Soqzjt+uVPuurUAqtC/n sRyg== 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=PpGAZ8JK0NCFcy4HbqYTmEGAjLfb4Lc8h9XsT2EPYsE=; fh=z6bgZyqOow+nNia7mcl9/7DzvK1ceF8lVZIvlvlpIII=; b=GzDb7UkXUreYXsFaVpWQiRKEcQFnRviRfLy0JE3TAdjkw5A8P7KjoQjXIcXb3tWnSO V8ZpXkB2sqA80N7rSLPPdDk/4pxoKizFY5ap7cmmXpN1KWTR7NrBV7nFPgv1eXM44rXg MIo0ePdn4SkQPYjVIFLDeHJpA5Ztd1aIwn0FQbcmLzmaTLOCnIroSO+9oGWQ+nwwB4eo XJ0GNsxDEiLvJRX6PzSznPGkAsfoH9n8L6zMhvDKkZCAeDDKjk+tUM6qXOCkSjD3J87g KRgy6+ZA0UuuOjzB+1ncLtAtGr9bwX6fD7ivF21q03KinIKhPnkORgmVlrrqIgVGBmy1 rpDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=dSACUX21; 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 Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id kx14-20020a170902f94e00b001c43cd8b2d5si1499903plb.592.2023.10.03.07.53.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:53:57 -0700 (PDT) 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=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=dSACUX21; 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 Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 305AA815CD90; Tue, 3 Oct 2023 07:53:39 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240245AbjJCOwL (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240227AbjJCOvj (ORCPT ); Tue, 3 Oct 2023 10:51:39 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66B97EA for ; Tue, 3 Oct 2023 07:51:35 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-405361bb94eso10663025e9.0 for ; Tue, 03 Oct 2023 07:51:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344694; x=1696949494; 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=PpGAZ8JK0NCFcy4HbqYTmEGAjLfb4Lc8h9XsT2EPYsE=; b=dSACUX21hIuF4pWREviicHqpZHEb6E9mveq26pi5uMOzCu06VPLxpFovs6E+ijHlEo GA4NYiHefH79BgN2FyamVMjpKGfOHFCjjsrYujzhuEqQ/WypO6xW0ZUGcPpy5XSBftLc MQlCODnjmYZvr+dfEuqEZaYZxkUxz4RMkVyCCXXx0MVvgAjzIrWGM6LADZHaIFK1r1sX wweA+WDfQpQWQMgJvJ7keS9+W1vZK1Zov9+vRwx9tiTyjGu/bCMMZCCTRNM6Du1GLi28 LBodzf+/cWZyUdTQlWA6wP5ATGobxPlZmHWrvJkVBZqb858tjxgSp9bSWmuvg9eEpes9 diVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344694; x=1696949494; 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=PpGAZ8JK0NCFcy4HbqYTmEGAjLfb4Lc8h9XsT2EPYsE=; b=psvjvLMHKaNteQSI88KnsquEv/phcisA4wNdZAujM5iMae5IniVDH+vSq2MKCnh7/I 8mDZpIogTrp9mJGmtFJRB7NX9THAbiAZDC6wE+9L/Lgw0MdLb0pvcxWj3iKUagddOmCs lzQXC+XlhJZQYy6dEWuaUeCGcE5i+eUNK5CewB76iB6HUOH0IS/f6y7AlPGi/UNhiLTS lP79G5714SyVmlikpXXJnrO4TGsORaYsroS649ZQgDY+l+7q5vfkVzSJ1NZSLKrRqApL al4IFyweWmUNz1o+O4/JT93+45RQmU1OlMhbgv97TZp9SFfaCoy1LGPYRXmCHOeZzy4X mMyA== X-Gm-Message-State: AOJu0YxPt+FQwOotw4q8EICB90TaSB+45dPTAurLwNawSkEaNHP/tqAi TOFpUgW/k6TsV1CWXBx9fU2/Yg== X-Received: by 2002:a7b:c7d2:0:b0:405:48ba:9c with SMTP id z18-20020a7bc7d2000000b0040548ba009cmr13654280wmk.16.1696344693886; Tue, 03 Oct 2023 07:51:33 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:33 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Geert Uytterhoeven , linux-renesas-soc@vger.kernel.org Subject: [PATCH 14/36] pinctrl: renesas: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:52 +0200 Message-Id: <20231003145114.21637-15-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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]); Tue, 03 Oct 2023 07:53:39 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746484394318585 X-GMAIL-MSGID: 1778746484394318585 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski Reviewed-by: Geert Uytterhoeven Acked-by: Geert Uytterhoeven --- drivers/pinctrl/renesas/gpio.c | 8 ++++---- drivers/pinctrl/renesas/pinctrl-rzg2l.c | 4 ++-- drivers/pinctrl/renesas/pinctrl-rzv2m.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/pinctrl/renesas/gpio.c b/drivers/pinctrl/renesas/gpio.c index 5758daf94fe2..e7771a57e6d1 100644 --- a/drivers/pinctrl/renesas/gpio.c +++ b/drivers/pinctrl/renesas/gpio.c @@ -135,12 +135,12 @@ static int gpio_pin_request(struct gpio_chip *gc, unsigned offset) if (idx < 0 || pfc->info->pins[idx].enum_id == 0) return -EINVAL; - return pinctrl_gpio_request(gc->base + offset); + return pinctrl_gpio_request_new(gc, offset); } static void gpio_pin_free(struct gpio_chip *gc, unsigned offset) { - return pinctrl_gpio_free(gc->base + offset); + return pinctrl_gpio_free_new(gc, offset); } static void gpio_pin_set_value(struct sh_pfc_chip *chip, unsigned offset, @@ -164,7 +164,7 @@ static void gpio_pin_set_value(struct sh_pfc_chip *chip, unsigned offset, static int gpio_pin_direction_input(struct gpio_chip *gc, unsigned offset) { - return pinctrl_gpio_direction_input(gc->base + offset); + return pinctrl_gpio_direction_input_new(gc, offset); } static int gpio_pin_direction_output(struct gpio_chip *gc, unsigned offset, @@ -172,7 +172,7 @@ static int gpio_pin_direction_output(struct gpio_chip *gc, unsigned offset, { gpio_pin_set_value(gpiochip_get_data(gc), offset, value); - return pinctrl_gpio_direction_output(gc->base + offset); + return pinctrl_gpio_direction_output_new(gc, offset); } static int gpio_pin_get(struct gpio_chip *gc, unsigned offset) diff --git a/drivers/pinctrl/renesas/pinctrl-rzg2l.c b/drivers/pinctrl/renesas/pinctrl-rzg2l.c index 03b36c6b2b6d..b9195fff0abd 100644 --- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c +++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c @@ -801,7 +801,7 @@ static int rzg2l_gpio_request(struct gpio_chip *chip, unsigned int offset) u8 reg8; int ret; - ret = pinctrl_gpio_request(chip->base + offset); + ret = pinctrl_gpio_request_new(chip, offset); if (ret) return ret; @@ -920,7 +920,7 @@ static void rzg2l_gpio_free(struct gpio_chip *chip, unsigned int offset) { unsigned int virq; - pinctrl_gpio_free(chip->base + offset); + pinctrl_gpio_free_new(chip, offset); virq = irq_find_mapping(chip->irq.domain, offset); if (virq) diff --git a/drivers/pinctrl/renesas/pinctrl-rzv2m.c b/drivers/pinctrl/renesas/pinctrl-rzv2m.c index 52aeafaba4b6..3d29c77a5aad 100644 --- a/drivers/pinctrl/renesas/pinctrl-rzv2m.c +++ b/drivers/pinctrl/renesas/pinctrl-rzv2m.c @@ -754,7 +754,7 @@ static int rzv2m_gpio_request(struct gpio_chip *chip, unsigned int offset) u8 bit = RZV2M_PIN_ID_TO_PIN(offset); int ret; - ret = pinctrl_gpio_request(chip->base + offset); + ret = pinctrl_gpio_request_new(chip, offset); if (ret) return ret; @@ -832,7 +832,7 @@ static int rzv2m_gpio_get(struct gpio_chip *chip, unsigned int offset) static void rzv2m_gpio_free(struct gpio_chip *chip, unsigned int offset) { - pinctrl_gpio_free(chip->base + offset); + pinctrl_gpio_free_new(chip, offset); /* * Set the GPIO as an input to ensure that the next GPIO request won't From patchwork Tue Oct 3 14:50:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147925 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139201vqb; Tue, 3 Oct 2023 07:52:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFkvl6kkDFltGAsgD4jlIh6nGNpOYBMSEgQJhs22gdpuDp76JHwd6INSfL85qrqyko5fwHb X-Received: by 2002:a17:902:da84:b0:1c4:4a4d:cc6 with SMTP id j4-20020a170902da8400b001c44a4d0cc6mr3993405plx.19.1696344727726; Tue, 03 Oct 2023 07:52:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344727; cv=none; d=google.com; s=arc-20160816; b=CU8IbNkLrqIqpkHPe9nGJi6QdpAyrbf8qsv/rg4WYpeWyfMIcgH6HfabIgaYBguw0S OxH3CqMKY9pcEdDSFhisteOzwVZqkYmIHHx84+BpvOUlil3hLA8dT/wAatR55NBhW0CF BS/Iae6XZDrpqcdyl2ro8XWqM9ZoqaAKbiEcuAlKkzHFVNaENBjXfAykjclh49tlY1kV TtFt0kmSZxlbuY4mPWmbiL81end8Y6bRRPWop7RewrvNLZFrvg0tyiWOQGuWIR6nc4P9 eDUjwnvQHnd1QxgMvXzGAFDd3P1DWelGhKAliZ637lZyClfhp1PlvG9ZVM5COh4ALYFY xedA== 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=6CbdpxA2yoiqOdTkvvgzFYeQ0S/2apw7f0m7nJ4Vrkk=; fh=YmvzHhIXDfwYk269uUzLkaN58YhGmEFKPFTj1Jgu3S4=; b=0WOCaZKSxpFXe7Y9dRQXyv2ML5ymyF3xuyklKOtvmXKO+EEHI69960swE5hxjKwri4 5Ll/BZBekrrWUNyQiKpRwkkbov93cwd3Hy1H1qFDC+/JAWMC8/t+Eam+lMcvzfwUA9wN IJy7jKKIegvfsVGW8C8o7Qm/kKkuTJeCQMHE79WDj4prmaOmY3wijm8WidtKwVFxTJj7 JRSZJBMAqmZ/uvHuiBg2ZXg4eUOK6vNzUyqixxE/VRTA4hRDtRhmbCYsyXwQIcJiw7ZU IW0/kVn01Eigma/Ix8u5/4q7UJT1yLtalHTwRhaDBg3wrSs3suk1JwcxoUQzaM6QlNY3 LsKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=kHRvkPtq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id h11-20020a170902f54b00b001c3fcfb8000si1628497plf.506.2023.10.03.07.52.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=kHRvkPtq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id ED38782A855E; Tue, 3 Oct 2023 07:52:06 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240304AbjJCOwF (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240234AbjJCOvj (ORCPT ); Tue, 3 Oct 2023 10:51:39 -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 380ACF4 for ; Tue, 3 Oct 2023 07:51:36 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4064876e8b8so10427285e9.0 for ; Tue, 03 Oct 2023 07:51:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344694; x=1696949494; 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=6CbdpxA2yoiqOdTkvvgzFYeQ0S/2apw7f0m7nJ4Vrkk=; b=kHRvkPtq0x0OfpiSyujJgmard4wpaZEzlnRnJX6LBQnPNK/M908lVD6g3FgJQQ3Sh/ +f9Nn5Jgb8ZQjr0TUo2s7Zewp8EwYRvPO2DU2h0t/hYMBPfdJp9jMvinju49CIoe9zpz S4QVOOyQ2TIjMf7u9csgNyyRgyhR85A5trg7tJVaSK6kNr4Aie9qVt+B2KX+j9GueGgd tKjY1fNSGmVjCBn02NsRbsT0cTrapiDYUsp0ob6wD5l3ki2GuUxa2X/Z+JrWhIGXQH8j AkN8vJHzSOEi8GXhpZdOYGPs1BHSkJEbVoiO7pHX/bt9h4KpGGmhCaqf2tYRmT0OZiWm Vqgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344694; x=1696949494; 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=6CbdpxA2yoiqOdTkvvgzFYeQ0S/2apw7f0m7nJ4Vrkk=; b=GvNsgsrKLqWa0D3+EHSijLVdquwLxAbO8RyJ9vyvBjK/7MMII7EfCzEMUig7+tAjq8 7ptoHK9GOAcKchlF7IKPusaEq3AiAQtNKEBzLxCujZ9RSwlwQOyBMbA73k1vdkqzNpdm +/8tOjvcKFJ7AhiW+R3lv3D8nMvd/38QQCxD3/hjc8IIo7bJKHoabFeasv68xjC9U6Dr WvIxmtmDWTnd0AM9uzTTivoU/zod+1N51g3h92rbqWwmAvy21sglkYOGEAnpenBJ1cRF bxzF6SeTdyykSf+6egVg6kZFfD9uYfDykyMX+ZEcUKYRUNKv7aLUa46z93oHoJoosMZc /KOg== X-Gm-Message-State: AOJu0YzhrQafTaKiMrpj2aSsXqEyih4Zn2auBo+kspvwFeSUfjAyjihi Ne6tofeYUf3Ko8N51o3UnEi3XkLo8NJqiEl9zT0= X-Received: by 2002:a05:600c:1c1a:b0:406:53c0:3c71 with SMTP id j26-20020a05600c1c1a00b0040653c03c71mr12369767wms.37.1696344694718; Tue, 03 Oct 2023 07:51:34 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:34 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Ray Jui , Scott Branden , Broadcom internal kernel review list Subject: [PATCH 15/36] pinctrl: bcm: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:53 +0200 Message-Id: <20231003145114.21637-16-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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=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: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 03 Oct 2023 07:52:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746369320320995 X-GMAIL-MSGID: 1778746369320320995 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c index bc7bb9876e57..fb98c3e14743 100644 --- a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c +++ b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c @@ -330,24 +330,22 @@ static const struct irq_chip iproc_gpio_irq_chip = { static int iproc_gpio_request(struct gpio_chip *gc, unsigned offset) { struct iproc_gpio *chip = gpiochip_get_data(gc); - unsigned gpio = gc->base + offset; /* not all Iproc GPIO pins can be muxed individually */ if (!chip->pinmux_is_supported) return 0; - return pinctrl_gpio_request(gpio); + return pinctrl_gpio_request_new(gc, offset); } static void iproc_gpio_free(struct gpio_chip *gc, unsigned offset) { struct iproc_gpio *chip = gpiochip_get_data(gc); - unsigned gpio = gc->base + offset; if (!chip->pinmux_is_supported) return; - pinctrl_gpio_free(gpio); + pinctrl_gpio_free_new(gc, offset); } static int iproc_gpio_direction_input(struct gpio_chip *gc, unsigned gpio) From patchwork Tue Oct 3 14:50:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147935 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139600vqb; Tue, 3 Oct 2023 07:52:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHofHCcV/spOp61q/ewGCKfCk/3zTKGprHzLdt2pts09cBvXAxhcGklKV1rTgZEeqlTzUxr X-Received: by 2002:a17:902:b286:b0:1c6:1c80:5663 with SMTP id u6-20020a170902b28600b001c61c805663mr11649900plr.41.1696344771862; Tue, 03 Oct 2023 07:52:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344771; cv=none; d=google.com; s=arc-20160816; b=gpKvIDW7wCeFZN2L0ooM+nYPe8vnt9CojTzG9YmakfzvzuCT6c6OVh+K8aadPO4DVd mYREjC+aWGJJ5pEM7fjqYg9yTauWZ7ekFALa78LfQJxdv9B4u7VTLBzs+8eHkQkv9V1K 5IWCXpOa3ziBncoIfO7BEGEkqeO8g25m0nmtu2Hz1O6Jl9keBw8w+CVmQoU3RL8l/y1h elw6RJcsxSjX8pDS7S+98HpU9e0mVtIwtzBEO//jGLRMrZV2HYnNAsVSJQsZtdgent7j jQ4PuJY1SYZtmCnC+82LYD/4TEKlB0y5F5lBgD9eXM2dBSD0+bhAJsAkoRtS6QFABB9T p6aQ== 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=wPwuEwfRZF39P0qe4RqCU1p549Ra/xLyaMOsvkr04jY=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=I6MYpsdgwVXG/Myo8XmClYq21Fo4RlfXSWJWUpFhuiUYDgHYjNjGCOT2DQLHKY2woy hVutpLFvxobY5bzF6Uc5nK5EIDTUeQZj+GYk5UFXahbSf/ZiMTr8GuMbtGnfIczSCpSz GBzPr55tr2NsjcSbbPbQCxmsysYnN7HeMB8iX6MwnOA/Ry+VZ9xZYDe3et/MVYY9MS2Z ODI6Se56C+7bTrB3eMErD31ReAf1kHLZoOGciPueF2VgtH9pSkaZf7TPo3BanCb6LH0m q16kuTLYSrHASKKdi5vt7d8Zw5Z/bueyf4bNLuHx9/C0HGOFkO7NMQqEtaPjrK2CVSV0 Yoow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b="V/EcYzL+"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id y22-20020a17090264d600b001c611f28597si1533664pli.539.2023.10.03.07.52.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b="V/EcYzL+"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 389268114D32; Tue, 3 Oct 2023 07:52:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240297AbjJCOwH (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240220AbjJCOvk (ORCPT ); Tue, 3 Oct 2023 10:51:40 -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 291DBB7 for ; Tue, 3 Oct 2023 07:51:37 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4066241289bso9990785e9.0 for ; Tue, 03 Oct 2023 07:51:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344695; x=1696949495; 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=wPwuEwfRZF39P0qe4RqCU1p549Ra/xLyaMOsvkr04jY=; b=V/EcYzL+rKM43RBUqb7swBdGPGTgyzXMD/J1+c1+I+J5xHtyATZjR4vQV6MZa/VQdF Wet1XPrrY6d1oM/2711jZ4BCGpkqOMO6TpgYMjLCrmoMek0ETsMKBKfSZDFfT7kDOYTP diCuU7v9eoPWK4yt7tFxn1uXHvJhYqw/9zuCtLPZgBF/+5OhIm8sbM04377GS9YmVRgt uA+I+i85zthkBnqlI24MwfXgBal09soA37PHAOBAlspbyuSuctIulLe+VA2G5RgXuO6M LV/JDw/qXdW6f/tXei1oeFpLssH7PGXHYRnd3M0stHItcaRyu0xqIfhboExqLKfBEw4v Bz1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344695; x=1696949495; 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=wPwuEwfRZF39P0qe4RqCU1p549Ra/xLyaMOsvkr04jY=; b=DZk0by+GXwpyNZBb3036fXxO0wVKjhqKXUYWUNNy7NjA655Lg2UeP6YYx0aIaa9cpS ujSCw8y8hq4NWZsWbotVGCTciDY84tELjlSmqQDEo/1rs5/5HhKfniGzJe6Wu17HJ/X8 ocOpJVOazwaiC9k5EOaxIcE+xZvGrPFLB4NSWDs8AJ/R8Thl4QRLp9uAswumVMKlYaqY xCQpdzJ2HvxD/kgPWGLLEBuR0qIPSnPzmVOwyTCDx+i8wGVDWY1BH+9JTNJL/9CigEQl FQ0v2nq0PNtVPZKVrFjH0xxPyQS0enR4MDdU3OsSYfgYa770vCE+d0HhxAuu1kR/EsX0 1YBQ== X-Gm-Message-State: AOJu0Yw2MWdpstCHvoKWpcMXYIXIbfS1m3WZ3o4IN4ffH6aIMRcvfC0S KoyIF/Ac9w0xKxTVK1rnrzxoDQ== X-Received: by 2002:a1c:7917:0:b0:404:7480:d821 with SMTP id l23-20020a1c7917000000b004047480d821mr12880689wme.37.1696344695594; Tue, 03 Oct 2023 07:51:35 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:35 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 16/36] pinctrl: stm32: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:54 +0200 Message-Id: <20231003145114.21637-17-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Tue, 03 Oct 2023 07:52:42 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746415622202009 X-GMAIL-MSGID: 1778746415622202009 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/stm32/pinctrl-stm32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c index a73385a431de..11d9f07934bd 100644 --- a/drivers/pinctrl/stm32/pinctrl-stm32.c +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c @@ -217,12 +217,12 @@ static int stm32_gpio_request(struct gpio_chip *chip, unsigned offset) return -EINVAL; } - return pinctrl_gpio_request(chip->base + offset); + return pinctrl_gpio_request_new(chip, offset); } static void stm32_gpio_free(struct gpio_chip *chip, unsigned offset) { - pinctrl_gpio_free(chip->base + offset); + pinctrl_gpio_free_new(chip, offset); } static int stm32_gpio_get(struct gpio_chip *chip, unsigned offset) @@ -241,7 +241,7 @@ static void stm32_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static int stm32_gpio_direction_input(struct gpio_chip *chip, unsigned offset) { - return pinctrl_gpio_direction_input(chip->base + offset); + return pinctrl_gpio_direction_input_new(chip, offset); } static int stm32_gpio_direction_output(struct gpio_chip *chip, @@ -250,7 +250,7 @@ static int stm32_gpio_direction_output(struct gpio_chip *chip, struct stm32_gpio_bank *bank = gpiochip_get_data(chip); __stm32_gpio_set(bank, offset, value); - pinctrl_gpio_direction_output(chip->base + offset); + pinctrl_gpio_direction_output_new(chip, offset); return 0; } From patchwork Tue Oct 3 14:50:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147928 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139407vqb; Tue, 3 Oct 2023 07:52:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGqrB7dcwrApaFKkgjcVq2ijeaTsKtU1srWSWPCTDYNhXWBLRluajCPVK7Fn2sL1vmvcUl3 X-Received: by 2002:a92:c26c:0:b0:34b:aef9:60d4 with SMTP id h12-20020a92c26c000000b0034baef960d4mr20200831ild.27.1696344751377; Tue, 03 Oct 2023 07:52:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344751; cv=none; d=google.com; s=arc-20160816; b=xNbFiSFdnoCUAzQkHny5mLZEYR5XwJW7KtZ6XG02/zzDFrnqARl950EiECy2SHZMnC uGjZKrtLzRqcDzxzITsUk57ItpQ94mu5Wl8QZhZ0gfZP0tfQ9gCRVqjG9pzAXkvg2j+q XWnL7sX9bjzW29MSBP+ll+fEjkhydtI5Bvlz33W/MEFx7vRZ439bLQPZ88D5Ursy1136 rJlrY9dn2ykpiXQ8DI0zenWPCfkK14nbs0Kmax1jh1sQHC+mbR8X++FXXCl0snDhpISP RY/wCNyOHbtwCPLUOh/1NOebqQq+5/IJf0kBqU3+PN22GiRLFMjZ6j9kXrVn8n0Pwf61 LOKQ== 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=bqqnOvKvXDp4MSe7jhplDhHv0MUiBDnh5IiTR46rq2A=; fh=Cv56jv0QsvPqc1S7qjg1JFr3fdMzdBPeJ9f/320Rwa4=; b=sXI29nJX8Rib+PaLyOSvHFMWe/yusVXEzdPgRv2FIpQBvFeuDPlp2EXYUjDKUnllYm 6/Z5neg2Pth+MQ15UNi9zlyccbB8MPkKXWCs8YbYmRlXkv49T1e/HGf6OAJpotjhZcgZ j1/yHfLm/s+7aXNA4pZePWscr8MKXG4aLwc3bh0uOn1864+BTI1UEwY0ogfr0mNaLPtS Rr7Khod7IhV09cMH9ZsEu9if7IGA02oWPl9WAv7/WnQ9mVRQ48uvMQK+hSaz/g9C17N8 ZBsSPjyQCd6qTtcig10WkIPCoS88QZZyVL/MhKlXPDU606TTSpDQ7lvjADfdr/XgUFlw l2JA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=Gzf7Men2; 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 bs65-20020a632844000000b005653316de6fsi1532181pgb.271.2023.10.03.07.52.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:31 -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=Gzf7Men2; 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 B4DC6819DFE1; Tue, 3 Oct 2023 07:52:30 -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 S240256AbjJCOwU (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240249AbjJCOvl (ORCPT ); Tue, 3 Oct 2023 10:51:41 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53B76DC for ; Tue, 3 Oct 2023 07:51:38 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4066692ad35so9894685e9.1 for ; Tue, 03 Oct 2023 07:51:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344696; x=1696949496; 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=bqqnOvKvXDp4MSe7jhplDhHv0MUiBDnh5IiTR46rq2A=; b=Gzf7Men2nVKsOP/fL2iY9puZLSOcLSbXPI4mAvN0FKKv6LCZ6hpvWigNyl/EWUlRaA H60VzpHjdHzM454nISGVY7mCPAOTN/4TJHwUZv5yLn0dukS9CxFopHjqGJJzD3v2GbO9 ijUb23BeMuAk8RIiw+SbhqqJpuF8gWntazBJ0iHkj14bwr49eD3nNtHZN3pLMPukB8Ai 9fqWdefRdLvJqJRtAXz8OOnyLGlxtEB3/0wdWAUAMbDaXxFHV0M45K7qnXymHom7y7DX 7OO1M9BMeLIPDZN7Dpcb5tREHneTPS1Z212P/+snNHHBqJ/QN+Go5GDlhHRr6OkVVwo6 YdOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344696; x=1696949496; 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=bqqnOvKvXDp4MSe7jhplDhHv0MUiBDnh5IiTR46rq2A=; b=scDGOrlqzFanqFSIFrLe7Iq2vQ7aSOjo3mbaluflJ2giwHMNbT8RDCGgxUPJzp84Rz yS7Z2u1SFQHsgZdWCxHdB/rrah8qZGTZZzMFZS8uxfnbZ0a1R0bOrRwQGwqvKNGHIS0u Zl9p3i5PYpIvtvu7KsU5yT62c5ntABatbOVBsXtooC2win9cBVEgop+7k1vjRQhkNxNP 8/olFi1RQzKvsBQMhabJgfoy/kYDY55BhoImHdFE26++4quG9YjVI7fVsiZyYRtWbfBq Mg0jTebQU1QE1U9kzbw0oXGHLpRd/KGWgn/Y8jRiz5xzmlUdvlNORVpYYp9RYy23gj0a 5HNA== X-Gm-Message-State: AOJu0Yx07BpABEUIcQHz9IcrzlfvBZQN2XNjYrol9sXxcXzbKucUrNJM z+OhGxZc8JBybfk5WPjq/3UpZQ== X-Received: by 2002:a05:600c:2303:b0:405:dbe2:df10 with SMTP id 3-20020a05600c230300b00405dbe2df10mr12537741wmo.35.1696344696539; Tue, 03 Oct 2023 07:51:36 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:36 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Viresh Kumar , Shiraz Hashim , soc@kernel.org Subject: [PATCH 17/36] pinctrl: spear: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:55 +0200 Message-Id: <20231003145114.21637-18-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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=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: 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]); Tue, 03 Oct 2023 07:52:30 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746393786585342 X-GMAIL-MSGID: 1778746393786585342 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski Acked-by: Viresh Kumar --- drivers/pinctrl/spear/pinctrl-plgpio.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/pinctrl/spear/pinctrl-plgpio.c b/drivers/pinctrl/spear/pinctrl-plgpio.c index 722681e0b89b..7488f6394318 100644 --- a/drivers/pinctrl/spear/pinctrl-plgpio.c +++ b/drivers/pinctrl/spear/pinctrl-plgpio.c @@ -204,14 +204,13 @@ static void plgpio_set_value(struct gpio_chip *chip, unsigned offset, int value) static int plgpio_request(struct gpio_chip *chip, unsigned offset) { struct plgpio *plgpio = gpiochip_get_data(chip); - int gpio = chip->base + offset; unsigned long flags; int ret = 0; if (offset >= chip->ngpio) return -EINVAL; - ret = pinctrl_gpio_request(gpio); + ret = pinctrl_gpio_request_new(chip, offset); if (ret) return ret; @@ -249,14 +248,13 @@ static int plgpio_request(struct gpio_chip *chip, unsigned offset) if (!IS_ERR(plgpio->clk)) clk_disable(plgpio->clk); err0: - pinctrl_gpio_free(gpio); + pinctrl_gpio_free_new(chip, offset); return ret; } static void plgpio_free(struct gpio_chip *chip, unsigned offset) { struct plgpio *plgpio = gpiochip_get_data(chip); - int gpio = chip->base + offset; unsigned long flags; if (offset >= chip->ngpio) @@ -280,7 +278,7 @@ static void plgpio_free(struct gpio_chip *chip, unsigned offset) if (!IS_ERR(plgpio->clk)) clk_disable(plgpio->clk); - pinctrl_gpio_free(gpio); + pinctrl_gpio_free_new(chip, offset); } /* PLGPIO IRQ */ From patchwork Tue Oct 3 14:50:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147929 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139416vqb; Tue, 3 Oct 2023 07:52:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGWDVti13qA4DAS1+XWbd5E747HB86MDmmp7d1s2xfbxclWIfngEfINiozUHBlyqf+t+Fjg X-Received: by 2002:a05:6358:93a3:b0:139:5a46:ea7e with SMTP id h35-20020a05635893a300b001395a46ea7emr16567078rwb.28.1696344752551; Tue, 03 Oct 2023 07:52:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344752; cv=none; d=google.com; s=arc-20160816; b=TN69Qf/yxF9W50sR2xHSEIn6xlwIz3YYDtQhtKIWue+h/MMbx9OLeGr0rfdxj2wCIn aNEB0XcIVWxBfj1vDUv8nm58XIU81OEubHlYBfxkknUgI/WcrYR7r4zehj0NPwMANlbm YXpxs9adSas5ViHha6HO5OX9/Zenp+ac3/ZFuH7P9kYuMUZDPsJeoZLU62MYrP5qGkJJ +0T6sswt0WMTR0AYdw0xdkwSgGsVo2lDXbyov3ouKyVVd9MMrKU7HHSWFyw7hayCY150 or2bvLCzoyFrbNH4MrdxtmaeyVgmSjuF7rGjf2vi9fNF2asUakwJgSTT4sEZL6GG65IR Eubg== 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=FGIsRy8XjuOZvKHt9t36YQP6zzvIBqko3/T4/ujae7w=; fh=x1DgyNXKEfjYkXqXXPufQFwofrVBzO35FZ3LY3zi2o8=; b=LFxcW9WaMmDZBUet6i+83Dw2g0TtyC3S4oicYUsr9sAL0scbcd1zXyMqaCEgSbmkU7 KXWxJP9p5XuaBTJ5VZUogrooU4C5iHFu6wJMZV2USLN5npKp7tC3+2NwuyQL/6l3gRek 9BvnlYvJ9LMxUvP3Ml6IpCPLOmfWxPMxmAsSPnrJ4I2yGp+TR5kzvyOHSM35QyvK0xTe ZTUjF5JgK1M8TB81LsehrxeEdqj76k5S2OcNpQsc8kafA3Km85W+gSFeN2ONMG0W4Kxu Qyl8FhTbiBTLaCEdIUe55uiqtombGBQ58jVI1v4DSS1YKAmOfjkmQwnK1AtpU0Kz4vmI 8YSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b="PU/F6s6j"; 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 a21-20020a63e855000000b005740ab95917si1555493pgk.45.2023.10.03.07.52.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:32 -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="PU/F6s6j"; 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 B4D68819DFDD; Tue, 3 Oct 2023 07:52:31 -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 S240363AbjJCOwW (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240253AbjJCOvm (ORCPT ); Tue, 3 Oct 2023 10:51:42 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15E1DF1 for ; Tue, 3 Oct 2023 07:51:38 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4060b623e64so6338675e9.0 for ; Tue, 03 Oct 2023 07:51:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344697; x=1696949497; 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=FGIsRy8XjuOZvKHt9t36YQP6zzvIBqko3/T4/ujae7w=; b=PU/F6s6j7k/zkzXy9y/UonWjmhRyUiVXR3TtUxs3as+kEAiHKrF7zqFhIt58KeIDBK OLuvrHUN2hTyute2gRo9+ZcKBStowLJ7yuCz4pJiPip+hnued0xzP8h/ihbM4yeo62KP 4XWhaIvvIk/rCrKE3mL/srp8CObJ86M4AoYTEdPo7FD+pRdbnHXbbc3I2KnY630hriNX CHCpYMumrecTsDx0bBxDJ+QNt8Wi8+7C3t/lfcGJbL/bIRFV9Jl+i+4tA/ODF3avbOaF co4Bdkt1WUmplaI2r+NbrM1tsPd+Tf5Aq9i0tZ5vGrqchwR9QJWlxEZstgEQ5pXYnvsU jQ/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344697; x=1696949497; 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=FGIsRy8XjuOZvKHt9t36YQP6zzvIBqko3/T4/ujae7w=; b=OyhbGhvgXnX3CzP+u/IjeJS47+zdxCOzHke5BRHpztq+dsbaSMD01yywisH30BS9/r LAfLMNAl1Zae30Ckx38OaF6VfgdjLVzNsQMR+YRz9FUcbVEMC/D/m4xbdJm5kxlOWGTI 5mRqKid2tXUNKjnSlt/gTKAnZGennQWnonPdnvcy4IJTxcB7SrOtpJJFVaP/kTKGGgry Ms2oIzgW8ZwtQXxr+pakD/1+snN5GTF8+WIqMbFYqFbhROwCDG88f8QDicdE+YZk3QxH Zf7EmVan5gt8AC8w3oEFprtd45tuj2m1EF1trnVARJcC+rQSk7tFYQMQftXD0pN2Fl00 9rag== X-Gm-Message-State: AOJu0YzEzshTl0bVGhE6XC76n9ZTXvltpQhh9XL4GiKiGLhxfdrce15R oscMzfgGj9hEMhwiI6cfc6g8wHWwxOcyEhtsb1I= X-Received: by 2002:a05:600c:4f4b:b0:403:aced:f7f4 with SMTP id m11-20020a05600c4f4b00b00403acedf7f4mr2371018wmq.12.1696344697353; Tue, 03 Oct 2023 07:51:37 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:37 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Emil Renner Berthing , Jianlong Huang , Hal Feng Subject: [PATCH 18/36] pinctrl: starfive: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:56 +0200 Message-Id: <20231003145114.21637-19-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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]); Tue, 03 Oct 2023 07:52:31 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746394955977032 X-GMAIL-MSGID: 1778746394955977032 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 4 ++-- drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c index 530fe340a9a1..22a2db8fa315 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c @@ -918,12 +918,12 @@ static struct pinctrl_desc starfive_desc = { static int starfive_gpio_request(struct gpio_chip *gc, unsigned int gpio) { - return pinctrl_gpio_request(gc->base + gpio); + return pinctrl_gpio_request_new(gc, gpio); } static void starfive_gpio_free(struct gpio_chip *gc, unsigned int gpio) { - pinctrl_gpio_free(gc->base + gpio); + pinctrl_gpio_free_new(gc, gpio); } static int starfive_gpio_get_direction(struct gpio_chip *gc, unsigned int gpio) diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c index 640f827a9b2c..5557ef3fbeb2 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c @@ -547,12 +547,12 @@ static const struct pinconf_ops jh7110_pinconf_ops = { static int jh7110_gpio_request(struct gpio_chip *gc, unsigned int gpio) { - return pinctrl_gpio_request(gc->base + gpio); + return pinctrl_gpio_request_new(gc, gpio); } static void jh7110_gpio_free(struct gpio_chip *gc, unsigned int gpio) { - pinctrl_gpio_free(gc->base + gpio); + pinctrl_gpio_free_new(gc, gpio); } static int jh7110_gpio_get_direction(struct gpio_chip *gc, From patchwork Tue Oct 3 14:50:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147940 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139768vqb; Tue, 3 Oct 2023 07:53:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGKoGjRlHUU5cbc8n6SKBCifSzmimfu70zv7oKg/3FDa6MMD1xLbo12YG/FcBkpqHEiAQ4u X-Received: by 2002:a17:902:efc4:b0:1c3:2fc8:1305 with SMTP id ja4-20020a170902efc400b001c32fc81305mr12394529plb.47.1696344792917; Tue, 03 Oct 2023 07:53:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344792; cv=none; d=google.com; s=arc-20160816; b=tbMEqvK/DX/2+xKq2kMEpVPnrdx/9quVYFKAGmGEu5w3dlow6cekDXTN0DbMCpaQl/ TCq0mTkZlFAN1PcTI9UvpvEdL1epxZtrEO6omlplsM/Mzc397bC1+EyIil/WYoc7G/Ky wXvMh9fw5pNwUNgwOODcVmVWA7ZR269/i194AGgoSOXIw8XDavJcBR4ozHlc2kCWhyMV 1zqIT9RlHTMFAgfQTGC+QuiZJnTyX99tlGggghVA+yaVIlUxADxs3G3e6unTtprBxvCX ri7BVWVFCeeLse1qUnuB1KjU1wFaJ9v/WzvJkrT04Mm17d1eTzyzLtqj3NXGBFLxPLh3 3N0Q== 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=b0sgIJXyiWCMH9BTQoi/ajBzkcQtsuv8BX1pVGl7zGQ=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=SmuByYDQkxz69QsczI+Y4jZS/AemjWAZPwCZrjLFouF3PUw+x9AMDpiXnvtgkUZ9ZV eVRLwCHM5BK3iiAAuFNJOsD+sKfY/5waDWw/adnqcWK91xVO5gg5CJ0nqVhVUzE2Osug Bg0MuPVu9rys1wMsJPifBRvrb+nx1V7W4qSUr3trlP1zXgcEjoGsoyWFmv3VghO/knYu JYJCoNU8G+fYSo2N8LR3lgv1ShLm0UDDoei7rwET5a2CQWwk5RiHeGc6XqTGv9eRuY9D oN5w2O3xAYz1EvRd8oB3KdsZkk5r/JxBeS/gR58WFkh1k4qq73niLze7dYKfEAgV62Z/ 30Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=JQ1k9wAQ; 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 Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id l9-20020a170903244900b001bbac6722e6si1714877pls.371.2023.10.03.07.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:53:12 -0700 (PDT) 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=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=JQ1k9wAQ; 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 Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id D16F1815CD95; Tue, 3 Oct 2023 07:53:02 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240370AbjJCOwa (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240233AbjJCOvv (ORCPT ); Tue, 3 Oct 2023 10:51:51 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8966B8 for ; Tue, 3 Oct 2023 07:51:39 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4065f29e933so10253645e9.1 for ; Tue, 03 Oct 2023 07:51:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344698; x=1696949498; 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=b0sgIJXyiWCMH9BTQoi/ajBzkcQtsuv8BX1pVGl7zGQ=; b=JQ1k9wAQO7mBqgEKT4QPSKJk1w7wJmc4zZavBuJbU+SOVc9hVrhCP4Gi1XPyEimxhg JVqrDIZ6TPU1Pvz9krzDno/LZTRrIBPj5WexLmR37SxdKi4DiRytg36dHWl2MBwzpn55 VEq7vROwlAcyX8SudEFAhOq1Aapx6ZWlvkskIBRw4PqhM4nv1ZugFNUIbbwJJoBCxmUz UqusJWrWrCvpsEvSLwa4+L2Hyuvqtg3P1fpUJYNOmHWLyv+iHdMV77zj53WI4JzFcVb7 I9MV+qzrKCRX1ZLMFLUGnPApHTLBi8vhMJCVD7OZ6wGX5Y6wrKenIEzB92+lE8oLmb3s R2/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344698; x=1696949498; 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=b0sgIJXyiWCMH9BTQoi/ajBzkcQtsuv8BX1pVGl7zGQ=; b=Xy81PECpt4i6WoOpE3UY92NSWDfXMmdQTy2pP2m5eZWxpcqeB12hD3+nVWGqyOoLRO JS4oNVj2w2HP15dyK3OEUwMbagXEeZoqYfdkarx8hoij9kfigHOvF4s/7319BDV74eMH RIsaejIb8ch/I8oubG3H09W2Wb4D6NBCThuZhDeTOamt/n4LQTfUd7dkTYbVOpJqXmvc 0YjFOFJeVqVcmL476kXPaMijIqjH2hxbQmNnu+W6F2niowXIooqFy7NLwF5UWh6+kJs0 4w4YBsuL5JhgA9/q9dn7BYbE580byX40nqytAlt00bVPc/V2pU/znHcjH/q9qUwVfNsE vmng== X-Gm-Message-State: AOJu0YwDZGZyd0gdspZJ79MySf7PEYO2moh1ymi0xa1CvbrvJak5oksr 7YwL6Ak16U0ZN0C1ix8qseMrRw== X-Received: by 2002:a05:600c:252:b0:403:b64:ad0a with SMTP id 18-20020a05600c025200b004030b64ad0amr12038698wmj.26.1696344698071; Tue, 03 Oct 2023 07:51:38 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:37 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 19/36] pinctrl: ocelot: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:57 +0200 Message-Id: <20231003145114.21637-20-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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]); Tue, 03 Oct 2023 07:53:02 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746437598058391 X-GMAIL-MSGID: 1778746437598058391 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/pinctrl-ocelot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c index f8ae2e974221..a6022d44ad6c 100644 --- a/drivers/pinctrl/pinctrl-ocelot.c +++ b/drivers/pinctrl/pinctrl-ocelot.c @@ -1779,7 +1779,7 @@ static int ocelot_gpio_get_direction(struct gpio_chip *chip, static int ocelot_gpio_direction_input(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_direction_input(chip->base + offset); + return pinctrl_gpio_direction_input_new(chip, offset); } static int ocelot_gpio_direction_output(struct gpio_chip *chip, @@ -1795,7 +1795,7 @@ static int ocelot_gpio_direction_output(struct gpio_chip *chip, regmap_write(info->map, REG(OCELOT_GPIO_OUT_CLR, info, offset), pin); - return pinctrl_gpio_direction_output(chip->base + offset); + return pinctrl_gpio_direction_output_new(chip, offset); } static const struct gpio_chip ocelot_gpiolib_chip = { From patchwork Tue Oct 3 14:50:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147930 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139432vqb; Tue, 3 Oct 2023 07:52:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEO4pBaawuPFmcRpRaVemvoUzHc76emvkpbIMXbUkn+APgLzaMUBWEZ+V1U4pwLsmtqPJpf X-Received: by 2002:a05:6a00:1707:b0:690:2ecd:a597 with SMTP id h7-20020a056a00170700b006902ecda597mr16083092pfc.21.1696344756205; Tue, 03 Oct 2023 07:52:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344756; cv=none; d=google.com; s=arc-20160816; b=kc9tg0oRopYgJ/+Gp+S0WnK0o6N/wkXElvdcYnNbxfQuirV/1D5t96dMBcH7CcJjLX 82Yl4wSr7jZrH5GN2Sa+vXRvSStfYeOEOKa/e878sWticsxYPLTq2SO11eVkVGsztrb8 XCjKGFK8M8phZptwTKQRPGOWTzXRWz1UYN9vCJJh0i0dpBX/xR9lZJI4dl7lYevQePo1 yG+aziyOSZSRRDNanoqG+H3fna+WhgGwphnfVnf93sn1DD4md5PThiABB3v4XQsmINlE Mxuv/v0emqJpJUAwuiyLE0wV69DhRuRnD+VayNlIVFUhA1xTi3MkJTwSLBlaAB5BFMYN 4mlg== 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=SgDYd9Rguhjm4qQEjlLUgCLw45ItMDY7i661tMI87TY=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=ltAhv8Qj2+2TqvhMvlgVGBpr4GsHYAsiz6u1lbhVKPLOW1miDqQ2wXM2TgkR24/7Zi FjejdoN/tr+HAGomfIUHl0JSW3ONcU0JrMHspT0fTYn0rzuI4/GpwBTQYjhd5MoOpdSy G0+6AiXz6CB+BHs7fXEaji1GcMHNaUjvpRGPVqCWL+etNCPBRkGWFAba/zBXKbP+E1di 9UP6S+0+H0Fjab2ox3+044T/2q7MzBuMRhG69kkQQqpNbTGGldwJ8nxrJ8l9pemJXNN7 DFE/a2g9zCDsh84zI7NK9QtVOFwKzHpt+RgbrRTLcaCli52nQ/+qMch1WF0gkpvlOF5y k5wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=n7D1Gr4c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id q132-20020a632a8a000000b00573f7d09445si1600522pgq.330.2023.10.03.07.52.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=n7D1Gr4c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 86DD2819DFE1; Tue, 3 Oct 2023 07:52:35 -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 S240318AbjJCOw2 (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240293AbjJCOwB (ORCPT ); Tue, 3 Oct 2023 10:52:01 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B514810B for ; Tue, 3 Oct 2023 07:51:40 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-406618d0992so10106185e9.0 for ; Tue, 03 Oct 2023 07:51:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344699; x=1696949499; 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=SgDYd9Rguhjm4qQEjlLUgCLw45ItMDY7i661tMI87TY=; b=n7D1Gr4cFJ0uVO+hGDVa8WtEuGmthdxvZq9P89jE3Bue5skG/lyHfDpoS/MSd4Z7Wu KVswtkj0kDPI6c0CXeJYlOcp3QHyKGGc1DIVORzmZy8+75wB8v5c4C8cS3mrE4G9CMJX 0JkxqKiceqhhBQeAc+KLf96XmOcer7/5MuS9pcW7VLOvaxED89q9IU1HJHFXEvZN42lz +XcRbNmPdYaFEqMT1TJ4bPhNyg1G24iK/VldPZ/lZzZZPrqS6awyUXohNy8NPvP5Ke7g vrSVywpuELMAg+s6wvfQ5Rr2wh0I9HvNU4Tdxs5ERy7Pjl9iIyDMDa9GVWVaJVifKRfI 0N3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344699; x=1696949499; 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=SgDYd9Rguhjm4qQEjlLUgCLw45ItMDY7i661tMI87TY=; b=m2xUA4snqQQaZ1ZWxdBJBvCr9aFprqIWUrUaAirqhVqTRaV981qEEHxjzxEZL4In7x GHp973gF3BXwSyEnvrdKrcl6lxGoMqdqUHbqnxTeDlcYd3aFNPNiXORwyUBaZrHzh0RR a69FPzJbJCOxQrd9tybtTFkZOaQeoquS8q6Riq3t2uaL5W5ctZXHs9l+YXJZCbii/094 jJF5eSqhUjzgQqqvQt4lK+pkK/ajvBsfL3kO3t5ePji3lBarU/XaXBXmhGR3pgoyC5pW D2KHuQdkJI1vbAFLnLX4KoiiRr4dPM+mLc5nHoJuIxoPtgEOE+IJKMBy4Uxu5Kh1Fsff RY2Q== X-Gm-Message-State: AOJu0YydM+/8R77LekJs1KiQPg9IxTKNl0HC/EASU4f/ODZk2x61KAtY D4Vw+8oaUt1gDM4pqmljzBzkrw== X-Received: by 2002:a1c:7905:0:b0:405:7b92:453e with SMTP id l5-20020a1c7905000000b004057b92453emr13180495wme.37.1696344698922; Tue, 03 Oct 2023 07:51:38 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:38 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 20/36] pinctrl: rk805: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:58 +0200 Message-Id: <20231003145114.21637-21-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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=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: 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]); Tue, 03 Oct 2023 07:52:35 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746398635266058 X-GMAIL-MSGID: 1778746398635266058 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/pinctrl-rk805.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/pinctrl-rk805.c b/drivers/pinctrl/pinctrl-rk805.c index 2639a9ee82cd..58e6dd932bc7 100644 --- a/drivers/pinctrl/pinctrl-rk805.c +++ b/drivers/pinctrl/pinctrl-rk805.c @@ -289,14 +289,14 @@ static void rk805_gpio_set(struct gpio_chip *chip, static int rk805_gpio_direction_input(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_direction_input(chip->base + offset); + return pinctrl_gpio_direction_input_new(chip, offset); } static int rk805_gpio_direction_output(struct gpio_chip *chip, unsigned int offset, int value) { rk805_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output(chip->base + offset); + return pinctrl_gpio_direction_output_new(chip, offset); } static int rk805_gpio_get_direction(struct gpio_chip *chip, unsigned int offset) From patchwork Tue Oct 3 14:50:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147948 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2140636vqb; Tue, 3 Oct 2023 07:54:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFx65y6DwFXDn2GAUuMJYETRvQ/zo9TN8Go/X+Oyg4w61gaB6EtF2BFIcyqFZ8WTn+alJx8 X-Received: by 2002:a05:6a20:914f:b0:159:c2d0:9fc6 with SMTP id x15-20020a056a20914f00b00159c2d09fc6mr16532713pzc.8.1696344889556; Tue, 03 Oct 2023 07:54:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344889; cv=none; d=google.com; s=arc-20160816; b=dkRQiWBMK7MJW4nFYC7gedTCIJrdt4q6dKalgR5LyUGw6jyGvfGiLPg9BZJi2nYra3 gsgi+8q6sVOa5ot40qoZ/XSNUosVj6T21R+jH7GF5JQi2qNEBeGqbGZuz7/6cgkSmxQ3 B/2Yv75AUkj8an4J3u78PQFT0bblp2vsXnaTr+F8eHd9uDDBMcUP08N/vZ2xmhCuFuC7 Cd2ewjdjWO6txu9b/K0Yjcy2Ek4iCqOtiX9ST75edlZ54Rn0cwUerW67jEGfbWoWMG0H 3rzgesdNW76/V7LSCtnNnOatXLTSBNAtZhk9CINTd1oui+TZl4hzbQTCQ1wV4Hxpu7du 8yJQ== 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=PbI1RQ5tA31jmForDpjaNDHFXNvHWaIh5Ez7RFreokA=; fh=6acDfXpu7mYjoyf/gH/7L5Jk3xRF5S/+S/xogwmbBEI=; b=OlRJ4cpqW6Ik4f43UUcadeCxPJghrULBW4xtN8vv7TZ+8E95JsyGqBfDmwFNhgyOUb pwcGRDphRmmSuch+SLVF/DNsIOx3VPrhoTbleVEO9Jrqn18efjybHsiZqLXNZhAH717N UtPncHGGvz6PA+aROlHLsRF57hY1t2X1RPDFJlRYuBwqDFs0O9ZE20zqMMvmPpdbfrRD 0NyoyvuhH6qWFI1iprzG5ueDoLNi+7p4i1CGFunUGbuBuIZ8lsSsEeHxaiciPiWJnH/Z 9tfIpAtVLwJZSxqVRc2gzF5S0Hno2/nTu0WwxbwkDdTiRpaTFugyejEPv26pgdP36IOI G/rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=oqv2IvZ4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id e7-20020a170902cf4700b001c1e1fe16cbsi1539066plg.255.2023.10.03.07.54.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:54:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=oqv2IvZ4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 6FA7F81142D4; Tue, 3 Oct 2023 07:54:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240263AbjJCOwZ (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240209AbjJCOwF (ORCPT ); Tue, 3 Oct 2023 10:52:05 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9430122 for ; Tue, 3 Oct 2023 07:51:41 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40566f8a093so9831055e9.3 for ; Tue, 03 Oct 2023 07:51:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344700; x=1696949500; 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=PbI1RQ5tA31jmForDpjaNDHFXNvHWaIh5Ez7RFreokA=; b=oqv2IvZ4CQ9vHBFzSk9S5dW8Oki2hOfCoANXrYJ8TZA5QHBj6AgHwR7bsfZNP+7uE0 aTzPAxASJTt7CiYVTdeJSu5j56KRZOZ7e3u2XqQ3VLO5ZifQt3n2DAPzmEJ5GEZGHsgZ 50Njv2IA/5JqEJ5yJHzVzebnLdA6+JRvTPjjCc+0449sh5c0rrVwZQ9GBIs0hguW58eJ ppEmajG11u/lJiCOZtuzxe/K9P5CsU0OGs6xGtk4X77+drlr7K2xXzH+BQo5eAudGutd dc0Yx7ZNqBg8q2HoOA3t8qiMocDlGHpi00sNTCfbD+NMn24HeqzGTkDCE+C+zCDeCvGt PFiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344700; x=1696949500; 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=PbI1RQ5tA31jmForDpjaNDHFXNvHWaIh5Ez7RFreokA=; b=S9yf3juDAJQ8X/EEzAp5/ZCoq+T2lxKZZlgha1CLsZxyyHa4VD26DrM9u6zUcTtZ5/ JEyKMkHDUMjXzOX/wNHL6AQfs6cuNoSpzU54bY5SwMJ3onKEIKktEj6tadTw474ozNl3 AUUJ5TV4KSUEZch8JnJrp4b+CS45dDhhdgxZkfTRto0C/M2Gn8gt6e6aYbPAhN6mCf7d /wUkeUGcXqmCyX0uIg694Y1pXo2Hk8pMqCrPK5kGyuSVB9b8V5hspge37gYMyBdNShUk 4i1lc8ckTYiFwRROjhCVeSM306WmwBJ6OYgSh0GAvmDwnmDNE/uuMgZd5DxCHSpQ1pZv nc7w== X-Gm-Message-State: AOJu0YwpT0bEkG2bvdv4zWfTaJMPuQDPzwinO68Cx9HifOTjDwH4my5i dbL3DNmAdoz7C86pNzaQZp4YfQ== X-Received: by 2002:a1c:f709:0:b0:3fe:1cac:37d5 with SMTP id v9-20020a1cf709000000b003fe1cac37d5mr13510551wmh.4.1696344699849; Tue, 03 Oct 2023 07:51:39 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:39 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , James Schulman , David Rhodes , Richard Fitzgerald , Charles Keepax , alsa-devel@alsa-project.org, patches@opensource.cirrus.com Subject: [PATCH 21/36] pinctrl: cirrus: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:50:59 +0200 Message-Id: <20231003145114.21637-22-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Tue, 03 Oct 2023 07:54:36 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746539087968766 X-GMAIL-MSGID: 1778746539087968766 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski Acked-by: Charles Keepax --- drivers/pinctrl/cirrus/pinctrl-cs42l43.c | 4 ++-- drivers/pinctrl/cirrus/pinctrl-lochnagar.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/cirrus/pinctrl-cs42l43.c b/drivers/pinctrl/cirrus/pinctrl-cs42l43.c index c09646318419..097e4dcdda36 100644 --- a/drivers/pinctrl/cirrus/pinctrl-cs42l43.c +++ b/drivers/pinctrl/cirrus/pinctrl-cs42l43.c @@ -508,7 +508,7 @@ static void cs42l43_gpio_set(struct gpio_chip *chip, unsigned int offset, int va static int cs42l43_gpio_direction_in(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_direction_input(chip->base + offset); + return pinctrl_gpio_direction_input_new(chip, offset); } static int cs42l43_gpio_direction_out(struct gpio_chip *chip, @@ -516,7 +516,7 @@ static int cs42l43_gpio_direction_out(struct gpio_chip *chip, { cs42l43_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output(chip->base + offset); + return pinctrl_gpio_direction_output_new(chip, offset); } static int cs42l43_gpio_add_pin_ranges(struct gpio_chip *chip) diff --git a/drivers/pinctrl/cirrus/pinctrl-lochnagar.c b/drivers/pinctrl/cirrus/pinctrl-lochnagar.c index 0b78cf611afe..f3c8a8c14e14 100644 --- a/drivers/pinctrl/cirrus/pinctrl-lochnagar.c +++ b/drivers/pinctrl/cirrus/pinctrl-lochnagar.c @@ -1098,7 +1098,7 @@ static int lochnagar_gpio_direction_out(struct gpio_chip *chip, { lochnagar_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output(chip->base + offset); + return pinctrl_gpio_direction_output_new(chip, offset); } static int lochnagar_fill_func_groups(struct lochnagar_pin_priv *priv) From patchwork Tue Oct 3 14:51:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147931 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139472vqb; Tue, 3 Oct 2023 07:52:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHbevoMPU1VNdHyJX4n6662xu+T+LBUrKiAKaajXTZfEq8JqIMB+EcAuvyT9bThlc8wbLA/ X-Received: by 2002:a05:6300:808c:b0:140:324c:124c with SMTP id ap12-20020a056300808c00b00140324c124cmr11517890pzc.62.1696344760992; Tue, 03 Oct 2023 07:52:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344760; cv=none; d=google.com; s=arc-20160816; b=DAWKSDBmah+/fC9yNpGHPK5CoIWWPUqxWJRwQRPN35zoWNVvHMdHby5k+0eRbk6LKN soZD4yPfwMA6pBG0+sr9iQ+6rdqZf380J5tE7dNscWAqjOVf6dvCd4JueWz0Nn0783Rg nOtDmA7e31rRE5SEWd81en8A7OmQsudfHBbuMyEfCT9XiUESIFWp6PLOJRAg/8x0Gpy8 Dz84zNTlU0nIj8D2qK8rLpiNL7HoaeVrY0EKuNnO5Nx5KvQFokxQOsAs75xXT+QIXTyd xxpF0GaEwtj+8hku5cuA/LuPDcOm3iDtUqBgKGk7572okfdxR7zOYjsiP9mOSfhCgGN2 7xqg== 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=Ks2t/2sFBUuZyfDpT4cAX7qKrPmH6DMrQUqaUAZXib0=; fh=LWHnkhFesecDAkfb0a5AQGXUD/wRqz/1kRCz2uGinxo=; b=HhFJePKFNqi+gnerCZ45R+NNX/g9Y3ARS/8hheife0kSmm8yD+fYUbdzl8pyFGyXdl +RgvqxSoS9cBQqNQ8SLMtpYbY0U3Q7lik93NEVPrcz539ZDYLjwi9jmfLUxQIuYNltFs OixA5wzbsW1HvSOpmnpO635p5gK+Fof5FgMiG72uaFJcpMnr5Ql+tKpaICEcMngEacqb kfidHGJraQcYl+CoaMBTTpKfVzzKjDZaEEJgFfChljnasF1ptu0vJ5zH7PTJ0H16Hjo+ eiU6BjDN6xIpTob5gTlmh0Ww2loAfxEtzD/1UfjvfxXrgXwJady0+ypuIDOBht+TXSS4 4TpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=v4Vpj18l; 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 o24-20020a637318000000b00578f7063adasi1648125pgc.33.2023.10.03.07.52.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:40 -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=v4Vpj18l; 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 535AD819DFF4; Tue, 3 Oct 2023 07:52:40 -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 S240380AbjJCOwc (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240312AbjJCOwG (ORCPT ); Tue, 3 Oct 2023 10:52:06 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 941DE19B for ; Tue, 3 Oct 2023 07:51:42 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40666aa674fso10078235e9.0 for ; Tue, 03 Oct 2023 07:51:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344700; x=1696949500; 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=Ks2t/2sFBUuZyfDpT4cAX7qKrPmH6DMrQUqaUAZXib0=; b=v4Vpj18laTF5QkyFqAQnGq2cRFH8ZYxHBsKZFlKanh+t5YcGSXmMc/qRRgihpvoSeF zX9B4zfH8QkVYZW5fNSEa5C+GJtv+qXfmaqmQN+DuUouugjwS/VPE3MqTwXNFcCKNsK9 2wfW4pigdysrmrxkF4M1Q95lnuwhn0UDzjaeg4HVbRFGTXuW39rN83geuwMiWMojtLim 1DVOcs0TJVv/7L4FA4TgvEK7RIPKhDQDu777WxtjFDpyv6wSwiloEXXiib9sPg/VZA+v 4eoU34c/HD/1KHfs8LPtwWAXvjK68iGWz0IKxGkkVQ55WvVAO9wPZyy8hpBEjLzWsXQD f5yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344700; x=1696949500; 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=Ks2t/2sFBUuZyfDpT4cAX7qKrPmH6DMrQUqaUAZXib0=; b=PDtazF4IdGlq+21OcGJhX3DJkfvvFpIg+J91j0EFMHWRfCLTHuZzD8boWtIDY9z7Co wGIG9G2fjJ/iQ93NdZNX1kQsLMFFCPi07ncSdrEUP5MdIM7Vg2ZMWddoV7eGRQZsk9F4 NQ+e36ZbYfvum0WFf1uoS0fY2Zv1ccLfoMCPBbQTR8JBfr0vl1GpXXo0ERQ4xHABoOVK aWe+5o5YsvwA38INezKoaeJIt8Hf3jII62HEvzMQuW2DdLAzoFbL+r2QdiBq1EEtOaYU vCi4duelQmQpAWXqSib4ezYZe4RwybdlXh3iux5Tqyy3b9r/oFVwVTzSbMaUfVdVC9wg +PTg== X-Gm-Message-State: AOJu0YwvUb6NDNSMfDQVTTYv6SE/8wA4Y3wFir76Xkr1hUcZOIOb/NgV q6Cey1XqQLTU07IpmoytiKzDuA== X-Received: by 2002:a7b:cb89:0:b0:405:3455:e1a3 with SMTP id m9-20020a7bcb89000000b004053455e1a3mr14062183wmi.17.1696344700655; Tue, 03 Oct 2023 07:51:40 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:40 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno , linux-mediatek@lists.infradead.org Subject: [PATCH 22/36] pinctrl: mediatek: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:51:00 +0200 Message-Id: <20231003145114.21637-23-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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_NONE,SPF_HELO_NONE,SPF_NONE 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: 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]); Tue, 03 Oct 2023 07:52:40 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746404008008631 X-GMAIL-MSGID: 1778746404008008631 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/mediatek/pinctrl-moore.c | 4 ++-- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 ++-- drivers/pinctrl/mediatek/pinctrl-paris.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.c b/drivers/pinctrl/mediatek/pinctrl-moore.c index 889469c7ac26..dc41ffa31357 100644 --- a/drivers/pinctrl/mediatek/pinctrl-moore.c +++ b/drivers/pinctrl/mediatek/pinctrl-moore.c @@ -512,7 +512,7 @@ static void mtk_gpio_set(struct gpio_chip *chip, unsigned int gpio, int value) static int mtk_gpio_direction_input(struct gpio_chip *chip, unsigned int gpio) { - return pinctrl_gpio_direction_input(chip->base + gpio); + return pinctrl_gpio_direction_input_new(chip, gpio); } static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio, @@ -520,7 +520,7 @@ static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio, { mtk_gpio_set(chip, gpio, value); - return pinctrl_gpio_direction_output(chip->base + gpio); + return pinctrl_gpio_direction_output_new(chip, gpio); } static int mtk_gpio_to_irq(struct gpio_chip *chip, unsigned int offset) diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c index 74b15952b742..fc046415b567 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c @@ -811,14 +811,14 @@ static const struct pinmux_ops mtk_pmx_ops = { static int mtk_gpio_direction_input(struct gpio_chip *chip, unsigned offset) { - return pinctrl_gpio_direction_input(chip->base + offset); + return pinctrl_gpio_direction_input_new(chip, offset); } static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned offset, int value) { mtk_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output(chip->base + offset); + return pinctrl_gpio_direction_output_new(chip, offset); } static int mtk_gpio_get_direction(struct gpio_chip *chip, unsigned offset) diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c index b7cb5a1f1060..14b151aec2f9 100644 --- a/drivers/pinctrl/mediatek/pinctrl-paris.c +++ b/drivers/pinctrl/mediatek/pinctrl-paris.c @@ -916,7 +916,7 @@ static int mtk_gpio_direction_input(struct gpio_chip *chip, unsigned int gpio) if (gpio >= hw->soc->npins) return -EINVAL; - return pinctrl_gpio_direction_input(chip->base + gpio); + return pinctrl_gpio_direction_input_new(chip, gpio); } static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio, @@ -929,7 +929,7 @@ static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio, mtk_gpio_set(chip, gpio, value); - return pinctrl_gpio_direction_output(chip->base + gpio); + return pinctrl_gpio_direction_output_new(chip, gpio); } static int mtk_gpio_to_irq(struct gpio_chip *chip, unsigned int offset) From patchwork Tue Oct 3 14:51:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147932 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139489vqb; Tue, 3 Oct 2023 07:52:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHn0D1XKvBnL5nUSdEzn+g0hM03by+QnMwRgUZtiYoZMQInY/mOy5JhQeg2Ckn8ETfp426O X-Received: by 2002:a17:90b:3686:b0:276:db66:e833 with SMTP id mj6-20020a17090b368600b00276db66e833mr11579067pjb.33.1696344762182; Tue, 03 Oct 2023 07:52:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344762; cv=none; d=google.com; s=arc-20160816; b=UKTG67mee/qf5f36gIE+BDeJZ3pLJF+IrfzbyhB6okcWHwKR0QyRyKW8LDY1dvrIn2 nY9OUpDHaLAAeO8G7WyPOrk1Gzn+G4lnxszPeVqevzHUWWYvrMlVfutyfUoqMKgBVBkM 2c+/RajUW7bLOvypJbGdAFzi7YjuwqXC7f2m65VE4GTAgLveBoWh8t9VSGYZpkNEOr2p OTw7UN6VQqM0/LD6W/ZCXjP+v0q9f+S3C7xjRA293l87YNVSDiZBxmKygC279iCeQGlh oBMUTXZxTUzgiXr/LERX/xTriThG760JtmccqwjfZqyIYgoGBPfmHPMw+CTav0ro+I6E a5Qw== 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=L71FhZFxQS/v+Kb2FZmLTi+Zct1vRjkWo7sxYZsb/pk=; fh=I6IAeQHFQYiMMPjtEJrwJ7s6g670YyT1zUnutl/bM+o=; b=BOJq1NuovsKEbK1vzpRvdXA7vtIHsHA+11mD9XdEPhZbAo6Zd6lNpsKVsFxzI1I8WN efyq3qwqpSoGvvXd6MSfn5vWNDK8vwxHu0HvpZxNuDzDRayjjw7Snts9AtUrgvs2yEdr xTdf3rxlanrBnykDsMtiUU1kseoTDuLbcchn92+XzZUCH+bWq7KqlE6AHj6+1XnzcgzI maPZ8cHDmiIwj1qROdQI7m6LqayXJWoyu3ss5peDmUq9SG7LcKDrTSV9gzgpJ73NlATH /+LVQxMlwfhhdB52cvKsXhWAqos1YmJcn6WhNcrAb1Cwc8Zdh1QuuLgKRQ1X6VwLmiad O3AQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=ehH9dnNk; 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 fz23-20020a17090b025700b0026ceee6848asi9943119pjb.180.2023.10.03.07.52.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:42 -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=ehH9dnNk; 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 72E95819DFF1; Tue, 3 Oct 2023 07:52:41 -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 S239511AbjJCOwf (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240323AbjJCOwG (ORCPT ); Tue, 3 Oct 2023 10:52:06 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF8191B3 for ; Tue, 3 Oct 2023 07:51:43 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-405497850dbso10121025e9.0 for ; Tue, 03 Oct 2023 07:51:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344701; x=1696949501; 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=L71FhZFxQS/v+Kb2FZmLTi+Zct1vRjkWo7sxYZsb/pk=; b=ehH9dnNkTsAFzKXl9wp5BTCtWFJ8Ib7oce23tSALCCObFjAhhAzfJjio2ZlkBzkGT6 R6LfHkQHkCal2t2XHDtbND7AegPdgdNKV+nn7MWVQEPhLjEjDheULuzeDbyfIGLxNN93 vkmvHah1FT8Qh9TllnIjftcGfWvu0Hu59UJON+MjUvsjKIus7qyL67bv1JqvPC7gGMA1 +Q3RAQ7PyZE41gs9pief71F7i/ayKnywz+1k2w1CX1gIqWwBWo/iGBO70AUnbZFoqlUW ebmw8MJUuiLr051H+gD4Z7G5M8aKBoCIhn8vvoBHXeK53Cqyof/NVLSshS7cCVL3Wbd6 RzeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344701; x=1696949501; 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=L71FhZFxQS/v+Kb2FZmLTi+Zct1vRjkWo7sxYZsb/pk=; b=Hy6hb8yxkn5JWxEHY7Oqq080mMPbSp+b+OXpoknNSfPyfK7BR/LA8zWY6qkXRzvfnI GRdSoWS/1eoL9Cgqj//dZogPh0+pEicSiPQd7RAlBDi2dElr6J64L/vSfgPuqVVlu94T prGKvdz4vlzvKTuWxx6iaCM8SJ/Kw4J1ktZhftx1YoyJPKXzZRBG7wuz1ndMD35wkbyC v81bV1ZPB91GKx8tBwnSetoRaSl29PKXnWrc/kj+xycii6ms7J2fRCgTf1CXfD6/g0rL HEU+/x8uGw+WGr7VTehNY2HTDaDy9MvbcRDSNGPu46yUyl+SqXxKYtKCPNW8q5acbl7T u4DQ== X-Gm-Message-State: AOJu0YwtHpybDr3DJ4oEK8D1Bd8Jh8MPUvWdhqmxAkSQ0/onO0fhF/g2 7EleAZi4Yoh0ZNT2MwLWZbsa1A== X-Received: by 2002:a05:600c:2317:b0:405:3a3d:6f41 with SMTP id 23-20020a05600c231700b004053a3d6f41mr12365579wmo.22.1696344701465; Tue, 03 Oct 2023 07:51:41 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:41 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Chen-Yu Tsai Subject: [PATCH 23/36] pinctrl: axp209: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:51:01 +0200 Message-Id: <20231003145114.21637-24-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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]); Tue, 03 Oct 2023 07:52:41 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746405063252870 X-GMAIL-MSGID: 1778746405063252870 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/pinctrl-axp209.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-axp209.c b/drivers/pinctrl/pinctrl-axp209.c index 9f5b3ab8e184..d7f081f1d1f6 100644 --- a/drivers/pinctrl/pinctrl-axp209.c +++ b/drivers/pinctrl/pinctrl-axp209.c @@ -126,7 +126,7 @@ static int axp20x_gpio_get_reg(unsigned int offset) static int axp20x_gpio_input(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_direction_input(chip->base + offset); + return pinctrl_gpio_direction_input_new(chip, offset); } static int axp20x_gpio_get(struct gpio_chip *chip, unsigned int offset) From patchwork Tue Oct 3 14:51:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147944 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2140091vqb; Tue, 3 Oct 2023 07:53:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHaCeq41DBlKXGfBbx4fd9cid+1g2nzaXHQghrs91hocJ5U88Nr8eenhnBiadbpcah0qBvF X-Received: by 2002:a05:6830:6b46:b0:6bc:fdc8:d600 with SMTP id dc6-20020a0568306b4600b006bcfdc8d600mr14186892otb.25.1696344825946; Tue, 03 Oct 2023 07:53:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344825; cv=none; d=google.com; s=arc-20160816; b=qyd2unfOaxIKe+RGjzFrUELUwJBE2XJrzo8taXwYg2m89QrOqAiysW6JM5guvm1AwO 6k7wo2vs8ND2uwpjTxHrh6QC/Hr3n99H+1z1wc3xyQaGh6uGn0AbcaheU2AeIEWER5II npOVJKQbNy/tZ90k+apbl3A5APu8sXPO7Myrekp+NSeLpdPpAJDVAa9McmKVyOu+aLW5 a6XosxQaczKn/MLj77shhSnxc+1YSClgNRaliyaV78FsgmR0cD7x7/4JA6GeGANDkbMb DOS7gNeVrq+utifpfo50zwuKJ9FTtH+1xftNoLEWRGia+vI+rFMKx+1r3WYzNlboEhKW srtA== 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=gdciYkeI9ojIVFf6NUkn/u7//A2Bey8sZm2LXyWrQBM=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=DEjLKD6ANA6wx+yp3TAhoixresBntV3F1pHxCiT7/O2XBNzkCSAbEQ16dN6HZm/I6b P/HlG84VZfbfvJTXDfz5Q9yLGROpk7mO5PEIhM3F5nbZweeFU1UFsEYATttyS8zeqjDZ 4RotVvUpFkLKh1FJKAlC7CLiUxOeHIwCBtAqvMdMHIV5NAHs6iOmFIK2v7WEt/rPCCJU TidFu0wPeQ6O1U7LEadm5rMW7uwrO5IoYsD9Jskan8wm1EFqvYvPiWTcLup9U2p4CxxX v6xB7Osnfg4Etmcq8UXA/0hIyg101NAI7fIh92a9zvDt22Pt+jtCxqAkXCnlsXuKNViI 6Csg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=0tWUdjuE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id bk13-20020a056a02028d00b005702c84e4c2si1572298pgb.508.2023.10.03.07.53.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:53:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=0tWUdjuE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 715468135CDD; Tue, 3 Oct 2023 07:53:31 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240456AbjJCOws (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240241AbjJCOwI (ORCPT ); Tue, 3 Oct 2023 10:52:08 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31D1ECCB for ; Tue, 3 Oct 2023 07:51:44 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4065dea9a33so9888135e9.3 for ; Tue, 03 Oct 2023 07:51:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344702; x=1696949502; 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=gdciYkeI9ojIVFf6NUkn/u7//A2Bey8sZm2LXyWrQBM=; b=0tWUdjuEf5ruRk9Q6Bu879uwluuZBDOLvuRlV+zEuj1EZF2wtdOaxlsG6bNFzjf4x4 v6vEhs4jJ1bleBX3/QxiChIsocP9rUf65qkBSHCoMNMieFyltrqwvTaxZ9m8E0licv9m +BeekMnMTdak7RdZHWovf44s7euzNyvLghgrRp1lavN51A4rvShaMgRmNsFMNeguOp9V 1smDfovN2arrOtbCQhqMRaXb6yvIgtQHcIjwkgZJLqKOf0z6cY86/wFUWuDEQc8kmou/ Lt++BJ6L/mC/zXo2xD0DNKZV5CKTiiY4vGvdvQ4II3ZbPnc3R6/u1zpZ8nIsUmvWb7tX itdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344702; x=1696949502; 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=gdciYkeI9ojIVFf6NUkn/u7//A2Bey8sZm2LXyWrQBM=; b=dZtICDE1s/5kc8FGXxJHoHzzs/FsBrgCEmCpsqf0sIpHjnO9Q9n21imRxTvALbXVV4 gebR+CicbAHNsd/NoNvOzIFERVfskf4/VzR/ACT7b8NRLQzGtDL+/oEmoabHTFbIs13J 2tAaG25VgGi7h+6yXc1LfT3gAHdzCjYL8pjexBVXaNtjLcqbOkdALyNjcd2wGmDYZnjM y4zzFXIdMdkTeIrjFvQzONzdFD51mPFLVhDzAZBZi6lqph2CsMR3UceWVCiObI+Af27s yPA0JyFKWWjcNouxQS06FGkUeAyi1r3wfXIcLF2RByrDsc+YJX3AEtrMGJRR3rkL3t4j 7vrw== X-Gm-Message-State: AOJu0YwFYs3nKSNGIFFQ/NrRCH6ANlvHaN3A1h6wt9YdV2Vd+ucZenca roSs1Dr+QtJ1BEhIMSM0j/De4g== X-Received: by 2002:a05:600c:a3a0:b0:406:4d8f:9fee with SMTP id hn32-20020a05600ca3a000b004064d8f9feemr14497527wmb.24.1696344702396; Tue, 03 Oct 2023 07:51:42 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:41 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 24/36] pinctrl: vt8500: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:51:02 +0200 Message-Id: <20231003145114.21637-25-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Tue, 03 Oct 2023 07:53:31 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746472253919180 X-GMAIL-MSGID: 1778746472253919180 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/vt8500/pinctrl-wmt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/vt8500/pinctrl-wmt.c b/drivers/pinctrl/vt8500/pinctrl-wmt.c index 6fac30de1c6a..1a313295611e 100644 --- a/drivers/pinctrl/vt8500/pinctrl-wmt.c +++ b/drivers/pinctrl/vt8500/pinctrl-wmt.c @@ -528,14 +528,14 @@ static void wmt_gpio_set_value(struct gpio_chip *chip, unsigned offset, static int wmt_gpio_direction_input(struct gpio_chip *chip, unsigned offset) { - return pinctrl_gpio_direction_input(chip->base + offset); + return pinctrl_gpio_direction_input_new(chip, offset); } static int wmt_gpio_direction_output(struct gpio_chip *chip, unsigned offset, int value) { wmt_gpio_set_value(chip, offset, value); - return pinctrl_gpio_direction_output(chip->base + offset); + return pinctrl_gpio_direction_output_new(chip, offset); } static const struct gpio_chip wmt_gpio_chip = { From patchwork Tue Oct 3 14:51:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147941 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139832vqb; Tue, 3 Oct 2023 07:53:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFNxW+cugdz0J+NEZtyo8q4M0UznhJ+KHQQ/iM3NbHhKYtJa75baY3Q06hX3f6VABtmkTG7 X-Received: by 2002:a17:90a:d916:b0:274:638d:da9a with SMTP id c22-20020a17090ad91600b00274638dda9amr14411115pjv.34.1696344799528; Tue, 03 Oct 2023 07:53:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344799; cv=none; d=google.com; s=arc-20160816; b=g2M3NiGmQuzSzp7IwY3r/XLyWqBt1sfvy3wjlcluH+gCf/+s/1eFO3x/fyZFns9Zvm rCfyDTGLkq2WX9GAeZM4Idw2ZE16CkEds8WK23ASpITUGKSQvBdViR0YLd/dPE9/nKyl LdBOdKqm2ui7QtP7SCZFxmpvw9PfmX0iWsSeE/LAkibWsO6iX4SjnJtx4QEhtfiPxbeL n4XblsVJaNg04fEPlHZ/+85ZruVRv0wGYmvWLyT1pU6+jJa+Clb4xCGLmsbKT7ty+Eqa d5coB8RQM8Ukd6QKokiHvC0v7Bhc8QnELF7UuOhU1/WXt5YGK1X3UhVZBVrmRLmzmQM2 VZsA== 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=dCaaX+GBykmnpaZwjrwxwJTXEqzANHLF7xpPc5hlhz4=; fh=SoX2HbZWU7cBWy8Z33k1YB0/6NCSM/orOqFy4ZwxHWU=; b=YlMx545nGVG+I1ziLAmUR1Lsb3uids30EJUDhss0TlHU6MX/TZkc5P82OlOcKZwlgc FpkrBU/1HJ6kd+wlSgaWPrSui9/4CkTdWLsp3k63vniccDEbbF6VFMNPlzi5/klLymR6 SySd+CUtCVErfVnCT5XDGcZGrBi2nUFdbkfFltCMmLQOnw4gEmmNrUoonGWDWheyJvxQ wmYIsZecKWBP7Zc0Amz5V6fj7RH+Z9fVR5K7mjVheWJIeefUTL8yegELJrECJkv0KwgE Ei705RZA/rUuBFeocT+SeIgZeI2NgyytI292JFErdr+clIz7KuQxramkLqIHueYqU1ok TL5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b="wxd/Ecn0"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id y24-20020a17090aa41800b0027652885184si9717016pjp.91.2023.10.03.07.53.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:53:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b="wxd/Ecn0"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id C7CAD815CDA0; Tue, 3 Oct 2023 07:53:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240317AbjJCOwg (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240335AbjJCOwI (ORCPT ); Tue, 3 Oct 2023 10:52:08 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4E69CD0 for ; Tue, 3 Oct 2023 07:51:45 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-40572aeb673so10692465e9.0 for ; Tue, 03 Oct 2023 07:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344703; x=1696949503; 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=dCaaX+GBykmnpaZwjrwxwJTXEqzANHLF7xpPc5hlhz4=; b=wxd/Ecn0vq1plLPGtGUk9IDCYFoJKOcuyIX4NDc5eewKHGGx6X80QxwMBDFg49QMe3 NKkDUmBjMoO1hRUwxirY7v3jUxnhXNReAVeI41m/sWC6kOPFInxMHU52aoBZAZO/qqGk EmQEb8R6z8s4erloy8GGwh166U0zzMvZSB92x5p+EfkHu5j7/AJLyJsOQRFawROHDlHc bPGPuBjnBKy76FXE0NksckAdahVCSZsAmEUhbJu5yKm6qcBvII+3O1ZLwdmJluc2Hscm nQ1jnWkvnGMsTd1aX6hNVKjbj3NNIY63XqL22QPdeuHXT+IPZuaF9aIAulkY9kEETJn4 jgXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344703; x=1696949503; 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=dCaaX+GBykmnpaZwjrwxwJTXEqzANHLF7xpPc5hlhz4=; b=KgLVbzYR4D6n5hGNHneTTg4jHmJY6qTPpPvDGWxuuimtBwApgOJX49NoQu2qXENcma T2SxWd4ELPioLUNF6G/dTmFlQ9TXIdI2BPIaNaP+p+8Y9MSHhj+VDPRAPZ8yxo59roDW CrEsqfgwnk3IoDTpvoifeKZ5QbZeupT7f5HocOIN/BF/fjvkTbCB6Z4x3Ncsaps2Ngj5 8cKNugRiCdEVaKsefZzw6lxqt+EqW529DirJGljYH56qp339mVw7g3cmDql8w0iX2A1D K/v6kTN7dpI5AeAjjbr7XHRyxwroMJDylcBVMxLfrRhHzMKRC+kLF73HRqUj7mzenUfP Ythg== X-Gm-Message-State: AOJu0YxJ+ToLhBjl06hLtrEWGqkvpqL0UPshLVogpe5+hVaXR9OaMdQB 81k+ruJljRZfe2eT3nKPQuquUA== X-Received: by 2002:a05:600c:c9:b0:406:3fda:962c with SMTP id u9-20020a05600c00c900b004063fda962cmr12271371wmm.31.1696344703371; Tue, 03 Oct 2023 07:51:43 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:42 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Patrick Rudolph Subject: [PATCH 25/36] pinctrl: cy8c95x0: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:51:03 +0200 Message-Id: <20231003145114.21637-26-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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]); Tue, 03 Oct 2023 07:53:09 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746444275446250 X-GMAIL-MSGID: 1778746444275446250 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski Reviewed-by: Andy Shevchenko --- drivers/pinctrl/pinctrl-cy8c95x0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/pinctrl-cy8c95x0.c b/drivers/pinctrl/pinctrl-cy8c95x0.c index fae80b52a6fc..8c6006353515 100644 --- a/drivers/pinctrl/pinctrl-cy8c95x0.c +++ b/drivers/pinctrl/pinctrl-cy8c95x0.c @@ -554,7 +554,7 @@ static int cy8c95x0_read_regs_mask(struct cy8c95x0_pinctrl *chip, int reg, static int cy8c95x0_gpio_direction_input(struct gpio_chip *gc, unsigned int off) { - return pinctrl_gpio_direction_input(gc->base + off); + return pinctrl_gpio_direction_input_new(gc, off); } static int cy8c95x0_gpio_direction_output(struct gpio_chip *gc, @@ -571,7 +571,7 @@ static int cy8c95x0_gpio_direction_output(struct gpio_chip *gc, if (ret) return ret; - return pinctrl_gpio_direction_output(gc->base + off); + return pinctrl_gpio_direction_output_new(gc, off); } static int cy8c95x0_gpio_get_value(struct gpio_chip *gc, unsigned int off) From patchwork Tue Oct 3 14:51:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147934 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139569vqb; Tue, 3 Oct 2023 07:52:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAlGUcF3Uv8uWUOmFTrTK7t3uUSb4xz+PXzBjByOYey8JlcvugtnOWRQYVu8Yy8t0rF2DV X-Received: by 2002:a05:6a21:7746:b0:14e:b4d5:782e with SMTP id bc6-20020a056a21774600b0014eb4d5782emr13071142pzc.29.1696344768990; Tue, 03 Oct 2023 07:52:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344768; cv=none; d=google.com; s=arc-20160816; b=iZqlH0CtIJReaPd/y1cC5DQMNEluezkteusaMnSGVPVZOxgjvImvXu6gBuwEWAzeVj 9cj2dPyTXoH8/j7MsupkUDzz5oRCxq5qIPssqqL287Buwi0rrvub5nua1QmrE1+ZkOYy 7mXtBsfiETdpcrKMwVrSBHu/g/oI1g+G3YzvPkw9+YNwSPuuVJDMG9Wx5z7vbzWWieWa V8/jHBHJtBZt/nVQQiai5tib3I8XzkpT19om2AnFedWCkVLNJfZsFGDMEjekU88GQbJL hytJZHMjRjpruWywTPMf3+dcoOuQuskbSOHnufURueEDLZwCvy7FNFMpdtgDgSbqBHMv HpQA== 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=Rt4PWI36LT1R2nI/NQBkxbO8D5dykJYeFhT6i3lm7MU=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=0o1n8wfS5BydxFhCMiOiAuAkTy2lJjWflw5SYVhnnW6qfw/v8cROyPTC5dfLzf/nfT LlH6u3B3l1bcY4nBJgAPJG/HbJ0yvRx4JKO1dZLgDkBijiW1w98KCP+UQPFP0IG7mK8k TTPSSlX++IPVT039U4ytFqQ7b7xhmErR56nKej58vg1TC4B97ghv/46UPGxEW1CxQ0PZ q06ha8VDzqLpFd1nRv3ILJfYaSIXAb72b3AX8NBflDpR63iMf8JWMnwGriHzQjSrBaBn Q7sqfaK7MDa1s7tLZVMlDADJsDcgP2AG3q9TocMe9MsA9mCJNkoXWJEey0p3RXA0q69I K0pA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=ynl+T5Wr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id y5-20020a1709029b8500b001c752577582si1543799plp.359.2023.10.03.07.52.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=ynl+T5Wr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 254DC82B2EBF; Tue, 3 Oct 2023 07:52:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240377AbjJCOwm (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240349AbjJCOwJ (ORCPT ); Tue, 3 Oct 2023 10:52:09 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00081CE1 for ; Tue, 3 Oct 2023 07:51:46 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40572aeb6d0so9994795e9.1 for ; Tue, 03 Oct 2023 07:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344704; x=1696949504; 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=Rt4PWI36LT1R2nI/NQBkxbO8D5dykJYeFhT6i3lm7MU=; b=ynl+T5WrpM+1eMKQ5X6c7e6XsTUTRL+fWMeXwaGeoHjJkKOZpo6t0dgE0yH/w9gHAE jYb81WPRhTkENuRjIgGe/tz9HFsO1deG+ZGYUy54bbaW3Zht1iEui1iWjylvgOER6SOm Cw1+xsJ/wSnzNYPcpCbGpdc7OY6A66rgP8FFv8d5zITL5auOVoJh8ih/pl7PmbYv+RUV HXEiVLReTXloBEyiGgwPLfrIlAIdspBcgX9nBXhn9XzNjLTrsZYq5Eiv0wtv8JrVhHrF 2Yf1/bjbZaTfS91xVL9N1OUMUWXL1ajP5WIdqbS7b7cqOV4JVtnU4bxZAWjPkUdTSz8p cRog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344704; x=1696949504; 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=Rt4PWI36LT1R2nI/NQBkxbO8D5dykJYeFhT6i3lm7MU=; b=fyd6J7UVUnj6KyunNVgTROKdD8NioVVjjODb485ffwhxGaLXduFJ0TN/0h/DE/zUis hQbPyVhzFwGOb72po8QD9fpQPRnZ82H96p2jF0wsPrCGF1x0wRaPJJQeF72H0pEirlqV LDae7Y99pgfDXGovVdw3ChMw8I4u5qxFYmQc0do4dtjhfvmdrMtFzDrWtkRWaG6NJUlf nZgVhG70yAl6jL3zil5hPWeCdG4EXAEryznaIggbhhVcEhC7syjlhqgRoaweTphUsS8X d+V1Dr4o8B8m7sLvHPCJzTAMg/oWlgkTITQvqvoskUTBGK7X9x+X/ZBwPNRZmf+4ou1Z OFHw== X-Gm-Message-State: AOJu0Yy3hEfD1WUgpmI4+XpjnbwH7GbkWbREcRcVIISF1gH4NgmLLxCX e/pIJSLWdMo8w7RCfejGD4//tjNeaiEUzxRI+tc= X-Received: by 2002:a7b:c858:0:b0:405:40c6:2ba4 with SMTP id c24-20020a7bc858000000b0040540c62ba4mr12415097wml.5.1696344704147; Tue, 03 Oct 2023 07:51:44 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:43 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 26/36] pinctrl: as3722: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:51:04 +0200 Message-Id: <20231003145114.21637-27-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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=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: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 03 Oct 2023 07:52:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746412252554300 X-GMAIL-MSGID: 1778746412252554300 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/pinctrl-as3722.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/pinctrl-as3722.c b/drivers/pinctrl/pinctrl-as3722.c index f0e5d87ac50b..3d3adf9793fb 100644 --- a/drivers/pinctrl/pinctrl-as3722.c +++ b/drivers/pinctrl/pinctrl-as3722.c @@ -502,14 +502,14 @@ static void as3722_gpio_set(struct gpio_chip *chip, unsigned offset, static int as3722_gpio_direction_input(struct gpio_chip *chip, unsigned offset) { - return pinctrl_gpio_direction_input(chip->base + offset); + return pinctrl_gpio_direction_input_new(chip, offset); } static int as3722_gpio_direction_output(struct gpio_chip *chip, unsigned offset, int value) { as3722_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output(chip->base + offset); + return pinctrl_gpio_direction_output_new(chip, offset); } static int as3722_gpio_to_irq(struct gpio_chip *chip, unsigned offset) From patchwork Tue Oct 3 14:51:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147933 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139536vqb; Tue, 3 Oct 2023 07:52:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGVP3I+oKaAytYbHPstfJpsMRK1+Tt8xZgz743/Z/v2PmsN7ItqNNPQm2vDzUN7NILqA+YB X-Received: by 2002:a05:6a20:6a10:b0:159:b7dc:2295 with SMTP id p16-20020a056a206a1000b00159b7dc2295mr15615743pzk.9.1696344766799; Tue, 03 Oct 2023 07:52:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344766; cv=none; d=google.com; s=arc-20160816; b=pkUxBBVADjx9tToxWfPP3PmfqojVgB/cbgcOJzFjLZt8NgxvEYrm0KWoFnU+t1WSGo ORQEvo9g1z5CQlzW7912k7v/oxyhj7zzqAYuuSiASnCepoDANFfdZ7c5z3pvcPrgJh0Y CPdleHGNlYu9it8gEF+txh3Im09rjbJqDf+KBwNOJEB188wkRg4CbppVHUgz55sfMVE+ 8fhaHVbKzVenkKgRqzCe0Mpq9PVXyBFcmn58BS7O3l89VZuXb8eKZ2N3K2c2LYSwT4N/ CAJwmAdz+eIWWH5bv9GkDQT66n5qkimg2MQEgLSUF8PslgqPaAdHdW94D/YeOUShcXLw SKow== 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=gwciMDEJmwkjhMDgP1JPMADTRBiS8hEPWAh7DlNBT2c=; fh=QlwXQXGqOG6vGw10IkNHl6yk+0xfslFpcIaIKq4bKas=; b=GVDFbyW/M71mpdrrkThFBPmMlm0XJOoogYSNJUNf/Wvoez1uZe7CaP4iwlNspzXaou kb/vM7x3+mMGVPxnpS1/6N25Xlgbj664mxkZf1LPEMEKEWfd6EUQHQmMJTxal1yJup9G eIrp+Hcr9WSOtPKjo8NtM+HsHQLesQNgd8zNrFAA2wJTd3Iw3Cl3b2AATLw9+2Zp5kmA kcEfV0+qpVYBC1Aqe738MQ4jFdQ/oBIt+Ek/8CGaNSbY3fVTCjwLfqkgtuijsN5D5UdP eNyW8JKORgufNmqlSace85+LUGYb9pnx8Jm8c/CQg1ro6VbtxCOJ98e+vif+WeGvTqop Qb7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=nIstkToP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id a22-20020a637f16000000b005774cf04028si1570771pgd.764.2023.10.03.07.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=nIstkToP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 11DC0819DFFC; Tue, 3 Oct 2023 07:52:46 -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 S240436AbjJCOwj (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240351AbjJCOwJ (ORCPT ); Tue, 3 Oct 2023 10:52:09 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A927CE4 for ; Tue, 3 Oct 2023 07:51:47 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-406618d0992so10107435e9.0 for ; Tue, 03 Oct 2023 07:51:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344705; x=1696949505; 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=gwciMDEJmwkjhMDgP1JPMADTRBiS8hEPWAh7DlNBT2c=; b=nIstkToP1amc27ZRDUiXlaZJ4dyyNi8SDgM6bgn04my5q8GKJXiEs7rUfZuFCVsh9X nauMvdUkItXIf5DYCM7uuwbt1kU6eyy760joZDy+w1C8Rd0BNK7FGJqav+b52UANf+2K 2zLspJb/NQYdaGc/SkoB1as/supbrrr4/dm0swsXIJ9vs15AmlhYW+hUcB4OECsVRN9M xz+BLQ4/bxuZO3g/BMJx+yzJaXNWeb7b7Zk3ff9RYfLVw/NJ4J6Oy99fuX5FDssUg30T 3D99anV0nMmeKPXssWJ0Oe6pa5yQIyQkFSfuiKZSyfUlKJsGPhLhFbykCHdys1JKmlCN cCKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344705; x=1696949505; 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=gwciMDEJmwkjhMDgP1JPMADTRBiS8hEPWAh7DlNBT2c=; b=QcTQxTRGCk7we3DvsaYonD/jvB8xbs9P4aFRMCTGBcuj8Rpq9ZbStFSxbgTjX7Ymfi MFHRzQB03sCb/lPAEY4Me+xoZYhY0GXF9g/CI13sFIgTrxDojP62C1/RAu9rNpdVzfS4 ND3L06CtizBAhprHbIPhJT8xedxc1Qxl5q6ZsG1z2KAHs/2M80v7sv0CozrR/XXnJJhH NWuOhbxRgf6EoSDDgcjVWSDECTeT7Jvtg46R4xaJx5cjsYyeBWnCL8/ljpvqeKPyp5Xj oGgT49J7WNpEPtEUSEqfeTBLNPhO5siqub1pzF375ZcZPTI/ldunU42b4puKtqECJZlw gPVA== X-Gm-Message-State: AOJu0Yz+iDhrshPROzH8nUP8Jr4YGGxrQPg2qqWC7DSR9NwZkv/flPFc QYdkJCRTg/HL3vMFu9u9N0n8Gw== X-Received: by 2002:a7b:cd95:0:b0:401:bdd7:49ae with SMTP id y21-20020a7bcd95000000b00401bdd749aemr11623686wmj.18.1696344705018; Tue, 03 Oct 2023 07:51:45 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:44 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Paul Cercueil Subject: [PATCH 27/36] pinctrl: ingenic: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:51:05 +0200 Message-Id: <20231003145114.21637-28-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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]); Tue, 03 Oct 2023 07:52:46 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746410168270089 X-GMAIL-MSGID: 1778746410168270089 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/pinctrl-ingenic.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index 2f220a47b749..5072fb907193 100644 --- a/drivers/pinctrl/pinctrl-ingenic.c +++ b/drivers/pinctrl/pinctrl-ingenic.c @@ -133,6 +133,8 @@ struct ingenic_pinctrl { struct pinctrl_pin_desc *pdesc; const struct ingenic_chip_info *info; + + struct gpio_chip *gc; }; struct ingenic_gpio_chip { @@ -3561,14 +3563,14 @@ static int ingenic_gpio_get(struct gpio_chip *gc, unsigned int offset) static int ingenic_gpio_direction_input(struct gpio_chip *gc, unsigned int offset) { - return pinctrl_gpio_direction_input(gc->base + offset); + return pinctrl_gpio_direction_input_new(gc, offset); } static int ingenic_gpio_direction_output(struct gpio_chip *gc, unsigned int offset, int value) { ingenic_gpio_set(gc, offset, value); - return pinctrl_gpio_direction_output(gc->base + offset); + return pinctrl_gpio_direction_output_new(gc, offset); } static inline void ingenic_config_pin(struct ingenic_pinctrl *jzpc, @@ -4052,7 +4054,8 @@ static int ingenic_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, break; case PIN_CONFIG_OUTPUT: - ret = pinctrl_gpio_direction_output(pin); + ret = pinctrl_gpio_direction_output_new(jzpc->gc, + pin - jzpc->gc->base); if (ret) return ret; @@ -4172,6 +4175,8 @@ static int __init ingenic_gpio_probe(struct ingenic_pinctrl *jzpc, if (!jzgc) return -ENOMEM; + jzpc->gc = &jzgc->gc; + jzgc->jzpc = jzpc; jzgc->reg_base = bank * jzpc->info->reg_offset; From patchwork Tue Oct 3 14:51:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147936 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139601vqb; Tue, 3 Oct 2023 07:52:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF5kKHJO0v+vDGnW5ZQy3vCw0LBTlnjM1bGehDPv5P0aralmj4PuvMGSi9ytcn67QGdv0nT X-Received: by 2002:a17:902:a983:b0:1c5:7aa1:3a52 with SMTP id bh3-20020a170902a98300b001c57aa13a52mr11852004plb.2.1696344771895; Tue, 03 Oct 2023 07:52:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344771; cv=none; d=google.com; s=arc-20160816; b=djzduKcLGlzQC7uJjo+3gMVa4OREWlYwqOQ9y9gxKwnCwXpT7EoX2d0dAWlC9MP0lI eAdv72wgFb8WNRVG4VgBhtRX9iQJDPg17Ba6wBuQhQB5HldSFA+hFg2A04llxKGUMZDE s4x9N/eMzNGt/rnPjy4H7ERGDP0EW+BvQfJXe5HHe/Pg3ACl0quIENmSc5UELyhrLWon QsPmGFy4O7QqYyFQ83aeIhk5GgOGse8MTS5PbTEFvLJJwTMOgUwpZ64heGNbv3hkZf5S O/MwpTGzeuWXbZ9+WoMewKcXOfXpzpK4hLt9PPEZoHm07YdBR1pizqebk6bB+TmdFsWQ Nwhw== 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=Ijntmg1NBQ+adP3gjGt2F/CBhwsfnlyjkrlVEXH9faM=; fh=QPx/hkgkr7xHJ31c+1sohGxWgeIbcsI8iVFsxMdsOB0=; b=vrD11ARJePF/f6tZt01g49QB78XmcrdKQ8LnAyIt38O5BxJqXhCGznZKKv0D09aYCD feJ+RMEVVr+v3SHFzMOU11WSonUoztfevgxwKi2zv6xM26RK4/25VcgIFfHoY68lCVlN rECl4VfXuxl5tfmgUFeNdKjlLEM+glnoGRNYvaYz+rRS5CuNh6xNsa6L9AR42xYCVFpG BcR+yhuJecPn0IRxpr7Ktns8o9CxuJpJhHITAVRVl1MMjMAW4Zi/s1q9fFA/rZI6WSnJ ZJgNGJFC60oEnbb5JoBMNbW1m9EeFR5kH0iI3G8PjN/W7Zup3pNVeMHLrKBWN3ciwGqS agAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=D3deot8I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id b16-20020a170902d51000b001bba4470991si1682851plg.498.2023.10.03.07.52.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=D3deot8I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id ECAFC82B928E; Tue, 3 Oct 2023 07:52:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240385AbjJCOwq (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240362AbjJCOwP (ORCPT ); Tue, 3 Oct 2023 10:52:15 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7614CCFB for ; Tue, 3 Oct 2023 07:51:49 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40566f89f6eso10483605e9.3 for ; Tue, 03 Oct 2023 07:51:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344706; x=1696949506; 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=Ijntmg1NBQ+adP3gjGt2F/CBhwsfnlyjkrlVEXH9faM=; b=D3deot8IHzF0xI1bp70GXfbz5+XWcG0rVt1V9/apGDrDAHA/86y6c++BT7a1Hyejb7 bq19Z85abbtlcf/wKMdkBk38/dQZqBxB7c6+D5+xu/rjlykQ588rZZdoPXGwSB5Gvvvl doaIOx8BbTK4AjbmcnU6ZBNjVsQM7fgBgGJi+7g58wFveKzljt+kwDVjl/P8B1WZJ/XP UFjqzve/04ejB1wmcQyt/mziNZagc15rsavwdbpzfvm8ndMUUJdfNc+LLpQCX9B37awV HyeO88u14Zf46WN59LuXL6n9TWjo+/D5uJxNkoXQypRl+JQMeLYsS/q+S6qafMLCm2UW zXJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344706; x=1696949506; 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=Ijntmg1NBQ+adP3gjGt2F/CBhwsfnlyjkrlVEXH9faM=; b=C8cQUm8m6kIlBroXLMsbfoAH8YrMWDcFLCVg01QsuVWISBf83x7/hd2xN6kV0ujwt+ VvXPrR3TCDUhwtDWPzW0q1a9QugYAxMgByOdqi/zK55cCUQ2g9495VXk5XWt5M8uoiNd U4X++OAhC22HBgfLRzV1jDHJvYv5iFTkviLELz+wdrYI4K3g3S6XMCTiAb7IywzJOzU2 7E1tE8TuDO1dgjd6vv2IaRZzQrXgRl34s1G+98jmOzjdfl7TatMFxq+I2OZD3AZvaQPZ p9mH8PuLaPrX4mS1MTgiXd7meYs5VUD0TmQPHYbb0LQ05ctgqAefwBv3Pf+l4DSOfodR 3QJA== X-Gm-Message-State: AOJu0YxUpoJ8H3lKgrOzLDrmM73bKNPJkGOkbT+/DaNNwlZYGbUNyeI/ zgs18FinYOdzqdixwu/g9NeBgQ== X-Received: by 2002:a05:600c:2205:b0:401:b0f2:88c1 with SMTP id z5-20020a05600c220500b00401b0f288c1mr14200438wml.29.1696344705874; Tue, 03 Oct 2023 07:51:45 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:45 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Mika Westerberg Subject: [PATCH 28/36] pinctrl: intel: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:51:06 +0200 Message-Id: <20231003145114.21637-29-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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=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: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 03 Oct 2023 07:52:51 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746415334092330 X-GMAIL-MSGID: 1778746415334092330 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski Reviewed-by: Andy Shevchenko Acked-by: Mika Westerberg --- drivers/pinctrl/intel/pinctrl-cherryview.c | 4 ++-- drivers/pinctrl/intel/pinctrl-intel.c | 4 ++-- drivers/pinctrl/intel/pinctrl-lynxpoint.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c index 81ee949b946d..56a6b67d8380 100644 --- a/drivers/pinctrl/intel/pinctrl-cherryview.c +++ b/drivers/pinctrl/intel/pinctrl-cherryview.c @@ -1172,14 +1172,14 @@ static int chv_gpio_get_direction(struct gpio_chip *chip, unsigned int offset) static int chv_gpio_direction_input(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_direction_input(chip->base + offset); + return pinctrl_gpio_direction_input_new(chip, offset); } static int chv_gpio_direction_output(struct gpio_chip *chip, unsigned int offset, int value) { chv_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output(chip->base + offset); + return pinctrl_gpio_direction_output_new(chip, offset); } static const struct gpio_chip chv_gpio_chip = { diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c index f49d6e136018..4897c8425391 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c @@ -990,14 +990,14 @@ static int intel_gpio_get_direction(struct gpio_chip *chip, unsigned int offset) static int intel_gpio_direction_input(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_direction_input(chip->base + offset); + return pinctrl_gpio_direction_input_new(chip, offset); } static int intel_gpio_direction_output(struct gpio_chip *chip, unsigned int offset, int value) { intel_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output(chip->base + offset); + return pinctrl_gpio_direction_output_new(chip, offset); } static const struct gpio_chip intel_gpio_chip = { diff --git a/drivers/pinctrl/intel/pinctrl-lynxpoint.c b/drivers/pinctrl/intel/pinctrl-lynxpoint.c index c3732a9f0658..544ea8a607c9 100644 --- a/drivers/pinctrl/intel/pinctrl-lynxpoint.c +++ b/drivers/pinctrl/intel/pinctrl-lynxpoint.c @@ -545,7 +545,7 @@ static void lp_gpio_set(struct gpio_chip *chip, unsigned int offset, int value) static int lp_gpio_direction_input(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_direction_input(chip->base + offset); + return pinctrl_gpio_direction_input_new(chip, offset); } static int lp_gpio_direction_output(struct gpio_chip *chip, unsigned int offset, @@ -553,7 +553,7 @@ static int lp_gpio_direction_output(struct gpio_chip *chip, unsigned int offset, { lp_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output(chip->base + offset); + return pinctrl_gpio_direction_output_new(chip, offset); } static int lp_gpio_get_direction(struct gpio_chip *chip, unsigned int offset) From patchwork Tue Oct 3 14:51:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147938 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139644vqb; Tue, 3 Oct 2023 07:52:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFLGqy/vyKjiin7F17AMj8YwLHBfsQjEvDoxGSdgQ10t2SnaMxuzXe86R/X0hr5RFfZ4qby X-Received: by 2002:a05:6808:1446:b0:3af:a107:cf68 with SMTP id x6-20020a056808144600b003afa107cf68mr4042117oiv.40.1696344778177; Tue, 03 Oct 2023 07:52:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344778; cv=none; d=google.com; s=arc-20160816; b=vUxPKB9lOPIP0M0TZtIl7uhkU4kpJsaIxiZkFeqNNuYuTHrrXMtxWjh/k8T/ffflU9 GtKuj3buy5Jl8KbCHyBSolJpsQc7CjRevvPdPbr/F0ekGNlPA+nb5gqjQKW2imwZI1Zg hQ7xO41VEvoGIBEoq6Tyxv91oWqaL9yKnZghEVd8sg/hxcXrv5Mxk8ZwjIbb9+579WAc BxQYJpw/x5K9fTjFPYqV+hG4wzZWpRCWkOFKwLyVsekRZahPrV28ORDvwSLANsj7ERBv +6+JBL5TRXTlB5oZ3RgnWeJTN7sqW7Q0Nx/Gv02grcLx4ls3VepPLhPBQG7OvRhID3pW 2GwA== 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=5j3W5gbiwB/5gwTM96ugP2be7g+wEOoUYMu+wXUrQYg=; fh=pWErDKqmL6WGtiIt4dvQjWWPlMBxPLw4lk+PlqoyAaY=; b=ao3mwughs8gf0CHUmGbcnVAmBc/57+eMaRSPhmpijbEKttLolXb4/8SQJX6SvxoKHr CNpAMUpr9gpdy5G9CQPEMEC8sZyhld09F398KxyhOFhUPJSXV83JIia1QmJ0vvl79R9P hhpOv6UV5NFEcA/gp/lpvrB1tiNOGQyChbk/qsC2KsA2ww+dMdNfRtL0Icr97ogAOqrx KVi11jcw4HnItcefgxclaalxMKl5S1qsvMPyDwh0Ptmy2ZY6UOO/SYsKw/6+E4TM7raN oifGxE+CtY9kjrXmoQDrTcwaxQWBNUQP9LSJg9yxUoj3VdPlr4kLOMjX9aBRF5y2qHW1 n6Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=Oi1uY050; 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 o185-20020a6341c2000000b00578bb707e6esi1522526pga.806.2023.10.03.07.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:58 -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=Oi1uY050; 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 33AFD819FC59; Tue, 3 Oct 2023 07:52:57 -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 S240397AbjJCOww (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240328AbjJCOwR (ORCPT ); Tue, 3 Oct 2023 10:52:17 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3956710D2 for ; Tue, 3 Oct 2023 07:51:50 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-40651a726acso9921775e9.1 for ; Tue, 03 Oct 2023 07:51:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344707; x=1696949507; 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=5j3W5gbiwB/5gwTM96ugP2be7g+wEOoUYMu+wXUrQYg=; b=Oi1uY050EtQcWyd6td7XCO114xbZxYCsMwdl3dnnxGbsnmDQHhLQYeHpkxOzf7Wgf9 afRMwRqX/MPFUVgP/UBJL1BL2wDtfHw+RnRGuKqhHgYnKMzwejw10OpaSrKxDBtDQWBy oKIvbWjaEMgSv0zfV+JcOP3UxhE9vz7su1wkefzZ3zbMYxceahVhbjCKUIofZ0z1916C dSEnWU7diLYwX40cbh2q1t1adjGrXg2awcU0v6nxdNryUBR/eJgcxYGWkgWq2wAGnT+3 TzZuZjDHpM+rux6rYLMES3yVRJ9UAE9sr8eYTlKPg1uhZstS5Wmj505iLKoozygk0VFh Kfvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344707; x=1696949507; 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=5j3W5gbiwB/5gwTM96ugP2be7g+wEOoUYMu+wXUrQYg=; b=ZGOG8Tt7MEh8Kzd6vv1p8kKpy/mSWjE0MXaFbYDLuVskAO3awTOZUlRh4DC5y+Z8UT Dc50fGKk0AQkSkWDwSUs7BZx2HxgF9uTscOnFduRpXx2PyLoeEuuepzfHmY2EM/pIpBZ HOv55ErzrsiHVJuLzX0HZ7jpUWpugsW3eZOmsPFzpUAYKnVgl6Znb79VcVAHxHumhBjc wkMGkDh16pJGbc2zQSzgzv88HhACMhgXRchj9uSoN1hZiw/C77ZWGfZo58OcUGNhAsqK 5jiiB2LflYuUjkk/HaGmpxMLJkwBWxpCLovUS+nbuhk7m3f/kXaxtDpz+XphsJ0Kb9Bv bAhA== X-Gm-Message-State: AOJu0Yyt1u6aQf97VssaO88HPPq/pPwm6cuWoG6bDYjmDS+glSulkg2E W5SpzC9tJhyp9vn49pbmRjPCTQ== X-Received: by 2002:a05:600c:3786:b0:405:3ee3:c69c with SMTP id o6-20020a05600c378600b004053ee3c69cmr11960246wmr.15.1696344706839; Tue, 03 Oct 2023 07:51:46 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:46 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Patrice Chotard , Maxime Coquelin , Alexandre Torgue , linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH 29/36] pinctrl: st: use new pinctrl GPIO helpers Date: Tue, 3 Oct 2023 16:51:07 +0200 Message-Id: <20231003145114.21637-30-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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]); Tue, 03 Oct 2023 07:52:57 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746421710671675 X-GMAIL-MSGID: 1778746421710671675 From: Bartosz Golaszewski Replace the pinctrl helpers taking the global GPIO number as argument with the improved variants that instead take a pointer to the GPIO chip and the controller-relative offset. Signed-off-by: Bartosz Golaszewski Reviewed-by: Patrice Chotard --- drivers/pinctrl/pinctrl-st.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c index c1f36b164ea5..ec763572ab3e 100644 --- a/drivers/pinctrl/pinctrl-st.c +++ b/drivers/pinctrl/pinctrl-st.c @@ -719,7 +719,7 @@ static void st_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static int st_gpio_direction_input(struct gpio_chip *chip, unsigned offset) { - pinctrl_gpio_direction_input(chip->base + offset); + pinctrl_gpio_direction_input_new(chip, offset); return 0; } @@ -730,7 +730,7 @@ static int st_gpio_direction_output(struct gpio_chip *chip, struct st_gpio_bank *bank = gpiochip_get_data(chip); __st_gpio_set(bank, offset, value); - pinctrl_gpio_direction_output(chip->base + offset); + pinctrl_gpio_direction_output_new(chip, offset); return 0; } From patchwork Tue Oct 3 14:51:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147939 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139674vqb; Tue, 3 Oct 2023 07:53:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEO5B9jkqN32Zpo1n5OOCaxoxxOa4YCdEpq0RQrLGRjTOcBsp7nHhmByu52vZm1nHmqP5zh X-Received: by 2002:a05:6a00:2da1:b0:68f:cdf3:dd54 with SMTP id fb33-20020a056a002da100b0068fcdf3dd54mr14290179pfb.9.1696344780646; Tue, 03 Oct 2023 07:53:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344780; cv=none; d=google.com; s=arc-20160816; b=rRFP5dLdPkwGYo/8i9kSokumnaFibR8ENoRfq08QSvCkkZT+3JF5JlpRhD6FBWJIGq E/MwZDglovYSnmODvddXTQssePCx8HQRtiOAlLR6gYgwXZ4D4MsllA6dY0L65X/Hawig XJrDlBgQ83RrxozCRj0RcRGmqIhiYMGyY193CSEb3Q/MluJhSCu6rLGjWX6zWXnfC3SD U3hF9bdVOaIq54PsulVy8UUjNHwtKsVtM8gp6Tx+Bh9sWczcfOx9dDeZ+0Yxk2bx/o5x FC3HUcIiJFtDkRYdKCycFub/1Vi3UpRwxYXKcId4BTHWBABw0L73RPWOGS9Sm8N9jcek XX0A== 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=Ttv9l7AK7Knp4l/GqCaoUCjtsDLaLIelMZbGV7bhxeo=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=Tez36fpbp2KdzQVFFwp/js2XNWFORGNfmL/FLb3ykpLYhOEpoR1O6M3ktT4tMJsPY/ cOtQ24KBWmMR6o3nA7cL+puUoqUwR0OI3xjiZodF9W6B1OetkbUJLD+CY9yXWk/mg0V7 XTlUXdDYKMWU74kFQTDMyXvikDJVrrKFxZT9apgPv8vwdG3D9g8wFxMmi0xDDPHe/CSN w4eKqqGGjOc5wAfPxIwLZJdb2NMHAW+aSVVlDM/1E+9zZ8YQSGTs14YUJNFE6I1mlOMS pbtDmtpyX1qLvybZYvFGrsdlpFH22XmVwF6UyfsOLUW21haS1VYA6EFwtP0FSdTWkLAU Lgsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=cAZN2WKL; 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 l65-20020a639144000000b00578a2438d6asi1534504pge.209.2023.10.03.07.53.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:53:00 -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=cAZN2WKL; 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 E0041819FC5F; Tue, 3 Oct 2023 07:52:59 -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 S240106AbjJCOw7 (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240386AbjJCOwR (ORCPT ); Tue, 3 Oct 2023 10:52:17 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C28C10D1 for ; Tue, 3 Oct 2023 07:51:50 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-40652e5718cso10186875e9.3 for ; Tue, 03 Oct 2023 07:51:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344707; x=1696949507; 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=Ttv9l7AK7Knp4l/GqCaoUCjtsDLaLIelMZbGV7bhxeo=; b=cAZN2WKLpNX4+vzDS3hhOXjZYwJ1LQez5OxVtsF17+tRjprWtjfSPou/rRNxABufEb nDqy9p+TdOnndzERe4N67bURAl4xr7d35XxwJW2ge/H9r+zQrsGYR8E8h/PNIJiZBsN2 amkdTWudMQxNGtEg2oQG8noh87BRZVX4vzjInimBg+R8qQA+09YLtBhThSvZRdQtF6Qm pszt2XDZTe1pCPNhEh/JwyD6Dy7XuCccPq6rqzulZMtu9/ZMEi4sdu0i7yQPl6qWoQ2s sM/kW+6D4MHHzwhkT8Nm33tzRO7S0zsixTo6GdvLbZp3WJEmunT9uiuJ45CCxsOn1eH4 Esrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344707; x=1696949507; 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=Ttv9l7AK7Knp4l/GqCaoUCjtsDLaLIelMZbGV7bhxeo=; b=t/GB6zRfw1nbZLNGpCiQijG45nuX7J53QQdDnyaGcD8n8s1b6sZnL8Gbi55eBPnIJ8 eWB3GU9vTmiHQIt4QKAMCD1qoT25bc8CqfD4aaFsGNTHSJiUHlzI/PKnU7gNVZvP7poT SLVxi0CnTEsHwo46Hxz1P/pBe8v5Rg0dHN4RzTnyAxZG44fsuXJJCsyJyMR9/hHSBwAb e0TSpihKl0fu3FIWsLmyIwWkZ5ippwnQsYZ2UcKl7KLFYW8y4/DbbXgzrxACKkvRbZH9 KVZKSGDhB7TapkB9RWc7yGHsuk+7jbzsK9pLcrSdbzamlWPxUa4coCFsr8R8j4ZkJ+GV QGIA== X-Gm-Message-State: AOJu0Yzb14rr0EX/qXdWDvssUAiQ26pUtpxozbI5BP2IDziirX68YjE6 eiUcEubOmMHhJlOhCgM3dBqoHw== X-Received: by 2002:a05:600c:2189:b0:405:7400:1e4c with SMTP id e9-20020a05600c218900b0040574001e4cmr12334144wme.35.1696344707573; Tue, 03 Oct 2023 07:51:47 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:47 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 30/36] pinctrl: remove old GPIO helpers Date: Tue, 3 Oct 2023 16:51:08 +0200 Message-Id: <20231003145114.21637-31-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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]); Tue, 03 Oct 2023 07:52:59 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746424647618680 X-GMAIL-MSGID: 1778746424647618680 From: Bartosz Golaszewski Old variants of pinctrl GPIO helpers are no longer used. Let's remove them as well as convert all static functions in pinctrl/core.c that still deal with global GPIO numbers to using the gpio_chip + offset pairs. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/core.c | 242 ++++++++++++------------------- include/linux/pinctrl/consumer.h | 35 ----- 2 files changed, 94 insertions(+), 183 deletions(-) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 679f48c5beeb..5bad56ed8176 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -268,7 +268,8 @@ static int pinctrl_register_pins(struct pinctrl_dev *pctldev, /** * gpio_to_pin() - GPIO range GPIO number to pin number translation * @range: GPIO range used for the translation - * @gpio: gpio pin to translate to a pin number + * @gc: GPIO chip structure from the GPIO subsystem + * @offset: hardware offset of the GPIO relative to the controller * * Finds the pin number for a given GPIO using the specified GPIO range * as a base for translation. The distinction between linear GPIO ranges @@ -279,25 +280,28 @@ static int pinctrl_register_pins(struct pinctrl_dev *pctldev, * result of successful pinctrl_get_device_gpio_range calls)! */ static inline int gpio_to_pin(struct pinctrl_gpio_range *range, - unsigned int gpio) + struct gpio_chip *gc, unsigned int offset) { - unsigned int offset = gpio - range->base; + unsigned int pin = gc->base + offset - range->base; + if (range->pins) - return range->pins[offset]; + return range->pins[pin]; else - return range->pin_base + offset; + return range->pin_base + pin; } /** * 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; @@ -305,8 +309,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; } @@ -318,7 +322,8 @@ pinctrl_match_gpio_range(struct pinctrl_dev *pctldev, unsigned gpio) /** * pinctrl_ready_for_gpio_range() - check if other GPIO pins of * the same GPIO chip are in range - * @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 * * This function is complement of pinctrl_match_gpio_range(). If the return * value of pinctrl_match_gpio_range() is NULL, this function could be used @@ -329,19 +334,10 @@ pinctrl_match_gpio_range(struct pinctrl_dev *pctldev, unsigned gpio) * is false, it means that pinctrl device may not be ready. */ #ifdef CONFIG_GPIOLIB -static bool pinctrl_ready_for_gpio_range(unsigned gpio) +static bool pinctrl_ready_for_gpio_range(struct gpio_chip *gc) { struct pinctrl_dev *pctldev; struct pinctrl_gpio_range *range = NULL; - /* - * FIXME: "gpio" here is a number in the global GPIO numberspace. - * get rid of this from the ranges eventually and get the GPIO - * descriptor from the gpio_chip. - */ - struct gpio_chip *chip = gpiod_to_chip(gpio_to_desc(gpio)); - - if (WARN(!chip, "no gpio_chip for gpio%i?", gpio)) - return false; mutex_lock(&pinctrldev_list_mutex); @@ -351,8 +347,8 @@ static bool pinctrl_ready_for_gpio_range(unsigned gpio) mutex_lock(&pctldev->mutex); list_for_each_entry(range, &pctldev->gpio_ranges, node) { /* Check if any gpio range overlapped with gpio chip */ - if (range->base + range->npins - 1 < chip->base || - range->base > chip->base + chip->ngpio - 1) + if (range->base + range->npins - 1 < gc->base || + range->base > gc->base + gc->ngpio - 1) continue; mutex_unlock(&pctldev->mutex); mutex_unlock(&pinctrldev_list_mutex); @@ -366,12 +362,13 @@ static bool pinctrl_ready_for_gpio_range(unsigned gpio) return false; } #else -static bool pinctrl_ready_for_gpio_range(unsigned gpio) { return true; } +static bool pinctrl_ready_for_gpio_range(struct gpio_chip *gc) { return true; } #endif /** * pinctrl_get_device_gpio_range() - find device for GPIO range - * @gpio: the pin to locate the pin controller for + * @gc: GPIO chip structure from the GPIO subsystem + * @offset: hardware offset of the GPIO relative to the controller * @outdev: the pin control device if found * @outrange: the GPIO range if found * @@ -380,7 +377,8 @@ static bool pinctrl_ready_for_gpio_range(unsigned gpio) { return true; } * -EPROBE_DEFER if the GPIO range could not be found in any device since it * may still have not been registered. */ -static int pinctrl_get_device_gpio_range(unsigned gpio, +static int pinctrl_get_device_gpio_range(struct gpio_chip *gc, + unsigned int offset, struct pinctrl_dev **outdev, struct pinctrl_gpio_range **outrange) { @@ -392,7 +390,7 @@ static int pinctrl_get_device_gpio_range(unsigned gpio, list_for_each_entry(pctldev, &pinctrldev_list, node) { struct pinctrl_gpio_range *range; - range = pinctrl_match_gpio_range(pctldev, gpio); + range = pinctrl_match_gpio_range(pctldev, gc, offset); if (range) { *outdev = pctldev; *outrange = range; @@ -754,10 +752,10 @@ int pinctrl_get_group_selector(struct pinctrl_dev *pctldev, return -EINVAL; } -bool pinctrl_gpio_can_use_line(unsigned gpio) +bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset) { - struct pinctrl_dev *pctldev; struct pinctrl_gpio_range *range; + struct pinctrl_dev *pctldev; bool result; int pin; @@ -766,56 +764,19 @@ bool pinctrl_gpio_can_use_line(unsigned gpio) * we're probably dealing with GPIO driver * without a backing pin controller - bail out. */ - if (pinctrl_get_device_gpio_range(gpio, &pctldev, &range)) + if (pinctrl_get_device_gpio_range(gc, offset, &pctldev, &range)) return true; - mutex_lock(&pctldev->mutex); - - /* Convert to the pin controllers number space */ - pin = gpio_to_pin(range, gpio); - - result = pinmux_can_be_used_for_gpio(pctldev, pin); - - mutex_unlock(&pctldev->mutex); + scoped_guard(mutex, &pctldev->mutex) { + /* Convert to the pin controllers number space */ + pin = gpio_to_pin(range, gc, offset); + result = pinmux_can_be_used_for_gpio(pctldev, pin); + } return result; } -EXPORT_SYMBOL_GPL(pinctrl_gpio_can_use_line); - -bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset) -{ - return pinctrl_gpio_can_use_line(gc->base + offset); -} EXPORT_SYMBOL_GPL(pinctrl_gpio_can_use_line_new); -/* This function is deprecated and will be removed. Don't use. */ -int pinctrl_gpio_request(unsigned gpio) -{ - struct pinctrl_dev *pctldev; - struct pinctrl_gpio_range *range; - int ret; - int pin; - - ret = pinctrl_get_device_gpio_range(gpio, &pctldev, &range); - if (ret) { - if (pinctrl_ready_for_gpio_range(gpio)) - ret = 0; - return ret; - } - - mutex_lock(&pctldev->mutex); - - /* Convert to the pin controllers number space */ - pin = gpio_to_pin(range, gpio); - - ret = pinmux_request_gpio(pctldev, range, pin, gpio); - - mutex_unlock(&pctldev->mutex); - - return ret; -} -EXPORT_SYMBOL_GPL(pinctrl_gpio_request); - /** * pinctrl_gpio_request_new() - request a single pin to be used as GPIO * @gc: GPIO chip structure from the GPIO subsystem @@ -827,33 +788,29 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_request); */ int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset) { - return pinctrl_gpio_request(gc->base + offset); + struct pinctrl_gpio_range *range; + struct pinctrl_dev *pctldev; + int ret, pin; + + ret = pinctrl_get_device_gpio_range(gc, offset, &pctldev, &range); + if (ret) { + if (pinctrl_ready_for_gpio_range(gc)) + ret = 0; + + return ret; + } + + scoped_guard(mutex, &pctldev->mutex) { + /* Convert to the pin controllers number space */ + pin = gpio_to_pin(range, gc, offset); + ret = pinmux_request_gpio(pctldev, range, pin, + gc->base + offset); + } + + return ret; } EXPORT_SYMBOL_GPL(pinctrl_gpio_request_new); -/* This function is deprecated and will be removed. Don't use. */ -void pinctrl_gpio_free(unsigned gpio) -{ - struct pinctrl_dev *pctldev; - struct pinctrl_gpio_range *range; - int ret; - int pin; - - ret = pinctrl_get_device_gpio_range(gpio, &pctldev, &range); - if (ret) { - return; - } - mutex_lock(&pctldev->mutex); - - /* Convert to the pin controllers number space */ - pin = gpio_to_pin(range, gpio); - - pinmux_free_gpio(pctldev, pin, range); - - mutex_unlock(&pctldev->mutex); -} -EXPORT_SYMBOL_GPL(pinctrl_gpio_free); - /** * pinctrl_gpio_free_new() - free control on a single pin, currently used as GPIO * @gc: GPIO chip structure from the GPIO subsystem @@ -865,40 +822,42 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_free); */ void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset) { - return pinctrl_gpio_free(gc->base + offset); + struct pinctrl_gpio_range *range; + struct pinctrl_dev *pctldev; + int ret, pin; + + ret = pinctrl_get_device_gpio_range(gc, offset, &pctldev, &range); + if (ret) + return; + + guard(mutex)(&pctldev->mutex); + + /* Convert to the pin controllers number space */ + pin = gpio_to_pin(range, gc, offset); + pinmux_free_gpio(pctldev, pin, range); } EXPORT_SYMBOL_GPL(pinctrl_gpio_free_new); -static int pinctrl_gpio_direction(unsigned gpio, bool input) +static int +pinctrl_gpio_direction(struct gpio_chip *gc, unsigned int offset, bool input) { - struct pinctrl_dev *pctldev; struct pinctrl_gpio_range *range; - int ret; - int pin; + struct pinctrl_dev *pctldev; + int ret, pin; - ret = pinctrl_get_device_gpio_range(gpio, &pctldev, &range); - if (ret) { + ret = pinctrl_get_device_gpio_range(gc, offset, &pctldev, &range); + if (ret) return ret; + + scoped_guard(mutex, &pctldev->mutex) { + /* Convert to the pin controllers number space */ + pin = gpio_to_pin(range, gc, offset); + ret = pinmux_gpio_direction(pctldev, range, pin, input); } - mutex_lock(&pctldev->mutex); - - /* Convert to the pin controllers number space */ - pin = gpio_to_pin(range, gpio); - ret = pinmux_gpio_direction(pctldev, range, pin, input); - - mutex_unlock(&pctldev->mutex); - return ret; } -/* This function is deprecated and will be removed. Don't use. */ -int pinctrl_gpio_direction_input(unsigned gpio) -{ - return pinctrl_gpio_direction(gpio, true); -} -EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input); - /** * pinctrl_gpio_direction_input_new() - request a GPIO pin to go into input mode * @gc: GPIO chip structure from the GPIO subsystem @@ -910,17 +869,10 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input); */ int pinctrl_gpio_direction_input_new(struct gpio_chip *gc, unsigned int offset) { - return pinctrl_gpio_direction_input(gc->base + offset); + return pinctrl_gpio_direction(gc, offset, true); } EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input_new); -/* This function is deprecated and will be removed. Don't use. */ -int pinctrl_gpio_direction_output(unsigned gpio) -{ - return pinctrl_gpio_direction(gpio, false); -} -EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output); - /** * pinctrl_gpio_direction_output_new() - request a GPIO pin to go into output * mode @@ -933,31 +885,10 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output); */ int pinctrl_gpio_direction_output_new(struct gpio_chip *gc, unsigned int offset) { - return pinctrl_gpio_direction_output(gc->base + offset); + return pinctrl_gpio_direction(gc, offset, false); } EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output_new); -/* This function is deprecated and will be removed. Don't use. */ -int pinctrl_gpio_set_config(unsigned gpio, unsigned long config) -{ - unsigned long configs[] = { config }; - struct pinctrl_gpio_range *range; - struct pinctrl_dev *pctldev; - int ret, pin; - - ret = pinctrl_get_device_gpio_range(gpio, &pctldev, &range); - if (ret) - return ret; - - mutex_lock(&pctldev->mutex); - pin = gpio_to_pin(range, gpio); - ret = pinconf_set_config(pctldev, pin, configs, ARRAY_SIZE(configs)); - mutex_unlock(&pctldev->mutex); - - return ret; -} -EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config); - /** * pinctrl_gpio_set_config_new() - Apply config to given GPIO pin * @gc: GPIO chip structure from the GPIO subsystem @@ -971,7 +902,22 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config); int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, unsigned long config) { - return pinctrl_gpio_set_config(gc->base + offset, config); + unsigned long configs[] = { config }; + struct pinctrl_gpio_range *range; + struct pinctrl_dev *pctldev; + int ret, pin; + + ret = pinctrl_get_device_gpio_range(gc, offset, &pctldev, &range); + if (ret) + return ret; + + scoped_guard(mutex, &pctldev->mutex) { + pin = gpio_to_pin(range, gc, offset); + ret = pinconf_set_config(pctldev, pin, configs, + ARRAY_SIZE(configs)); + } + + return ret; } EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config_new); diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index c95c13983376..aa3a7a7ca52d 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -26,19 +26,13 @@ struct pinctrl_state; #ifdef CONFIG_PINCTRL /* External interface to pin control */ -bool pinctrl_gpio_can_use_line(unsigned gpio); bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset); -int pinctrl_gpio_request(unsigned gpio); int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset); -void pinctrl_gpio_free(unsigned gpio); void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset); -int pinctrl_gpio_direction_input(unsigned gpio); int pinctrl_gpio_direction_input_new(struct gpio_chip *gc, unsigned int offset); -int pinctrl_gpio_direction_output(unsigned gpio); int pinctrl_gpio_direction_output_new(struct gpio_chip *gc, unsigned int offset); -int pinctrl_gpio_set_config(unsigned gpio, unsigned long config); int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, unsigned long config); @@ -73,64 +67,35 @@ static inline int pinctrl_pm_select_idle_state(struct device *dev) #else /* !CONFIG_PINCTRL */ -static inline bool pinctrl_gpio_can_use_line(unsigned gpio) -{ - return true; -} - static inline bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset) { return true; } -static inline int pinctrl_gpio_request(unsigned gpio) -{ - return 0; -} - static inline int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset) { return 0; } -static inline void pinctrl_gpio_free(unsigned gpio) -{ -} - static inline void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset) { } -static inline int pinctrl_gpio_direction_input(unsigned gpio) -{ - return 0; -} - static inline int pinctrl_gpio_direction_input_new(struct gpio_chip *gc, unsigned int offset) { return 0; } -static inline int pinctrl_gpio_direction_output(unsigned gpio) -{ - return 0; -} - static inline int pinctrl_gpio_direction_output_new(struct gpio_chip *gc, unsigned int offset) { return 0; } -static inline int pinctrl_gpio_set_config(unsigned gpio, unsigned long config) -{ - return 0; -} - static inline int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, unsigned long config) From patchwork Tue Oct 3 14:51:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147937 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139636vqb; Tue, 3 Oct 2023 07:52:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEO9BaglxjX5vILxo4boTCkJnWQna4IzLRnRfUfhMv6SY1hsPuyZoBuL6LhfrGlW59rc+2M X-Received: by 2002:a17:902:ce8b:b0:1c5:be5c:bb5b with SMTP id f11-20020a170902ce8b00b001c5be5cbb5bmr14320305plg.59.1696344777624; Tue, 03 Oct 2023 07:52:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344777; cv=none; d=google.com; s=arc-20160816; b=KiRtH7huWDZ3TTc8xcRHjn7juPXq3B/pt1PNLHy1NAV17s8WWqbSbWfOTPQVpKdv62 E+omZygAu+KMiuPmzWbz7pWtZl4F27/G6p0q1+VzjS9YkHwek2P/OFcb85430j1qVWYD X3f4N7LVTrI8+d86OQo64WsMA+jjdwa69g9XEXUS2gq+BfcGsqBK4eT+Rs/g9aTYsbIq w9kIi5usA8fMUK9z9ualbeXEvGlmZtEI71+cw+n2BpNA9pdxll3d8ruTpsNHHxpXH+fr v8sH4TnBYLRw2cUz7QQNEADH8XCo+UqsWhwi02BRYgNrhkoYiIudNGUzRsSQns0YRnr4 mhew== 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=HAwenNnDV93VvdW3nmGsY557IVyGH4w4EMYdTvU666g=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=zMQSAjoz3kPPEsw1Gdb4PdIyrHS0pemXAyi9+NOxaQyDy1drZrnuexX2xKRhDAdxok x05vDw5f7W29eCQw6umKZ0UV4AJp34QyDuhRVqDHjKOjbRcHFGnKikB4KhBXXTCuN90D oU2m4CaGZbsQMyen/aXFlz/vO7G7Z8v0ogx6bawI00xEFeQjmJ7ae6llkBtDUoYdplir jeV1mC3VBc1NoHyqPk5jvViVjHbgoEbil4YNJjnW5tlrRgNuUdM4j8aniZvc3DGzrp5+ JmaKVcs/qRXzRS/++4mpk/jfWXSQeXaFvRZjDlHpu20hQq1W/8fvOniNuhM1ysRNJ/wU V5dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=nphNHJuT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id t9-20020a17090340c900b001c753d6b95fsi1553079pld.315.2023.10.03.07.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:52:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=nphNHJuT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id D995A82B929A; Tue, 3 Oct 2023 07:52:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240481AbjJCOwy (ORCPT + 17 others); Tue, 3 Oct 2023 10:52:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240234AbjJCOwR (ORCPT ); Tue, 3 Oct 2023 10:52:17 -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 6BF0210D8 for ; Tue, 3 Oct 2023 07:51:51 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4054496bde3so10017485e9.1 for ; Tue, 03 Oct 2023 07:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344708; x=1696949508; 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=HAwenNnDV93VvdW3nmGsY557IVyGH4w4EMYdTvU666g=; b=nphNHJuT1lgf+oKq8xOgGVNqmMn7ac26e7B8+i6yF/erLnCZGMS+afFy7K4VthsxPn A3jCjTJUSoHLOo9N1xyq1n2DfbgTeQGtikYE3KNRT0hLodEMAWOMSZSoxzp3qKpZzKDy y/2IaNRdSxl5+nl/lSwa6g9YxAzJ7hyH8EAaWOjpiKbiyFBGYWNhfPVaZTLnqGO7Dw83 p4kYsVF3Uuz0Nc0ad/TLaZ2TU0Vwv9IeLDBDS3dZwlFsBTaTs/p4XUYBcpH8vE6ZOW1h nu75MDjpDagt02F4QZLkiNYAyOLDcPXTUfgKLpHp3M3eytoX7LI9X524+uMmTgpZechu Fzsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344708; x=1696949508; 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=HAwenNnDV93VvdW3nmGsY557IVyGH4w4EMYdTvU666g=; b=BraWxHwyxfK42H5NWcBX70Qn8PKZQBYAz5rwELbSiCvYZCBSxhZ4tqdft4WemiJsZr EgSzFFtWX8FcxoZM1ZpxfoGI6cdldGfPgMSoTxGS8SI9sFaMREHQvtXyk9EHipL/f3Ao C+4EDcTiT+HF3atwfy8FSWUwG1Ax+V9XjvuapcZ99K41FIIB/GRQvVZrKohO/PnNhRQj +/rk+kRE6Q1X11nS4Z6De1u717JCVkai73zG+3xB+405Psg4k2ar5irT5LvPrKz7IFMb tQu/4a13M61zsc60CpcvGP/PvcIf6qWh9bqHbgCFechs/OXWn+JmdgISumMon08HCFlt GBlQ== X-Gm-Message-State: AOJu0YzSQQHskw+r5E6R/R1Y0EYh7MupdJMGLgZ8Pr3iEvh2bTmakB3m dz9WW6ZAp3B5HoE5cQitkELsCA== X-Received: by 2002:a05:600c:2113:b0:405:1ba2:4fd1 with SMTP id u19-20020a05600c211300b004051ba24fd1mr14474895wml.24.1696344708453; Tue, 03 Oct 2023 07:51:48 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:48 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 31/36] treewide: rename pinctrl_gpio_can_use_line_new() Date: Tue, 3 Oct 2023 16:51:09 +0200 Message-Id: <20231003145114.21637-32-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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 (howler.vger.email [0.0.0.0]); Tue, 03 Oct 2023 07:52:56 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746421441959535 X-GMAIL-MSGID: 1778746421441959535 From: Bartosz Golaszewski Now that pinctrl_gpio_can_use_line() is no longer used, let's drop the '_new' suffix from its improved variant. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpiolib-cdev.c | 2 +- drivers/pinctrl/core.c | 4 ++-- include/linux/pinctrl/consumer.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c index 54ee075410db..02ffda6c1e51 100644 --- a/drivers/gpio/gpiolib-cdev.c +++ b/drivers/gpio/gpiolib-cdev.c @@ -2287,7 +2287,7 @@ static void gpio_desc_to_lineinfo(struct gpio_desc *desc, * FIXME: find a non-racy way to retrieve this information. Maybe a * lock common to both frameworks? */ - ok_for_pinctrl = pinctrl_gpio_can_use_line_new(gc, info->offset); + ok_for_pinctrl = pinctrl_gpio_can_use_line(gc, info->offset); spin_lock_irqsave(&gpio_lock, flags); diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 5bad56ed8176..eb12aec39ed1 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -752,7 +752,7 @@ int pinctrl_get_group_selector(struct pinctrl_dev *pctldev, return -EINVAL; } -bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset) +bool pinctrl_gpio_can_use_line(struct gpio_chip *gc, unsigned int offset) { struct pinctrl_gpio_range *range; struct pinctrl_dev *pctldev; @@ -775,7 +775,7 @@ bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset) return result; } -EXPORT_SYMBOL_GPL(pinctrl_gpio_can_use_line_new); +EXPORT_SYMBOL_GPL(pinctrl_gpio_can_use_line); /** * pinctrl_gpio_request_new() - request a single pin to be used as GPIO diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index aa3a7a7ca52d..4f9ead7f65d2 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -26,7 +26,7 @@ struct pinctrl_state; #ifdef CONFIG_PINCTRL /* External interface to pin control */ -bool pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset); +bool pinctrl_gpio_can_use_line(struct gpio_chip *gc, unsigned int offset); int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset); void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset); int pinctrl_gpio_direction_input_new(struct gpio_chip *gc, @@ -68,7 +68,7 @@ static inline int pinctrl_pm_select_idle_state(struct device *dev) #else /* !CONFIG_PINCTRL */ static inline bool -pinctrl_gpio_can_use_line_new(struct gpio_chip *gc, unsigned int offset) +pinctrl_gpio_can_use_line(struct gpio_chip *gc, unsigned int offset) { return true; } From patchwork Tue Oct 3 14:51:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147951 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2141515vqb; Tue, 3 Oct 2023 07:56:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG6iv2vJ5mbt79tFFoSHuPzbNCmSNAdAlh5MEDRoFiLUejlfNnj6Lj6dlh0271wZIombpyP X-Received: by 2002:a05:6a20:3945:b0:14e:3daf:fdb9 with SMTP id r5-20020a056a20394500b0014e3daffdb9mr17520362pzg.22.1696344990682; Tue, 03 Oct 2023 07:56:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344990; cv=none; d=google.com; s=arc-20160816; b=PGmqiEZU6v8Ol2ZxouTBLTH2YMfdRkqosgBv8LV68/DAGJACnghhi9K8C49UCWFMQE 7UpMWQVw1HX+QSGt/Zb7SpsL50ALK/z3PvgnL4MXPde/M4FppvDRgJhzLJ2M6uMw4ctP ZQvKGqvfGp6wsWgNG89nGv7TZMJbJDW5rmqOOFnCbdm6KOjFxImLijGmGiG/CMyrRTzS GLkaVFzLOpA0eZOTrv0m7X0AFE3MS9RSD2ICcbHVBeKZS4q0QJGDEGalKu0pz5uwOYAt 9Tl7tg5EBBjZouYV7DkHTSOLP2BmGfgFFhdm88UAA2w5uNurO4KlkehyAJtko1wXN7uL BdaA== 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=1G3Tmn2clG9elbTVRato2w4TSxjOdgdl/2ux8u+oR3U=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=EB/moXqXPbrIQcvJqhErue4WwrI48uaDn/ev+J0UEzg3UclzBgunVn/sB9HW52fNn6 rS9MzlR7Ozs2lZk+UN75+o1UwcmFttVghHVkBjkCTHTyIuYhgrni53O0dXUJ8oKhvdqH 7xG7BuXEbkyM30cWu6KruiYnTt42rV7Y2j1k85goniu3wWfjHCZvMbtAJt/gMu1dF4ND zM5HgPN70Mu5J0YfktDWznJBOSHYNDjjmLcoMkFe3P4/IKUcTrEDjvjpeKDwPsf5WMzW J+jJjiQTw1Z0SQm0iE2NJWXWUVtO7LDwXhLWUr6Cu+mV+McT07yWqZHzJANyGBmHLJKC 3OfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=TGYNkwXW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id fh7-20020a056a00390700b0069342eade87si1663218pfb.18.2023.10.03.07.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:56:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=TGYNkwXW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id AD5E5808BE6E; Tue, 3 Oct 2023 07:55:26 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240219AbjJCOxD (ORCPT + 17 others); Tue, 3 Oct 2023 10:53:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240391AbjJCOwR (ORCPT ); Tue, 3 Oct 2023 10:52:17 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 077EA10F1 for ; Tue, 3 Oct 2023 07:51:52 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-405417465aaso10586815e9.1 for ; Tue, 03 Oct 2023 07:51:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344709; x=1696949509; 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=1G3Tmn2clG9elbTVRato2w4TSxjOdgdl/2ux8u+oR3U=; b=TGYNkwXW62jzoMJAoDxnBVTtmvb9uvC7RgiaoBzKn8oiK98EUVbTMoTV5WCdL2TBAN awOoog7VpJzD0DMw6TFB7vGKbAkSla+fdcHZS/9j7vXHGvgVCJjKaT6BtKwZQmGdAAZR WI5uuvDuCT4udkdeXp0x4QZZYZjwClZ+qWF+L2MnXF51Bl+k1k0nR0HkurWt8K4Es3Fh ca7gkECDrB3+oQHjOopGc2jHKsrmDF8jg3a82zguc3K7t5Bh3JZsqN0VrCLvTnqkWpLX n6v6gDPXDam5SB/3uoUvWDuwcjudTSM1OdJzW7kGX2/oJgD7PdeYW5z1dbbZ/qwDu3F5 qISw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344709; x=1696949509; 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=1G3Tmn2clG9elbTVRato2w4TSxjOdgdl/2ux8u+oR3U=; b=v0oBidFw9ChygFbII4OX6mkIKXuhKgmR072pNIAdS76nTHxekKgyxk92pYiVS49La1 VFXK/EApxSqNYy4k4yFt78wV/3QzAND/9WccPCmfXqZ1GjKlhFw/zyYeiWvqfaZnH0rx qImxjCIwvDwt08o+Ekro4la7uFTLBHHE6mwk4r3pg+urz7aC72cCHHIrF15bg0Kw47AM 3/72I9p138aAylKzX4BxjIqKmrWdk5jbrOzKmIaXoWQy8myK+BxO2Gj+02RS/UF3BKSj a8+4H7E+L6NL9ytBGPOF5ifMKPSRwl0afL1haV/M9tJdtSerNqFaxKlLLL/Oz5vp+jOr AwHA== X-Gm-Message-State: AOJu0YxBBQYjTci7EuGAidM1AnTFu/6xiJI05P/PhTT46tKX5SjKLQ7L 8ryxKtnv1O3EtuQsSz9xxjwvpQ== X-Received: by 2002:a05:600c:28c:b0:401:519:d2 with SMTP id 12-20020a05600c028c00b00401051900d2mr11822575wmk.23.1696344709254; Tue, 03 Oct 2023 07:51:49 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:48 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 32/36] treewide: rename pinctrl_gpio_request_new() Date: Tue, 3 Oct 2023 16:51:10 +0200 Message-Id: <20231003145114.21637-33-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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]); Tue, 03 Oct 2023 07:55:26 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746644965851195 X-GMAIL-MSGID: 1778746644965851195 From: Bartosz Golaszewski Now that pinctrl_gpio_request() is no longer used, let's drop the '_new' suffix from its improved variant. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-aspeed.c | 2 +- drivers/gpio/gpio-em.c | 2 +- drivers/gpio/gpio-rcar.c | 2 +- drivers/gpio/gpio-tegra.c | 2 +- drivers/gpio/gpiolib.c | 2 +- drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 +- drivers/pinctrl/core.c | 6 +++--- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2 +- drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 2 +- drivers/pinctrl/renesas/gpio.c | 2 +- drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 +- drivers/pinctrl/renesas/pinctrl-rzv2m.c | 2 +- drivers/pinctrl/spear/pinctrl-plgpio.c | 2 +- drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 2 +- drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 2 +- drivers/pinctrl/stm32/pinctrl-stm32.c | 2 +- include/linux/pinctrl/consumer.h | 4 ++-- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c index d3aa1cfd4ace..af851c89cacc 100644 --- a/drivers/gpio/gpio-aspeed.c +++ b/drivers/gpio/gpio-aspeed.c @@ -750,7 +750,7 @@ static int aspeed_gpio_request(struct gpio_chip *chip, unsigned int offset) if (!have_gpio(gpiochip_get_data(chip), offset)) return -ENODEV; - return pinctrl_gpio_request_new(chip, offset); + return pinctrl_gpio_request(chip, offset); } static void aspeed_gpio_free(struct gpio_chip *chip, unsigned int offset) diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c index 35c65ff43f71..08c5427deb71 100644 --- a/drivers/gpio/gpio-em.c +++ b/drivers/gpio/gpio-em.c @@ -229,7 +229,7 @@ static int em_gio_to_irq(struct gpio_chip *chip, unsigned offset) static int em_gio_request(struct gpio_chip *chip, unsigned offset) { - return pinctrl_gpio_request_new(chip, offset); + return pinctrl_gpio_request(chip, offset); } static void em_gio_free(struct gpio_chip *chip, unsigned offset) diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index 47121e1a6d4e..8c98730a7ad2 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c @@ -275,7 +275,7 @@ static int gpio_rcar_request(struct gpio_chip *chip, unsigned offset) return error; } - error = pinctrl_gpio_request_new(chip, offset); + error = pinctrl_gpio_request(chip, offset); if (error) pm_runtime_put(p->dev); diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c index 08951ddcd294..c974ba368d18 100644 --- a/drivers/gpio/gpio-tegra.c +++ b/drivers/gpio/gpio-tegra.c @@ -139,7 +139,7 @@ static void tegra_gpio_disable(struct tegra_gpio_info *tgi, unsigned int gpio) static int tegra_gpio_request(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_request_new(chip, offset); + return pinctrl_gpio_request(chip, offset); } static void tegra_gpio_free(struct gpio_chip *chip, unsigned int offset) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 511f6220071d..7fc97f7ac3ee 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1854,7 +1854,7 @@ int gpiochip_generic_request(struct gpio_chip *gc, unsigned int offset) return 0; #endif - return pinctrl_gpio_request_new(gc, offset); + return pinctrl_gpio_request(gc, offset); } EXPORT_SYMBOL_GPL(gpiochip_generic_request); diff --git a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c index fb98c3e14743..8162dd840933 100644 --- a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c +++ b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c @@ -335,7 +335,7 @@ static int iproc_gpio_request(struct gpio_chip *gc, unsigned offset) if (!chip->pinmux_is_supported) return 0; - return pinctrl_gpio_request_new(gc, offset); + return pinctrl_gpio_request(gc, offset); } static void iproc_gpio_free(struct gpio_chip *gc, unsigned offset) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index eb12aec39ed1..4ce6c73d9813 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -778,7 +778,7 @@ bool pinctrl_gpio_can_use_line(struct gpio_chip *gc, unsigned int offset) EXPORT_SYMBOL_GPL(pinctrl_gpio_can_use_line); /** - * pinctrl_gpio_request_new() - request a single pin to be used as GPIO + * pinctrl_gpio_request() - request a single pin to be used as GPIO * @gc: GPIO chip structure from the GPIO subsystem * @offset: hardware offset of the GPIO relative to the controller * @@ -786,7 +786,7 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_can_use_line); * as part of their gpio_request() semantics, platforms and individual drivers * shall *NOT* request GPIO pins to be muxed in. */ -int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset) +int pinctrl_gpio_request(struct gpio_chip *gc, unsigned int offset) { struct pinctrl_gpio_range *range; struct pinctrl_dev *pctldev; @@ -809,7 +809,7 @@ int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset) return ret; } -EXPORT_SYMBOL_GPL(pinctrl_gpio_request_new); +EXPORT_SYMBOL_GPL(pinctrl_gpio_request); /** * pinctrl_gpio_free_new() - free control on a single pin, currently used as GPIO diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c index 62134a7f0b4e..ad39b8c060b7 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c @@ -201,7 +201,7 @@ static int npcmgpio_gpio_request(struct gpio_chip *chip, unsigned int offset) int ret; dev_dbg(chip->parent, "gpio_request: offset%d\n", offset); - ret = pinctrl_gpio_request_new(chip, offset); + ret = pinctrl_gpio_request(chip, offset); if (ret) return ret; diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c index 0b6d6964087e..dd4532ae62bf 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c @@ -198,7 +198,7 @@ static int npcmgpio_gpio_request(struct gpio_chip *chip, unsigned int offset) struct npcm8xx_gpio *bank = gpiochip_get_data(chip); int ret; - ret = pinctrl_gpio_request_new(chip, offset); + ret = pinctrl_gpio_request(chip, offset); if (ret) return ret; diff --git a/drivers/pinctrl/renesas/gpio.c b/drivers/pinctrl/renesas/gpio.c index e7771a57e6d1..0c4f4d8d0891 100644 --- a/drivers/pinctrl/renesas/gpio.c +++ b/drivers/pinctrl/renesas/gpio.c @@ -135,7 +135,7 @@ static int gpio_pin_request(struct gpio_chip *gc, unsigned offset) if (idx < 0 || pfc->info->pins[idx].enum_id == 0) return -EINVAL; - return pinctrl_gpio_request_new(gc, offset); + return pinctrl_gpio_request(gc, offset); } static void gpio_pin_free(struct gpio_chip *gc, unsigned offset) diff --git a/drivers/pinctrl/renesas/pinctrl-rzg2l.c b/drivers/pinctrl/renesas/pinctrl-rzg2l.c index b9195fff0abd..d7ce56243a78 100644 --- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c +++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c @@ -801,7 +801,7 @@ static int rzg2l_gpio_request(struct gpio_chip *chip, unsigned int offset) u8 reg8; int ret; - ret = pinctrl_gpio_request_new(chip, offset); + ret = pinctrl_gpio_request(chip, offset); if (ret) return ret; diff --git a/drivers/pinctrl/renesas/pinctrl-rzv2m.c b/drivers/pinctrl/renesas/pinctrl-rzv2m.c index 3d29c77a5aad..1ec0922f735c 100644 --- a/drivers/pinctrl/renesas/pinctrl-rzv2m.c +++ b/drivers/pinctrl/renesas/pinctrl-rzv2m.c @@ -754,7 +754,7 @@ static int rzv2m_gpio_request(struct gpio_chip *chip, unsigned int offset) u8 bit = RZV2M_PIN_ID_TO_PIN(offset); int ret; - ret = pinctrl_gpio_request_new(chip, offset); + ret = pinctrl_gpio_request(chip, offset); if (ret) return ret; diff --git a/drivers/pinctrl/spear/pinctrl-plgpio.c b/drivers/pinctrl/spear/pinctrl-plgpio.c index 7488f6394318..6d3b7ce1c35a 100644 --- a/drivers/pinctrl/spear/pinctrl-plgpio.c +++ b/drivers/pinctrl/spear/pinctrl-plgpio.c @@ -210,7 +210,7 @@ static int plgpio_request(struct gpio_chip *chip, unsigned offset) if (offset >= chip->ngpio) return -EINVAL; - ret = pinctrl_gpio_request_new(chip, offset); + ret = pinctrl_gpio_request(chip, offset); if (ret) return ret; diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c index 22a2db8fa315..88e39f68ef25 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c @@ -918,7 +918,7 @@ static struct pinctrl_desc starfive_desc = { static int starfive_gpio_request(struct gpio_chip *gc, unsigned int gpio) { - return pinctrl_gpio_request_new(gc, gpio); + return pinctrl_gpio_request(gc, gpio); } static void starfive_gpio_free(struct gpio_chip *gc, unsigned int gpio) diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c index 5557ef3fbeb2..c458c6fb992f 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c @@ -547,7 +547,7 @@ static const struct pinconf_ops jh7110_pinconf_ops = { static int jh7110_gpio_request(struct gpio_chip *gc, unsigned int gpio) { - return pinctrl_gpio_request_new(gc, gpio); + return pinctrl_gpio_request(gc, gpio); } static void jh7110_gpio_free(struct gpio_chip *gc, unsigned int gpio) diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c index 11d9f07934bd..dddbdc1a64c5 100644 --- a/drivers/pinctrl/stm32/pinctrl-stm32.c +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c @@ -217,7 +217,7 @@ static int stm32_gpio_request(struct gpio_chip *chip, unsigned offset) return -EINVAL; } - return pinctrl_gpio_request_new(chip, offset); + return pinctrl_gpio_request(chip, offset); } static void stm32_gpio_free(struct gpio_chip *chip, unsigned offset) diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index 4f9ead7f65d2..05b2dae05f24 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -27,7 +27,7 @@ struct pinctrl_state; /* External interface to pin control */ bool pinctrl_gpio_can_use_line(struct gpio_chip *gc, unsigned int offset); -int pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset); +int pinctrl_gpio_request(struct gpio_chip *gc, unsigned int offset); void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset); int pinctrl_gpio_direction_input_new(struct gpio_chip *gc, unsigned int offset); @@ -74,7 +74,7 @@ pinctrl_gpio_can_use_line(struct gpio_chip *gc, unsigned int offset) } static inline int -pinctrl_gpio_request_new(struct gpio_chip *gc, unsigned int offset) +pinctrl_gpio_request(struct gpio_chip *gc, unsigned int offset) { return 0; } From patchwork Tue Oct 3 14:51:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147952 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2141557vqb; Tue, 3 Oct 2023 07:56:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFZe4eWQ65rlI41fZxP/JXsH+FOlAr83LcsOMPfXpklJjpmJHMO4Rixf62rmvuyMtoQFrtu X-Received: by 2002:a05:6870:a9a0:b0:1c8:bbd0:2fd1 with SMTP id ep32-20020a056870a9a000b001c8bbd02fd1mr16286967oab.41.1696344994358; Tue, 03 Oct 2023 07:56:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344994; cv=none; d=google.com; s=arc-20160816; b=KB1mjBIzxsUwLxO5DHBRZJMHwXdgmO5iWIr7yegQY3XmTvzhBx/moqYkXBK3qBMhYl nU7rbkqjxeijcTvOFmNtSqGI1HyT59nwOz98TABVulM03OlYKr20lJIAWhgKfB1HkKhp mksneyxHRczzC3pwv+wvqsKR5ahxvF/m1gwsq7CVjsgRjdhQ6e8Bh8G3UYJDiCU+zuvd 8EVPGZo4NN+EKfSeCdiaIQpa+YBIUjSbLkxCkxr20+gR59s8MKq296prrWnWrGpwyPnf b3FFUuy9hsAMl0UCTVMtDHLL/uItYtzq1l5U3vh8QKsFJIT36uHw0c+JWqyiuq9Y+O7D 1cqg== 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=QD/Zlm24xgzWQIeTfXQyDEwwapAwCxRM4ttewmKBxic=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=Xeb2pFLuNCaHPBCC0Ipiwh7RXrnRRPeHWYGhVs+zRbaVlIVIuF5uc/iwN65h5sZuDr D0V8UbiL7D/2d2P7GFOJID6vXPD/28b4d1KO8KLkho8aYoKqGj8jhjsv8stOBisjaN5M lw5HjJpYf9JUo0iL2cPzjh2FXwjUwfIMuuUYkoSj5HOUYyYpywSFJE9RBD1LaKIuGu2W tRSVrJjfl3Ih5bdOc5M0ZmhqJZVG+/gEZyCSBbZB5zlPa+ncuLzfBgCm9/RaYsxAxmVn gm83vrmJIaTnG4Sh3lykuCcU+nFtggUc0+PVf2z5q4ADwjshBLuEhQHtP/URZxoIYZtr tuAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=g+ZBnteu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id v36-20020a634664000000b00577516d9a0bsi1634006pgk.502.2023.10.03.07.56.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:56:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=g+ZBnteu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 96566809D454; Tue, 3 Oct 2023 07:55:25 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240345AbjJCOxH (ORCPT + 17 others); Tue, 3 Oct 2023 10:53:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240225AbjJCOwS (ORCPT ); Tue, 3 Oct 2023 10:52:18 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0253510F0 for ; Tue, 3 Oct 2023 07:51:52 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4065dea9a33so9889645e9.3 for ; Tue, 03 Oct 2023 07:51:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344710; x=1696949510; 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=QD/Zlm24xgzWQIeTfXQyDEwwapAwCxRM4ttewmKBxic=; b=g+ZBnteu4ScWu9AkW+FedyrjJdRaOiXQ0suGY5P0qOwET7GWmfReBOF1JPsXX0NOt8 4NY1VRD4bBrx1EIHldrigzNd1FnmWzXmIOz9iFvX1ZaaICkc44muzmHvlnzrdwh33JXV 8a6vn27i/3Ec5mju+bbG0s5fgoadDOJADqzr6tAIiuA+OK8ADTX/2F8IrEa3m9X3a14e wT56p/MBhKG3xl93oXf47FspWwq0DhpLwK5/Ok5q9n3tSfUH+yLS04BGAricXeXS8ttS EADBThY2YFSHvgjhNr2W/TjjiPJ94te+oRiRgOP/bTpy5OGq3EyGJrLq/Giutv6Mbbmk kvig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344710; x=1696949510; 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=QD/Zlm24xgzWQIeTfXQyDEwwapAwCxRM4ttewmKBxic=; b=avOyopKXUDGTtNHkMEoIpO87QMfEII0jLLTYvkDoGoXw8M6UthbnPTlH8QF0RjwN2k NulI5BPmRYK7TE153C0Ex+KIk+u2e6SYt33c5Uk3M4uZaWNFsihlhEVnK1vdM92ojHLd jQmCtgsQbkpKh/AsrIFMeemdFN4+hb/4Jlotnbvweg2+vnE0gRKNQLsTCnVUTHqWuO4k W/QKLDv/k5xYaSqXSBZ6WFbIR1haNWQRurLchB9IDHrxKTDH0DQBmpQHGJ2xsNDLtx21 ePIPf7X/b3t0F+Mwrv/kzBhs+sanWPNAYZTOsZvjxg42Qgol2Hh/HouZyzSJZJQYDNO2 7XvQ== X-Gm-Message-State: AOJu0Yz++31N7dZeLUGaHDqIJhm0gJdu68YV3XmEOv1RIxpi5asePyAB EvP32Y9NfmSfV90STl+VD2Hncg== X-Received: by 2002:a7b:c3d0:0:b0:404:732b:674f with SMTP id t16-20020a7bc3d0000000b00404732b674fmr14995525wmj.34.1696344710450; Tue, 03 Oct 2023 07:51:50 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:50 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 33/36] treewide: rename pinctrl_gpio_free_new() Date: Tue, 3 Oct 2023 16:51:11 +0200 Message-Id: <20231003145114.21637-34-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Tue, 03 Oct 2023 07:55:25 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746649097806052 X-GMAIL-MSGID: 1778746649097806052 From: Bartosz Golaszewski Now that pinctrl_gpio_free()() is no longer used, let's drop the '_new' suffix from its improved variant. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-aspeed.c | 2 +- drivers/gpio/gpio-em.c | 2 +- drivers/gpio/gpio-rcar.c | 2 +- drivers/gpio/gpio-tegra.c | 2 +- drivers/gpio/gpiolib.c | 2 +- drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 +- drivers/pinctrl/core.c | 6 +++--- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2 +- drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 2 +- drivers/pinctrl/renesas/gpio.c | 2 +- drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 +- drivers/pinctrl/renesas/pinctrl-rzv2m.c | 2 +- drivers/pinctrl/spear/pinctrl-plgpio.c | 4 ++-- drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 2 +- drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 2 +- drivers/pinctrl/stm32/pinctrl-stm32.c | 2 +- include/linux/pinctrl/consumer.h | 4 ++-- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c index af851c89cacc..4c417c8486dd 100644 --- a/drivers/gpio/gpio-aspeed.c +++ b/drivers/gpio/gpio-aspeed.c @@ -755,7 +755,7 @@ static int aspeed_gpio_request(struct gpio_chip *chip, unsigned int offset) static void aspeed_gpio_free(struct gpio_chip *chip, unsigned int offset) { - pinctrl_gpio_free_new(chip, offset); + pinctrl_gpio_free(chip, offset); } static int usecs_to_cycles(struct aspeed_gpio *gpio, unsigned long usecs, diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c index 08c5427deb71..aa31c189d0ef 100644 --- a/drivers/gpio/gpio-em.c +++ b/drivers/gpio/gpio-em.c @@ -234,7 +234,7 @@ static int em_gio_request(struct gpio_chip *chip, unsigned offset) static void em_gio_free(struct gpio_chip *chip, unsigned offset) { - pinctrl_gpio_free_new(chip, offset); + pinctrl_gpio_free(chip, offset); /* Set the GPIO as an input to ensure that the next GPIO request won't * drive the GPIO pin as an output. diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index 8c98730a7ad2..6159fda38d5d 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c @@ -286,7 +286,7 @@ static void gpio_rcar_free(struct gpio_chip *chip, unsigned offset) { struct gpio_rcar_priv *p = gpiochip_get_data(chip); - pinctrl_gpio_free_new(chip, offset); + pinctrl_gpio_free(chip, offset); /* * Set the GPIO as an input to ensure that the next GPIO request won't diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c index c974ba368d18..fcb3b474d1df 100644 --- a/drivers/gpio/gpio-tegra.c +++ b/drivers/gpio/gpio-tegra.c @@ -146,7 +146,7 @@ static void tegra_gpio_free(struct gpio_chip *chip, unsigned int offset) { struct tegra_gpio_info *tgi = gpiochip_get_data(chip); - pinctrl_gpio_free_new(chip, offset); + pinctrl_gpio_free(chip, offset); tegra_gpio_disable(tgi, offset); } diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 7fc97f7ac3ee..d7c23be24904 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1870,7 +1870,7 @@ void gpiochip_generic_free(struct gpio_chip *gc, unsigned int offset) return; #endif - pinctrl_gpio_free_new(gc, offset); + pinctrl_gpio_free(gc, offset); } EXPORT_SYMBOL_GPL(gpiochip_generic_free); diff --git a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c index 8162dd840933..fd5ce52d05b1 100644 --- a/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c +++ b/drivers/pinctrl/bcm/pinctrl-iproc-gpio.c @@ -345,7 +345,7 @@ static void iproc_gpio_free(struct gpio_chip *gc, unsigned offset) if (!chip->pinmux_is_supported) return; - pinctrl_gpio_free_new(gc, offset); + pinctrl_gpio_free(gc, offset); } static int iproc_gpio_direction_input(struct gpio_chip *gc, unsigned gpio) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 4ce6c73d9813..f0fe3de09fee 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -812,7 +812,7 @@ int pinctrl_gpio_request(struct gpio_chip *gc, unsigned int offset) EXPORT_SYMBOL_GPL(pinctrl_gpio_request); /** - * pinctrl_gpio_free_new() - free control on a single pin, currently used as GPIO + * pinctrl_gpio_free() - free control on a single pin, currently used as GPIO * @gc: GPIO chip structure from the GPIO subsystem * @offset: hardware offset of the GPIO relative to the controller * @@ -820,7 +820,7 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_request); * as part of their gpio_request() semantics, platforms and individual drivers * shall *NOT* request GPIO pins to be muxed in. */ -void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset) +void pinctrl_gpio_free(struct gpio_chip *gc, unsigned int offset) { struct pinctrl_gpio_range *range; struct pinctrl_dev *pctldev; @@ -836,7 +836,7 @@ void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset) pin = gpio_to_pin(range, gc, offset); pinmux_free_gpio(pctldev, pin, range); } -EXPORT_SYMBOL_GPL(pinctrl_gpio_free_new); +EXPORT_SYMBOL_GPL(pinctrl_gpio_free); static int pinctrl_gpio_direction(struct gpio_chip *gc, unsigned int offset, bool input) diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c index ad39b8c060b7..ab7cfc1e66f0 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c @@ -211,7 +211,7 @@ static int npcmgpio_gpio_request(struct gpio_chip *chip, unsigned int offset) static void npcmgpio_gpio_free(struct gpio_chip *chip, unsigned int offset) { dev_dbg(chip->parent, "gpio_free: offset%d\n", offset); - pinctrl_gpio_free_new(chip, offset); + pinctrl_gpio_free(chip, offset); } static void npcmgpio_irq_handler(struct irq_desc *desc) diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c index dd4532ae62bf..78dbeef6af86 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c @@ -207,7 +207,7 @@ static int npcmgpio_gpio_request(struct gpio_chip *chip, unsigned int offset) static void npcmgpio_gpio_free(struct gpio_chip *chip, unsigned int offset) { - pinctrl_gpio_free_new(chip, offset); + pinctrl_gpio_free(chip, offset); } static void npcmgpio_irq_handler(struct irq_desc *desc) diff --git a/drivers/pinctrl/renesas/gpio.c b/drivers/pinctrl/renesas/gpio.c index 0c4f4d8d0891..b39125a632b0 100644 --- a/drivers/pinctrl/renesas/gpio.c +++ b/drivers/pinctrl/renesas/gpio.c @@ -140,7 +140,7 @@ static int gpio_pin_request(struct gpio_chip *gc, unsigned offset) static void gpio_pin_free(struct gpio_chip *gc, unsigned offset) { - return pinctrl_gpio_free_new(gc, offset); + return pinctrl_gpio_free(gc, offset); } static void gpio_pin_set_value(struct sh_pfc_chip *chip, unsigned offset, diff --git a/drivers/pinctrl/renesas/pinctrl-rzg2l.c b/drivers/pinctrl/renesas/pinctrl-rzg2l.c index d7ce56243a78..e25fa47fec50 100644 --- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c +++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c @@ -920,7 +920,7 @@ static void rzg2l_gpio_free(struct gpio_chip *chip, unsigned int offset) { unsigned int virq; - pinctrl_gpio_free_new(chip, offset); + pinctrl_gpio_free(chip, offset); virq = irq_find_mapping(chip->irq.domain, offset); if (virq) diff --git a/drivers/pinctrl/renesas/pinctrl-rzv2m.c b/drivers/pinctrl/renesas/pinctrl-rzv2m.c index 1ec0922f735c..21d7d5ac8c4a 100644 --- a/drivers/pinctrl/renesas/pinctrl-rzv2m.c +++ b/drivers/pinctrl/renesas/pinctrl-rzv2m.c @@ -832,7 +832,7 @@ static int rzv2m_gpio_get(struct gpio_chip *chip, unsigned int offset) static void rzv2m_gpio_free(struct gpio_chip *chip, unsigned int offset) { - pinctrl_gpio_free_new(chip, offset); + pinctrl_gpio_free(chip, offset); /* * Set the GPIO as an input to ensure that the next GPIO request won't diff --git a/drivers/pinctrl/spear/pinctrl-plgpio.c b/drivers/pinctrl/spear/pinctrl-plgpio.c index 6d3b7ce1c35a..a05570c7d833 100644 --- a/drivers/pinctrl/spear/pinctrl-plgpio.c +++ b/drivers/pinctrl/spear/pinctrl-plgpio.c @@ -248,7 +248,7 @@ static int plgpio_request(struct gpio_chip *chip, unsigned offset) if (!IS_ERR(plgpio->clk)) clk_disable(plgpio->clk); err0: - pinctrl_gpio_free_new(chip, offset); + pinctrl_gpio_free(chip, offset); return ret; } @@ -278,7 +278,7 @@ static void plgpio_free(struct gpio_chip *chip, unsigned offset) if (!IS_ERR(plgpio->clk)) clk_disable(plgpio->clk); - pinctrl_gpio_free_new(chip, offset); + pinctrl_gpio_free(chip, offset); } /* PLGPIO IRQ */ diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c index 88e39f68ef25..7beed57d665a 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c @@ -923,7 +923,7 @@ static int starfive_gpio_request(struct gpio_chip *gc, unsigned int gpio) static void starfive_gpio_free(struct gpio_chip *gc, unsigned int gpio) { - pinctrl_gpio_free_new(gc, gpio); + pinctrl_gpio_free(gc, gpio); } static int starfive_gpio_get_direction(struct gpio_chip *gc, unsigned int gpio) diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c index c458c6fb992f..695c8c0a6e8b 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c @@ -552,7 +552,7 @@ static int jh7110_gpio_request(struct gpio_chip *gc, unsigned int gpio) static void jh7110_gpio_free(struct gpio_chip *gc, unsigned int gpio) { - pinctrl_gpio_free_new(gc, gpio); + pinctrl_gpio_free(gc, gpio); } static int jh7110_gpio_get_direction(struct gpio_chip *gc, diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c index dddbdc1a64c5..e4453fa58f9e 100644 --- a/drivers/pinctrl/stm32/pinctrl-stm32.c +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c @@ -222,7 +222,7 @@ static int stm32_gpio_request(struct gpio_chip *chip, unsigned offset) static void stm32_gpio_free(struct gpio_chip *chip, unsigned offset) { - pinctrl_gpio_free_new(chip, offset); + pinctrl_gpio_free(chip, offset); } static int stm32_gpio_get(struct gpio_chip *chip, unsigned offset) diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index 05b2dae05f24..55b465edaff1 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -28,7 +28,7 @@ struct pinctrl_state; /* External interface to pin control */ bool pinctrl_gpio_can_use_line(struct gpio_chip *gc, unsigned int offset); int pinctrl_gpio_request(struct gpio_chip *gc, unsigned int offset); -void pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset); +void pinctrl_gpio_free(struct gpio_chip *gc, unsigned int offset); int pinctrl_gpio_direction_input_new(struct gpio_chip *gc, unsigned int offset); int pinctrl_gpio_direction_output_new(struct gpio_chip *gc, @@ -80,7 +80,7 @@ pinctrl_gpio_request(struct gpio_chip *gc, unsigned int offset) } static inline void -pinctrl_gpio_free_new(struct gpio_chip *gc, unsigned int offset) +pinctrl_gpio_free(struct gpio_chip *gc, unsigned int offset) { } From patchwork Tue Oct 3 14:51: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: 147950 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2141001vqb; Tue, 3 Oct 2023 07:55:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE+mGn3d8yaDPV+Gs1DgiiliFUDhS2XWxDUBohoOzpQn9jEw/kjh9fjxjHhO9Ye5O9ZscLj X-Received: by 2002:a17:90a:fc8d:b0:268:5575:93d9 with SMTP id ci13-20020a17090afc8d00b00268557593d9mr11854523pjb.10.1696344934061; Tue, 03 Oct 2023 07:55:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344934; cv=none; d=google.com; s=arc-20160816; b=XhSvDYRMBUmIsvUX7DyPIpZ+MeLeiQRldvVUuO/MvNu0PqGNy4T3Q9mtkLoqgo+Yl+ /rB3SyAPsw+VWgCwj62RPem2VbnqONVYNrikeJ6pnw8k6rppx8Om1f+jGAwMvyZx+Bwf G86zkI1g/XkyAVlcx2K7aqyHaLTXDHp+H0ZwXjDDrP3woUIYYyKxw9Gtxg3B3vSDRdR+ hCYaFvVENcCOygkiShuGcQuD+kB9KUIssF4K3QpXldJYW+K15Pj1fGJhzSFMzLRgvwDT fVZ5lK/3XHcJJLvcHS/SrKmi7rJFgBZQ4NVMK1j83Ux/T78a9v27nI2QiMbKuBrmb6Dg 2RIg== 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=HoKE+kB78wuNsR4Ebz8cYRNngNBuNrlvwIVBfu/2XZo=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=H+pkDiwA5MaB/oYiBdqeG4RxUcWEbaMEAWAmPal0fynjygBTIbu/1+0a424HKHPr5n 0x65U3+rQdhVvKnCvWKtVd1SPk7Ue9LetJ/6DIkx6hjEdSDT+0hFpAX7/ixpOPmE8794 ym8mMQ1AZQOME3KHG60GjxyFtmQQOr0bs4gPLfYA4i1Lj03Jnqqfnc+yyVDqG07f34kF +AFocttn5yO4RAmLmWBAHWT7OFpJU5RgnAK6Ghkd7LaX3vMK1RByCv3VK9uUF0UTNqBE B0+nVRWiKHy4jEH3wTWP74gL5eI9/aPluLCJCIi4c6Heq6FXobO5ArR65a4iy583OI7o /CWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=pbF+n6nO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id mi1-20020a17090b4b4100b00276671731e3si10876674pjb.136.2023.10.03.07.55.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:55:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=pbF+n6nO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 6EAA48076E43; Tue, 3 Oct 2023 07:55:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240567AbjJCOye (ORCPT + 17 others); Tue, 3 Oct 2023 10:54:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240600AbjJCOy3 (ORCPT ); Tue, 3 Oct 2023 10:54:29 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C58621729 for ; Tue, 3 Oct 2023 07:51:56 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4060b623e64so6340545e9.0 for ; Tue, 03 Oct 2023 07:51:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344712; x=1696949512; 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=HoKE+kB78wuNsR4Ebz8cYRNngNBuNrlvwIVBfu/2XZo=; b=pbF+n6nOlqGCpbMo6l6kP/qnPACDoCr/hW79Iq0TpO0SipjLQeX49V96UpIc00tX3H UxZurUxBEhgf4sKoOxpP1z6rLSJLjwU6a33kU0rjWLltIacbFkEpR0NBMbnLs2wwyFqv klwREI+awXIo/0/Lq5wkvrQ1rX0IUFZTWZEz+6druP2RKdRdOJXqg2rFCnHbicl/7cWl LCaFpgJD1F7bZSwPxuCtyhv0TA5kWTbcNi+6sFlwxjJVUwZYfTkybgOhWEA3LlrqsX5N xpo+NNc37uzg/+HpNIqesIJ8gX05ObSj+IxgcnywDyV+d49uXfkpIHQKW/Q0U25SC68/ bDQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344712; x=1696949512; 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=HoKE+kB78wuNsR4Ebz8cYRNngNBuNrlvwIVBfu/2XZo=; b=cwf033+GeVcyqPu6fsnpB9mqTODFYHPM2ZiLqx28qs9zy8+7EYMz886Dq/Oe27Y+cz ZHHFDoXeWtL5t01+BuAXkJssRHXdWgQavmtdBejiNZ+0FroqmGcK6vLB+G0t+AZ3JoXb sLQ4CK0KI1I5T3K4PMA5BzptOSi9oHwXYkC0qaxQNEI7PdrsEUBzBc3zgBiB2WKCEf2m qH2jh4rZ1bWz7GCzE73Huw9pf4Sl51RSGtlcLvKvCxzevQVDCndBqVvX6kQAt4Ml5UUk iG//pQktzvMPdcV/re28a/gZ82JeA4F/E15WOU3kNMRiJmm25BNABm+cT92TeO5RWJl9 nrJQ== X-Gm-Message-State: AOJu0YxAnP+dZf+R9qULIha+qwhuoG+Axtas66C/AvP/MRUenjK4nfY0 SrdMzB1TJArKtlJ5JQzx3RxFuA== X-Received: by 2002:a1c:7408:0:b0:405:3924:3cad with SMTP id p8-20020a1c7408000000b0040539243cadmr2391845wmc.15.1696344711975; Tue, 03 Oct 2023 07:51:51 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:50 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 34/36] treewide: rename pinctrl_gpio_direction_input_new() Date: Tue, 3 Oct 2023 16:51:12 +0200 Message-Id: <20231003145114.21637-35-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-1-brgl@bgdev.pl> MIME-Version: 1.0 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 (groat.vger.email [0.0.0.0]); Tue, 03 Oct 2023 07:55:08 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746585585208967 X-GMAIL-MSGID: 1778746585585208967 From: Bartosz Golaszewski Now that pinctrl_gpio_direction_input() is no longer used, let's drop the '_new' suffix from its improved variant. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-mvebu.c | 2 +- drivers/gpio/gpio-pxa.c | 2 +- drivers/gpio/gpio-rockchip.c | 2 +- drivers/gpio/gpio-tegra.c | 2 +- drivers/gpio/gpio-vf610.c | 2 +- drivers/pinctrl/cirrus/pinctrl-cs42l43.c | 2 +- drivers/pinctrl/core.c | 6 +++--- drivers/pinctrl/intel/pinctrl-cherryview.c | 2 +- drivers/pinctrl/intel/pinctrl-intel.c | 2 +- drivers/pinctrl/intel/pinctrl-lynxpoint.c | 2 +- drivers/pinctrl/mediatek/pinctrl-moore.c | 2 +- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 2 +- drivers/pinctrl/mediatek/pinctrl-paris.c | 2 +- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2 +- drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 2 +- drivers/pinctrl/pinctrl-as3722.c | 2 +- drivers/pinctrl/pinctrl-axp209.c | 2 +- drivers/pinctrl/pinctrl-cy8c95x0.c | 2 +- drivers/pinctrl/pinctrl-ingenic.c | 2 +- drivers/pinctrl/pinctrl-ocelot.c | 2 +- drivers/pinctrl/pinctrl-rk805.c | 2 +- drivers/pinctrl/pinctrl-st.c | 2 +- drivers/pinctrl/renesas/gpio.c | 2 +- drivers/pinctrl/stm32/pinctrl-stm32.c | 2 +- drivers/pinctrl/vt8500/pinctrl-wmt.c | 2 +- include/linux/pinctrl/consumer.h | 6 +++--- 26 files changed, 30 insertions(+), 30 deletions(-) diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c index 8fada9cd258a..20f788240481 100644 --- a/drivers/gpio/gpio-mvebu.c +++ b/drivers/gpio/gpio-mvebu.c @@ -345,7 +345,7 @@ static int mvebu_gpio_direction_input(struct gpio_chip *chip, unsigned int pin) * Check with the pinctrl driver whether this pin is usable as * an input GPIO */ - ret = pinctrl_gpio_direction_input_new(chip, pin); + ret = pinctrl_gpio_direction_input(chip, pin); if (ret) return ret; diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index 2fd797b91270..c60197d5fde0 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c @@ -260,7 +260,7 @@ static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset) int ret; if (pxa_gpio_has_pinctrl()) { - ret = pinctrl_gpio_direction_input_new(chip, offset); + ret = pinctrl_gpio_direction_input(chip, offset); if (ret) return ret; } diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c index 3576793f0bd9..05afb67fd677 100644 --- a/drivers/gpio/gpio-rockchip.c +++ b/drivers/gpio/gpio-rockchip.c @@ -159,7 +159,7 @@ static int rockchip_gpio_set_direction(struct gpio_chip *chip, if (input) - pinctrl_gpio_direction_input_new(chip, offset); + pinctrl_gpio_direction_input(chip, offset); else pinctrl_gpio_direction_output_new(chip, offset); diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c index fcb3b474d1df..a9a00b28cc55 100644 --- a/drivers/gpio/gpio-tegra.c +++ b/drivers/gpio/gpio-tegra.c @@ -179,7 +179,7 @@ static int tegra_gpio_direction_input(struct gpio_chip *chip, tegra_gpio_mask_write(tgi, GPIO_MSK_OE(tgi, offset), offset, 0); tegra_gpio_enable(tgi, offset); - ret = pinctrl_gpio_direction_input_new(chip, offset); + ret = pinctrl_gpio_direction_input(chip, offset); if (ret < 0) dev_err(tgi->dev, "Failed to set pinctrl input direction of GPIO %d: %d", diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c index 32142b9564f9..6551f80c3e51 100644 --- a/drivers/gpio/gpio-vf610.c +++ b/drivers/gpio/gpio-vf610.c @@ -116,7 +116,7 @@ static int vf610_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR); } - return pinctrl_gpio_direction_input_new(chip, gpio); + return pinctrl_gpio_direction_input(chip, gpio); } static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, diff --git a/drivers/pinctrl/cirrus/pinctrl-cs42l43.c b/drivers/pinctrl/cirrus/pinctrl-cs42l43.c index 097e4dcdda36..e35964359381 100644 --- a/drivers/pinctrl/cirrus/pinctrl-cs42l43.c +++ b/drivers/pinctrl/cirrus/pinctrl-cs42l43.c @@ -508,7 +508,7 @@ static void cs42l43_gpio_set(struct gpio_chip *chip, unsigned int offset, int va static int cs42l43_gpio_direction_in(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_direction_input_new(chip, offset); + return pinctrl_gpio_direction_input(chip, offset); } static int cs42l43_gpio_direction_out(struct gpio_chip *chip, diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index f0fe3de09fee..d5a800ff190d 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -859,7 +859,7 @@ pinctrl_gpio_direction(struct gpio_chip *gc, unsigned int offset, bool input) } /** - * pinctrl_gpio_direction_input_new() - request a GPIO pin to go into input mode + * pinctrl_gpio_direction_input() - request a GPIO pin to go into input mode * @gc: GPIO chip structure from the GPIO subsystem * @offset: hardware offset of the GPIO relative to the controller * @@ -867,11 +867,11 @@ pinctrl_gpio_direction(struct gpio_chip *gc, unsigned int offset, bool input) * as part of their gpio_direction_input() semantics, platforms and individual * drivers shall *NOT* touch pin control GPIO calls. */ -int pinctrl_gpio_direction_input_new(struct gpio_chip *gc, unsigned int offset) +int pinctrl_gpio_direction_input(struct gpio_chip *gc, unsigned int offset) { return pinctrl_gpio_direction(gc, offset, true); } -EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input_new); +EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input); /** * pinctrl_gpio_direction_output_new() - request a GPIO pin to go into output diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c index 56a6b67d8380..7d6532066c83 100644 --- a/drivers/pinctrl/intel/pinctrl-cherryview.c +++ b/drivers/pinctrl/intel/pinctrl-cherryview.c @@ -1172,7 +1172,7 @@ static int chv_gpio_get_direction(struct gpio_chip *chip, unsigned int offset) static int chv_gpio_direction_input(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_direction_input_new(chip, offset); + return pinctrl_gpio_direction_input(chip, offset); } static int chv_gpio_direction_output(struct gpio_chip *chip, unsigned int offset, diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c index 4897c8425391..b53159611c56 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c @@ -990,7 +990,7 @@ static int intel_gpio_get_direction(struct gpio_chip *chip, unsigned int offset) static int intel_gpio_direction_input(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_direction_input_new(chip, offset); + return pinctrl_gpio_direction_input(chip, offset); } static int intel_gpio_direction_output(struct gpio_chip *chip, unsigned int offset, diff --git a/drivers/pinctrl/intel/pinctrl-lynxpoint.c b/drivers/pinctrl/intel/pinctrl-lynxpoint.c index 544ea8a607c9..6dbf2537016e 100644 --- a/drivers/pinctrl/intel/pinctrl-lynxpoint.c +++ b/drivers/pinctrl/intel/pinctrl-lynxpoint.c @@ -545,7 +545,7 @@ static void lp_gpio_set(struct gpio_chip *chip, unsigned int offset, int value) static int lp_gpio_direction_input(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_direction_input_new(chip, offset); + return pinctrl_gpio_direction_input(chip, offset); } static int lp_gpio_direction_output(struct gpio_chip *chip, unsigned int offset, diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.c b/drivers/pinctrl/mediatek/pinctrl-moore.c index dc41ffa31357..5a5ec00e32ea 100644 --- a/drivers/pinctrl/mediatek/pinctrl-moore.c +++ b/drivers/pinctrl/mediatek/pinctrl-moore.c @@ -512,7 +512,7 @@ static void mtk_gpio_set(struct gpio_chip *chip, unsigned int gpio, int value) static int mtk_gpio_direction_input(struct gpio_chip *chip, unsigned int gpio) { - return pinctrl_gpio_direction_input_new(chip, gpio); + return pinctrl_gpio_direction_input(chip, gpio); } static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio, diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c index fc046415b567..b2dc3072050a 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c @@ -811,7 +811,7 @@ static const struct pinmux_ops mtk_pmx_ops = { static int mtk_gpio_direction_input(struct gpio_chip *chip, unsigned offset) { - return pinctrl_gpio_direction_input_new(chip, offset); + return pinctrl_gpio_direction_input(chip, offset); } static int mtk_gpio_direction_output(struct gpio_chip *chip, diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c index 14b151aec2f9..d8c969e506ce 100644 --- a/drivers/pinctrl/mediatek/pinctrl-paris.c +++ b/drivers/pinctrl/mediatek/pinctrl-paris.c @@ -916,7 +916,7 @@ static int mtk_gpio_direction_input(struct gpio_chip *chip, unsigned int gpio) if (gpio >= hw->soc->npins) return -EINVAL; - return pinctrl_gpio_direction_input_new(chip, gpio); + return pinctrl_gpio_direction_input(chip, gpio); } static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio, diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c index ab7cfc1e66f0..d7ce67242248 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c @@ -171,7 +171,7 @@ static int npcmgpio_direction_input(struct gpio_chip *chip, unsigned int offset) struct npcm7xx_gpio *bank = gpiochip_get_data(chip); int ret; - ret = pinctrl_gpio_direction_input_new(chip, offset); + ret = pinctrl_gpio_direction_input(chip, offset); if (ret) return ret; diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c index 78dbeef6af86..c22513e30068 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c @@ -173,7 +173,7 @@ static int npcmgpio_direction_input(struct gpio_chip *chip, unsigned int offset) struct npcm8xx_gpio *bank = gpiochip_get_data(chip); int ret; - ret = pinctrl_gpio_direction_input_new(chip, offset); + ret = pinctrl_gpio_direction_input(chip, offset); if (ret) return ret; diff --git a/drivers/pinctrl/pinctrl-as3722.c b/drivers/pinctrl/pinctrl-as3722.c index 3d3adf9793fb..3f27da80adde 100644 --- a/drivers/pinctrl/pinctrl-as3722.c +++ b/drivers/pinctrl/pinctrl-as3722.c @@ -502,7 +502,7 @@ static void as3722_gpio_set(struct gpio_chip *chip, unsigned offset, static int as3722_gpio_direction_input(struct gpio_chip *chip, unsigned offset) { - return pinctrl_gpio_direction_input_new(chip, offset); + return pinctrl_gpio_direction_input(chip, offset); } static int as3722_gpio_direction_output(struct gpio_chip *chip, diff --git a/drivers/pinctrl/pinctrl-axp209.c b/drivers/pinctrl/pinctrl-axp209.c index d7f081f1d1f6..a6eb3b866a23 100644 --- a/drivers/pinctrl/pinctrl-axp209.c +++ b/drivers/pinctrl/pinctrl-axp209.c @@ -126,7 +126,7 @@ static int axp20x_gpio_get_reg(unsigned int offset) static int axp20x_gpio_input(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_direction_input_new(chip, offset); + return pinctrl_gpio_direction_input(chip, offset); } static int axp20x_gpio_get(struct gpio_chip *chip, unsigned int offset) diff --git a/drivers/pinctrl/pinctrl-cy8c95x0.c b/drivers/pinctrl/pinctrl-cy8c95x0.c index 8c6006353515..729c13a249ef 100644 --- a/drivers/pinctrl/pinctrl-cy8c95x0.c +++ b/drivers/pinctrl/pinctrl-cy8c95x0.c @@ -554,7 +554,7 @@ static int cy8c95x0_read_regs_mask(struct cy8c95x0_pinctrl *chip, int reg, static int cy8c95x0_gpio_direction_input(struct gpio_chip *gc, unsigned int off) { - return pinctrl_gpio_direction_input_new(gc, off); + return pinctrl_gpio_direction_input(gc, off); } static int cy8c95x0_gpio_direction_output(struct gpio_chip *gc, diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index 5072fb907193..df36141edbf3 100644 --- a/drivers/pinctrl/pinctrl-ingenic.c +++ b/drivers/pinctrl/pinctrl-ingenic.c @@ -3563,7 +3563,7 @@ static int ingenic_gpio_get(struct gpio_chip *gc, unsigned int offset) static int ingenic_gpio_direction_input(struct gpio_chip *gc, unsigned int offset) { - return pinctrl_gpio_direction_input_new(gc, offset); + return pinctrl_gpio_direction_input(gc, offset); } static int ingenic_gpio_direction_output(struct gpio_chip *gc, diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c index a6022d44ad6c..d02d16084f33 100644 --- a/drivers/pinctrl/pinctrl-ocelot.c +++ b/drivers/pinctrl/pinctrl-ocelot.c @@ -1779,7 +1779,7 @@ static int ocelot_gpio_get_direction(struct gpio_chip *chip, static int ocelot_gpio_direction_input(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_direction_input_new(chip, offset); + return pinctrl_gpio_direction_input(chip, offset); } static int ocelot_gpio_direction_output(struct gpio_chip *chip, diff --git a/drivers/pinctrl/pinctrl-rk805.c b/drivers/pinctrl/pinctrl-rk805.c index 58e6dd932bc7..f0feb3a8e630 100644 --- a/drivers/pinctrl/pinctrl-rk805.c +++ b/drivers/pinctrl/pinctrl-rk805.c @@ -289,7 +289,7 @@ static void rk805_gpio_set(struct gpio_chip *chip, static int rk805_gpio_direction_input(struct gpio_chip *chip, unsigned int offset) { - return pinctrl_gpio_direction_input_new(chip, offset); + return pinctrl_gpio_direction_input(chip, offset); } static int rk805_gpio_direction_output(struct gpio_chip *chip, diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c index ec763572ab3e..3f6631716779 100644 --- a/drivers/pinctrl/pinctrl-st.c +++ b/drivers/pinctrl/pinctrl-st.c @@ -719,7 +719,7 @@ static void st_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static int st_gpio_direction_input(struct gpio_chip *chip, unsigned offset) { - pinctrl_gpio_direction_input_new(chip, offset); + pinctrl_gpio_direction_input(chip, offset); return 0; } diff --git a/drivers/pinctrl/renesas/gpio.c b/drivers/pinctrl/renesas/gpio.c index b39125a632b0..54346b7fcdef 100644 --- a/drivers/pinctrl/renesas/gpio.c +++ b/drivers/pinctrl/renesas/gpio.c @@ -164,7 +164,7 @@ static void gpio_pin_set_value(struct sh_pfc_chip *chip, unsigned offset, static int gpio_pin_direction_input(struct gpio_chip *gc, unsigned offset) { - return pinctrl_gpio_direction_input_new(gc, offset); + return pinctrl_gpio_direction_input(gc, offset); } static int gpio_pin_direction_output(struct gpio_chip *gc, unsigned offset, diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c index e4453fa58f9e..cbe306f47c0a 100644 --- a/drivers/pinctrl/stm32/pinctrl-stm32.c +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c @@ -241,7 +241,7 @@ static void stm32_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static int stm32_gpio_direction_input(struct gpio_chip *chip, unsigned offset) { - return pinctrl_gpio_direction_input_new(chip, offset); + return pinctrl_gpio_direction_input(chip, offset); } static int stm32_gpio_direction_output(struct gpio_chip *chip, diff --git a/drivers/pinctrl/vt8500/pinctrl-wmt.c b/drivers/pinctrl/vt8500/pinctrl-wmt.c index 1a313295611e..54cd556a16b8 100644 --- a/drivers/pinctrl/vt8500/pinctrl-wmt.c +++ b/drivers/pinctrl/vt8500/pinctrl-wmt.c @@ -528,7 +528,7 @@ static void wmt_gpio_set_value(struct gpio_chip *chip, unsigned offset, static int wmt_gpio_direction_input(struct gpio_chip *chip, unsigned offset) { - return pinctrl_gpio_direction_input_new(chip, offset); + return pinctrl_gpio_direction_input(chip, offset); } static int wmt_gpio_direction_output(struct gpio_chip *chip, unsigned offset, diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index 55b465edaff1..9531595d1abd 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -29,8 +29,8 @@ struct pinctrl_state; bool pinctrl_gpio_can_use_line(struct gpio_chip *gc, unsigned int offset); int pinctrl_gpio_request(struct gpio_chip *gc, unsigned int offset); void pinctrl_gpio_free(struct gpio_chip *gc, unsigned int offset); -int pinctrl_gpio_direction_input_new(struct gpio_chip *gc, - unsigned int offset); +int pinctrl_gpio_direction_input(struct gpio_chip *gc, + unsigned int offset); int pinctrl_gpio_direction_output_new(struct gpio_chip *gc, unsigned int offset); int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, @@ -85,7 +85,7 @@ pinctrl_gpio_free(struct gpio_chip *gc, unsigned int offset) } static inline int -pinctrl_gpio_direction_input_new(struct gpio_chip *gc, unsigned int offset) +pinctrl_gpio_direction_input(struct gpio_chip *gc, unsigned int offset) { return 0; } From patchwork Tue Oct 3 14:51:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147942 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2139881vqb; Tue, 3 Oct 2023 07:53:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpakR725Vh+vKMpQU6Es1Wu6QrfOTOfILy2BvQChUNt1a7VQbgEeuSHyv4zDw4jvKXMZDr X-Received: by 2002:a05:6870:9686:b0:1bb:9c27:c7e6 with SMTP id o6-20020a056870968600b001bb9c27c7e6mr16750465oaq.41.1696344804348; Tue, 03 Oct 2023 07:53:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344804; cv=none; d=google.com; s=arc-20160816; b=py+lLigJcvuXwHBnF1fJc3ww3G0gg3BNiqsMK3EAbKWR8cD/pKY8mBqENDGLg/sS2F fGwL8lqK5e8G1EZxsuYkL3P9SQAgcwA61+KlfqD1XASZnId1btRqlnqfvyZuSR+vXoYm zJ96SdJm29uHmwG5THNz3ePRjGfFW/ZDnxrzTLRhkDt/kJQDsW4wwDYOeURT5ZNjBGSe DNei71CEZMFYO46tE4TUBhNl1PNRsAsiJr/W0h70ZASp/P+/QwzLjp9Ab/IAu4JgMtn3 TAKvmdxgBFaM4mAPOD6ck3hWhxI+stkvZHfW2rMKzHbx5ZITxWE6SA1M6LP7zTx8JX1M 59kg== 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=+3d049XbB9Hr0P+CwffX8woDpf6okLSBkc/Gu+wrSQE=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=eKm8/d+BAqPXibyK2YtKVZi3+XOXiqNS7KlH94rx1aIhoRD4yB8SF90l5dnKj4cQZZ 4R16MFJFnD0xpMnTRT0FqpL6z+GGNvSVt8SR+qwhVn/Ts5RU6zrWwTZGs0HaceBU/4Qa 1cIZT1n98gRRPEtOqpRGavLFdMZ/M2IrSt7mucoAcWTV/qv96b62yT+y8jxzizpXR+ac brH2QliVgtZaKxK3ZEjX1eOzvoab5/XGbsVbMoyA1LXBIDmjFCYQjGv+CZ3KDcApBLis erdWDN6fHwTEiGhRAE/BB70jytKg3ASH/VuwhgWI78CkEgkLlXQV/ibhQotph42bLvYK K8Wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=SJJEUN5f; 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 a26-20020a63705a000000b005781e99d048si1566721pgn.889.2023.10.03.07.53.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:53:24 -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=SJJEUN5f; 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 79244819FC61; Tue, 3 Oct 2023 07:53:23 -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 S240376AbjJCOxT (ORCPT + 17 others); Tue, 3 Oct 2023 10:53:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240287AbjJCOwW (ORCPT ); Tue, 3 Oct 2023 10:52:22 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04F4D1985 for ; Tue, 3 Oct 2023 07:51:57 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40566f89f6eso10484795e9.3 for ; Tue, 03 Oct 2023 07:51:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344713; x=1696949513; 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=+3d049XbB9Hr0P+CwffX8woDpf6okLSBkc/Gu+wrSQE=; b=SJJEUN5fY0cY5t5t3j85eDrsCk/P//UwPirL/FT9DvZfFV9bvhNYpnwZYSbx6RHlZE cw9JCHkwmU6cKC6hXNqT9+VubLU8M/ZZVPE/j9N9eFNn0c+ys+uUBBkNl2SjIPIie7OL GpoMKqZ4g4hR8Hv4nXiwPinLV5g97Ht1+2PPNPmMMXGMqRIZshLakbfQb8Dut4h4+zFY vnRFe4q1Nw3SfpFEgEtbZ7vctYpo2wuwfxzwkBt9HLORb1SXWt+TQY2PhbhHo3KFR97Y QMzO00lL2Jw3qCqqVclno4qCceg85sGr/TkKA71BMq/NSSoHwmj/q1Dh2qAOnD+0tUHC 86XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344713; x=1696949513; 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=+3d049XbB9Hr0P+CwffX8woDpf6okLSBkc/Gu+wrSQE=; b=dh2RS0gRE1Qc9fHssL5q+N1XdFil03IVsCrAIQyhQI0Nn4glQFnSe0HGEu4sbJcMUC csltGt4hI9nR1FKLb+3FYfr93RBaSrMflI7VkLNCJ6hUPLRbFtPQHb1HdeAHpVO+fg0K eK1hZ1W8MIWkQRtnLDw9XJXjpGOGkye4x2ai2OE5DuJuw+LvxIm3VvfzNqw44+TBXx0+ 2O79ZpMK4ayITIWwhNqshZ/wOC3UQd6gFCZfdln0TM5np3hst1aHe3TTSfHZ48hny5M7 H4uKOHd3f+vW5n2jKL2ccWEmForxUNHmfZMcL0/Cp8std6Sb7LTJ4VWovggWql4Ebgzz uhvQ== X-Gm-Message-State: AOJu0YyH3XzsSViP2PjsKcQZXs+FDX/SwYPS6cVQoIGnza2m0oXtwnIU a9ooOxci8lHc/47J3P39E4HLkg== X-Received: by 2002:a05:600c:2317:b0:402:f5c4:2e5a with SMTP id 23-20020a05600c231700b00402f5c42e5amr13358149wmo.37.1696344713167; Tue, 03 Oct 2023 07:51:53 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:52 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 35/36] treewide: rename pinctrl_gpio_direction_output_new() Date: Tue, 3 Oct 2023 16:51:13 +0200 Message-Id: <20231003145114.21637-36-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-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]); Tue, 03 Oct 2023 07:53:23 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746449225903552 X-GMAIL-MSGID: 1778746449225903552 From: Bartosz Golaszewski Now that pinctrl_gpio_direction_output() is no longer used, let's drop the '_new' suffix from its improved variant. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-mvebu.c | 2 +- drivers/gpio/gpio-pxa.c | 2 +- drivers/gpio/gpio-rockchip.c | 2 +- drivers/gpio/gpio-tegra.c | 2 +- drivers/gpio/gpio-vf610.c | 2 +- drivers/pinctrl/cirrus/pinctrl-cs42l43.c | 2 +- drivers/pinctrl/cirrus/pinctrl-lochnagar.c | 2 +- drivers/pinctrl/core.c | 7 +++---- drivers/pinctrl/intel/pinctrl-cherryview.c | 2 +- drivers/pinctrl/intel/pinctrl-intel.c | 2 +- drivers/pinctrl/intel/pinctrl-lynxpoint.c | 2 +- drivers/pinctrl/mediatek/pinctrl-moore.c | 2 +- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 2 +- drivers/pinctrl/mediatek/pinctrl-paris.c | 2 +- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2 +- drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 2 +- drivers/pinctrl/pinctrl-as3722.c | 2 +- drivers/pinctrl/pinctrl-cy8c95x0.c | 2 +- drivers/pinctrl/pinctrl-ingenic.c | 4 ++-- drivers/pinctrl/pinctrl-ocelot.c | 2 +- drivers/pinctrl/pinctrl-rk805.c | 2 +- drivers/pinctrl/pinctrl-st.c | 2 +- drivers/pinctrl/renesas/gpio.c | 2 +- drivers/pinctrl/stm32/pinctrl-stm32.c | 2 +- drivers/pinctrl/vt8500/pinctrl-wmt.c | 2 +- include/linux/pinctrl/consumer.h | 6 +++--- 26 files changed, 31 insertions(+), 32 deletions(-) diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c index 20f788240481..6abb1b1139fe 100644 --- a/drivers/gpio/gpio-mvebu.c +++ b/drivers/gpio/gpio-mvebu.c @@ -365,7 +365,7 @@ static int mvebu_gpio_direction_output(struct gpio_chip *chip, unsigned int pin, * Check with the pinctrl driver whether this pin is usable as * an output GPIO */ - ret = pinctrl_gpio_direction_output_new(chip, pin); + ret = pinctrl_gpio_direction_output(chip, pin); if (ret) return ret; diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index c60197d5fde0..91cea97255fa 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c @@ -289,7 +289,7 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip, writel_relaxed(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET)); if (pxa_gpio_has_pinctrl()) { - ret = pinctrl_gpio_direction_output_new(chip, offset); + ret = pinctrl_gpio_direction_output(chip, offset); if (ret) return ret; } diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c index 05afb67fd677..0bd339813110 100644 --- a/drivers/gpio/gpio-rockchip.c +++ b/drivers/gpio/gpio-rockchip.c @@ -161,7 +161,7 @@ static int rockchip_gpio_set_direction(struct gpio_chip *chip, if (input) pinctrl_gpio_direction_input(chip, offset); else - pinctrl_gpio_direction_output_new(chip, offset); + pinctrl_gpio_direction_output(chip, offset); raw_spin_lock_irqsave(&bank->slock, flags); rockchip_gpio_writel_bit(bank, offset, data, bank->gpio_regs->port_ddr); diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c index a9a00b28cc55..adfbed62eff1 100644 --- a/drivers/gpio/gpio-tegra.c +++ b/drivers/gpio/gpio-tegra.c @@ -199,7 +199,7 @@ static int tegra_gpio_direction_output(struct gpio_chip *chip, tegra_gpio_mask_write(tgi, GPIO_MSK_OE(tgi, offset), offset, 1); tegra_gpio_enable(tgi, offset); - ret = pinctrl_gpio_direction_output_new(chip, offset); + ret = pinctrl_gpio_direction_output(chip, offset); if (ret < 0) dev_err(tgi->dev, "Failed to set pinctrl output direction of GPIO %d: %d", diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c index 6551f80c3e51..b11a6d9b1b69 100644 --- a/drivers/gpio/gpio-vf610.c +++ b/drivers/gpio/gpio-vf610.c @@ -134,7 +134,7 @@ static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, vf610_gpio_set(chip, gpio, value); - return pinctrl_gpio_direction_output_new(chip, gpio); + return pinctrl_gpio_direction_output(chip, gpio); } static void vf610_gpio_irq_handler(struct irq_desc *desc) diff --git a/drivers/pinctrl/cirrus/pinctrl-cs42l43.c b/drivers/pinctrl/cirrus/pinctrl-cs42l43.c index e35964359381..1ba89cf279fb 100644 --- a/drivers/pinctrl/cirrus/pinctrl-cs42l43.c +++ b/drivers/pinctrl/cirrus/pinctrl-cs42l43.c @@ -516,7 +516,7 @@ static int cs42l43_gpio_direction_out(struct gpio_chip *chip, { cs42l43_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output_new(chip, offset); + return pinctrl_gpio_direction_output(chip, offset); } static int cs42l43_gpio_add_pin_ranges(struct gpio_chip *chip) diff --git a/drivers/pinctrl/cirrus/pinctrl-lochnagar.c b/drivers/pinctrl/cirrus/pinctrl-lochnagar.c index f3c8a8c14e14..014297a3fbd2 100644 --- a/drivers/pinctrl/cirrus/pinctrl-lochnagar.c +++ b/drivers/pinctrl/cirrus/pinctrl-lochnagar.c @@ -1098,7 +1098,7 @@ static int lochnagar_gpio_direction_out(struct gpio_chip *chip, { lochnagar_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output_new(chip, offset); + return pinctrl_gpio_direction_output(chip, offset); } static int lochnagar_fill_func_groups(struct lochnagar_pin_priv *priv) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index d5a800ff190d..5f40abef5c1e 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -874,8 +874,7 @@ int pinctrl_gpio_direction_input(struct gpio_chip *gc, unsigned int offset) EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input); /** - * pinctrl_gpio_direction_output_new() - request a GPIO pin to go into output - * mode + * pinctrl_gpio_direction_output() - request a GPIO pin to go into output mode * @gc: GPIO chip structure from the GPIO subsystem * @offset: hardware offset of the GPIO relative to the controller * @@ -883,11 +882,11 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_input); * as part of their gpio_direction_output() semantics, platforms and individual * drivers shall *NOT* touch pin control GPIO calls. */ -int pinctrl_gpio_direction_output_new(struct gpio_chip *gc, unsigned int offset) +int pinctrl_gpio_direction_output(struct gpio_chip *gc, unsigned int offset) { return pinctrl_gpio_direction(gc, offset, false); } -EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output_new); +EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output); /** * pinctrl_gpio_set_config_new() - Apply config to given GPIO pin diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c index 7d6532066c83..6ab5953b858a 100644 --- a/drivers/pinctrl/intel/pinctrl-cherryview.c +++ b/drivers/pinctrl/intel/pinctrl-cherryview.c @@ -1179,7 +1179,7 @@ static int chv_gpio_direction_output(struct gpio_chip *chip, unsigned int offset int value) { chv_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output_new(chip, offset); + return pinctrl_gpio_direction_output(chip, offset); } static const struct gpio_chip chv_gpio_chip = { diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c index b53159611c56..151d4356e6a6 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c @@ -997,7 +997,7 @@ static int intel_gpio_direction_output(struct gpio_chip *chip, unsigned int offs int value) { intel_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output_new(chip, offset); + return pinctrl_gpio_direction_output(chip, offset); } static const struct gpio_chip intel_gpio_chip = { diff --git a/drivers/pinctrl/intel/pinctrl-lynxpoint.c b/drivers/pinctrl/intel/pinctrl-lynxpoint.c index 6dbf2537016e..0bc83a0ba75f 100644 --- a/drivers/pinctrl/intel/pinctrl-lynxpoint.c +++ b/drivers/pinctrl/intel/pinctrl-lynxpoint.c @@ -553,7 +553,7 @@ static int lp_gpio_direction_output(struct gpio_chip *chip, unsigned int offset, { lp_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output_new(chip, offset); + return pinctrl_gpio_direction_output(chip, offset); } static int lp_gpio_get_direction(struct gpio_chip *chip, unsigned int offset) diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.c b/drivers/pinctrl/mediatek/pinctrl-moore.c index 5a5ec00e32ea..c3f33f96f920 100644 --- a/drivers/pinctrl/mediatek/pinctrl-moore.c +++ b/drivers/pinctrl/mediatek/pinctrl-moore.c @@ -520,7 +520,7 @@ static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio, { mtk_gpio_set(chip, gpio, value); - return pinctrl_gpio_direction_output_new(chip, gpio); + return pinctrl_gpio_direction_output(chip, gpio); } static int mtk_gpio_to_irq(struct gpio_chip *chip, unsigned int offset) diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c index b2dc3072050a..41e9847e3085 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c @@ -818,7 +818,7 @@ static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned offset, int value) { mtk_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output_new(chip, offset); + return pinctrl_gpio_direction_output(chip, offset); } static int mtk_gpio_get_direction(struct gpio_chip *chip, unsigned offset) diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c index d8c969e506ce..6392f1e05d02 100644 --- a/drivers/pinctrl/mediatek/pinctrl-paris.c +++ b/drivers/pinctrl/mediatek/pinctrl-paris.c @@ -929,7 +929,7 @@ static int mtk_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio, mtk_gpio_set(chip, gpio, value); - return pinctrl_gpio_direction_output_new(chip, gpio); + return pinctrl_gpio_direction_output(chip, gpio); } static int mtk_gpio_to_irq(struct gpio_chip *chip, unsigned int offset) diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c index d7ce67242248..51aeac7ecc79 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c @@ -188,7 +188,7 @@ static int npcmgpio_direction_output(struct gpio_chip *chip, dev_dbg(chip->parent, "gpio_direction_output: offset%d = %x\n", offset, value); - ret = pinctrl_gpio_direction_output_new(chip, offset); + ret = pinctrl_gpio_direction_output(chip, offset); if (ret) return ret; diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c index c22513e30068..140fdbbe8458 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c @@ -186,7 +186,7 @@ static int npcmgpio_direction_output(struct gpio_chip *chip, struct npcm8xx_gpio *bank = gpiochip_get_data(chip); int ret; - ret = pinctrl_gpio_direction_output_new(chip, offset); + ret = pinctrl_gpio_direction_output(chip, offset); if (ret) return ret; diff --git a/drivers/pinctrl/pinctrl-as3722.c b/drivers/pinctrl/pinctrl-as3722.c index 3f27da80adde..4151656f6245 100644 --- a/drivers/pinctrl/pinctrl-as3722.c +++ b/drivers/pinctrl/pinctrl-as3722.c @@ -509,7 +509,7 @@ static int as3722_gpio_direction_output(struct gpio_chip *chip, unsigned offset, int value) { as3722_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output_new(chip, offset); + return pinctrl_gpio_direction_output(chip, offset); } static int as3722_gpio_to_irq(struct gpio_chip *chip, unsigned offset) diff --git a/drivers/pinctrl/pinctrl-cy8c95x0.c b/drivers/pinctrl/pinctrl-cy8c95x0.c index 729c13a249ef..04285c930e94 100644 --- a/drivers/pinctrl/pinctrl-cy8c95x0.c +++ b/drivers/pinctrl/pinctrl-cy8c95x0.c @@ -571,7 +571,7 @@ static int cy8c95x0_gpio_direction_output(struct gpio_chip *gc, if (ret) return ret; - return pinctrl_gpio_direction_output_new(gc, off); + return pinctrl_gpio_direction_output(gc, off); } static int cy8c95x0_gpio_get_value(struct gpio_chip *gc, unsigned int off) diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index df36141edbf3..ca58c9db5c2c 100644 --- a/drivers/pinctrl/pinctrl-ingenic.c +++ b/drivers/pinctrl/pinctrl-ingenic.c @@ -3570,7 +3570,7 @@ static int ingenic_gpio_direction_output(struct gpio_chip *gc, unsigned int offset, int value) { ingenic_gpio_set(gc, offset, value); - return pinctrl_gpio_direction_output_new(gc, offset); + return pinctrl_gpio_direction_output(gc, offset); } static inline void ingenic_config_pin(struct ingenic_pinctrl *jzpc, @@ -4054,7 +4054,7 @@ static int ingenic_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, break; case PIN_CONFIG_OUTPUT: - ret = pinctrl_gpio_direction_output_new(jzpc->gc, + ret = pinctrl_gpio_direction_output(jzpc->gc, pin - jzpc->gc->base); if (ret) return ret; diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c index d02d16084f33..96b4e9fceb78 100644 --- a/drivers/pinctrl/pinctrl-ocelot.c +++ b/drivers/pinctrl/pinctrl-ocelot.c @@ -1795,7 +1795,7 @@ static int ocelot_gpio_direction_output(struct gpio_chip *chip, regmap_write(info->map, REG(OCELOT_GPIO_OUT_CLR, info, offset), pin); - return pinctrl_gpio_direction_output_new(chip, offset); + return pinctrl_gpio_direction_output(chip, offset); } static const struct gpio_chip ocelot_gpiolib_chip = { diff --git a/drivers/pinctrl/pinctrl-rk805.c b/drivers/pinctrl/pinctrl-rk805.c index f0feb3a8e630..968f066eb9da 100644 --- a/drivers/pinctrl/pinctrl-rk805.c +++ b/drivers/pinctrl/pinctrl-rk805.c @@ -296,7 +296,7 @@ static int rk805_gpio_direction_output(struct gpio_chip *chip, unsigned int offset, int value) { rk805_gpio_set(chip, offset, value); - return pinctrl_gpio_direction_output_new(chip, offset); + return pinctrl_gpio_direction_output(chip, offset); } static int rk805_gpio_get_direction(struct gpio_chip *chip, unsigned int offset) diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c index 3f6631716779..db511dbd50e5 100644 --- a/drivers/pinctrl/pinctrl-st.c +++ b/drivers/pinctrl/pinctrl-st.c @@ -730,7 +730,7 @@ static int st_gpio_direction_output(struct gpio_chip *chip, struct st_gpio_bank *bank = gpiochip_get_data(chip); __st_gpio_set(bank, offset, value); - pinctrl_gpio_direction_output_new(chip, offset); + pinctrl_gpio_direction_output(chip, offset); return 0; } diff --git a/drivers/pinctrl/renesas/gpio.c b/drivers/pinctrl/renesas/gpio.c index 54346b7fcdef..a5136dacaaf2 100644 --- a/drivers/pinctrl/renesas/gpio.c +++ b/drivers/pinctrl/renesas/gpio.c @@ -172,7 +172,7 @@ static int gpio_pin_direction_output(struct gpio_chip *gc, unsigned offset, { gpio_pin_set_value(gpiochip_get_data(gc), offset, value); - return pinctrl_gpio_direction_output_new(gc, offset); + return pinctrl_gpio_direction_output(gc, offset); } static int gpio_pin_get(struct gpio_chip *gc, unsigned offset) diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c index cbe306f47c0a..917b87acbf0d 100644 --- a/drivers/pinctrl/stm32/pinctrl-stm32.c +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c @@ -250,7 +250,7 @@ static int stm32_gpio_direction_output(struct gpio_chip *chip, struct stm32_gpio_bank *bank = gpiochip_get_data(chip); __stm32_gpio_set(bank, offset, value); - pinctrl_gpio_direction_output_new(chip, offset); + pinctrl_gpio_direction_output(chip, offset); return 0; } diff --git a/drivers/pinctrl/vt8500/pinctrl-wmt.c b/drivers/pinctrl/vt8500/pinctrl-wmt.c index 54cd556a16b8..639446bba373 100644 --- a/drivers/pinctrl/vt8500/pinctrl-wmt.c +++ b/drivers/pinctrl/vt8500/pinctrl-wmt.c @@ -535,7 +535,7 @@ static int wmt_gpio_direction_output(struct gpio_chip *chip, unsigned offset, int value) { wmt_gpio_set_value(chip, offset, value); - return pinctrl_gpio_direction_output_new(chip, offset); + return pinctrl_gpio_direction_output(chip, offset); } static const struct gpio_chip wmt_gpio_chip = { diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index 9531595d1abd..e7d660e98e86 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -31,8 +31,8 @@ int pinctrl_gpio_request(struct gpio_chip *gc, unsigned int offset); void pinctrl_gpio_free(struct gpio_chip *gc, unsigned int offset); int pinctrl_gpio_direction_input(struct gpio_chip *gc, unsigned int offset); -int pinctrl_gpio_direction_output_new(struct gpio_chip *gc, - unsigned int offset); +int pinctrl_gpio_direction_output(struct gpio_chip *gc, + unsigned int offset); int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, unsigned long config); @@ -91,7 +91,7 @@ pinctrl_gpio_direction_input(struct gpio_chip *gc, unsigned int offset) } static inline int -pinctrl_gpio_direction_output_new(struct gpio_chip *gc, unsigned int offset) +pinctrl_gpio_direction_output(struct gpio_chip *gc, unsigned int offset) { return 0; } From patchwork Tue Oct 3 14:51:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 147947 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2140315vqb; Tue, 3 Oct 2023 07:54:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmnD0Xx4e5mAzy34uhuH+puLxj42n69qLvGzAPLsV9d2lXbbx89MjxIgREegXs7T44pTP/ X-Received: by 2002:a05:6a20:b925:b0:15e:bf2b:e6cb with SMTP id fe37-20020a056a20b92500b0015ebf2be6cbmr9584106pzb.55.1696344851683; Tue, 03 Oct 2023 07:54:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696344851; cv=none; d=google.com; s=arc-20160816; b=ZhlluTIKYMiVXHLdqkoQZV/jNSvCgbqv0wUNTBCeYgNKf/WEjFzpizaCKhESkU3YFD N2wPwlBl/5o0P9Ym8efET1pmSjcaKYRh5OUyLpRGGb6puFAb6lCacxMZrQC4Ds3ghpY5 WzaM1pwRRRVfUeObM/Te6J0Cwa9KgKySQbUVBfyIUuXoKUbfAUi7kktpNFeyhxHM8v6s jQdxf/R814N5wpqWWJqTl5IM7KP0iy5WCDxjYyLQdg62WKen1CLGYIM43hrIZ9swXGlj F4B5THgKatMJ8T5oAOhJd9s1UPRJpBza8NcDyqNd/jnhHuxxI5dmksP0d5XFB0KT1i6s VbOQ== 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=sUDbJq7kLr1Ed1gQSQD2nNwqIA0dLWtZ5bH6El/HhcI=; fh=sFZAJ5ezbypTez9WcxrfVuMim2Eh6JACjzNsyeVATp8=; b=hwFp+6UzYUfL9J1fnmBVfbuQb2Z65XFl1M4avtyzd7gYt9upSDNBMeRYVPjnzwGUj6 IpRRNuGSVvkHkz0DctjQLkGkcszOtxXBvTc++rU7XwBG8m48aDgyFD6aqUlomjTBSC34 sPTt6eKwJcIc3TPEpo5oS4MbtKDj1D3DAv+CIk0qj7ku/u+qH/itu0hkAQPQDoQUUOPm 4C356VJNJVjBXNqC91ZCMPiXVysV9yEb6MW3oYF/G+bMjjwL6yhH040cOwctpWctZJRQ Tt6KX6IpDu8YR5E89PkmitIqF/h+77tG2kYUqmLNZXRp7G7glTCZ0ue59igeX4hhJvCy hP7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=q5lG3WWG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id ca25-20020a056a00419900b00691018e3f4dsi1565380pfb.201.2023.10.03.07.54.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:54:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=q5lG3WWG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id 87E48816039F; Tue, 3 Oct 2023 07:54:00 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240329AbjJCOxQ (ORCPT + 17 others); Tue, 3 Oct 2023 10:53:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240419AbjJCOwW (ORCPT ); Tue, 3 Oct 2023 10:52:22 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08D73E5 for ; Tue, 3 Oct 2023 07:51:59 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-405417465aaso10587645e9.1 for ; Tue, 03 Oct 2023 07:51:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1696344714; x=1696949514; 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=sUDbJq7kLr1Ed1gQSQD2nNwqIA0dLWtZ5bH6El/HhcI=; b=q5lG3WWGATSDLkLDLwXFTNFVYMLjgpPRWxp8aAxAkTtc5bvTV3SpF0PpCby/KQyMCq 9sQNir8GdKpa5f7pDCjwbKo6yN9smWEg1/ll0qBIJ8tb4lhso1dkPTGQGbW3PLTg5ILQ Z84ic6EBkpWSvdqoQg9Kj3+sWn8T4hEQMpoI11nSa5wuNRlQVMZCwK5E19Ce+9GA13Lh 54GVT8/H1Yz++gGEwFhDApHzL2q8SxrJkHQG4LpI04ZmG4X1yWY6KOJPpRTIe4dkl70y 0v20Y3EEM6D4HRazpaXnMRsM9mgJsabWwLDvpGgjilOb4wivBPlGAdcrgLVhPwYFgOyj K9nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696344714; x=1696949514; 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=sUDbJq7kLr1Ed1gQSQD2nNwqIA0dLWtZ5bH6El/HhcI=; b=E37KAyMnJbGuS+chiCy62+/39hSFy3hKNhwVGyzfnAYJOhFaMvJBn/eqXfTQi3wjIy Mt+RYRCKa485WY+0LQOBftn7qANTQgTqi2pJFfPQQCt7OwvMKg2aIRfQ6wyOphY1TVlf Iv+CRrEFPuNDKeogyWuqv89IhSG8++RbUJidc0linRGQPww6wbH0BofP3VuW29L98rsk 3wp7sN5pPwtd1h55Y5t0v98upuDH+G/jjNA/KS/gwKj04VJpiyduhiCqcwYfhfOBH4wB Xk818LdZBKCIk7si4BLnIiGI19b/7kpk6coJJSi5OMU0qF0ptspFdOASXEr7ixP0ngRw 8RTg== X-Gm-Message-State: AOJu0Ywvwe8F1ER5IMAdzWLW1kzv5sn8sF7iJhQyyohYYQsJmwqu+Oyq v05bHKApavCJkwqJvXkodYZYRg== X-Received: by 2002:a05:600c:2311:b0:403:9b7:a720 with SMTP id 17-20020a05600c231100b0040309b7a720mr12572356wmo.1.1696344714113; Tue, 03 Oct 2023 07:51:54 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:1f2d:3479:a5de:fa35]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003fe29f6b61bsm1462773wmr.46.2023.10.03.07.51.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 07:51:53 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 36/36] treewide: rename pinctrl_gpio_set_config_new() Date: Tue, 3 Oct 2023 16:51:14 +0200 Message-Id: <20231003145114.21637-37-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003145114.21637-1-brgl@bgdev.pl> References: <20231003145114.21637-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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]); Tue, 03 Oct 2023 07:54:00 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778746499289009487 X-GMAIL-MSGID: 1778746499289009487 From: Bartosz Golaszewski Now that pinctrl_gpio_set_config() is no longer used, let's drop the '_new' suffix from its improved variant. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-aspeed.c | 2 +- drivers/gpio/gpiolib.c | 2 +- drivers/pinctrl/core.c | 6 +++--- include/linux/pinctrl/consumer.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c index 4c417c8486dd..04c03402db6d 100644 --- a/drivers/gpio/gpio-aspeed.c +++ b/drivers/gpio/gpio-aspeed.c @@ -973,7 +973,7 @@ static int aspeed_gpio_set_config(struct gpio_chip *chip, unsigned int offset, else if (param == PIN_CONFIG_BIAS_DISABLE || param == PIN_CONFIG_BIAS_PULL_DOWN || param == PIN_CONFIG_DRIVE_STRENGTH) - return pinctrl_gpio_set_config_new(chip, offset, config); + return pinctrl_gpio_set_config(chip, offset, config); else if (param == PIN_CONFIG_DRIVE_OPEN_DRAIN || param == PIN_CONFIG_DRIVE_OPEN_SOURCE) /* Return -ENOTSUPP to trigger emulation, as per datasheet */ diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index d7c23be24904..d9db880593b6 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1883,7 +1883,7 @@ EXPORT_SYMBOL_GPL(gpiochip_generic_free); int gpiochip_generic_config(struct gpio_chip *gc, unsigned int offset, unsigned long config) { - return pinctrl_gpio_set_config_new(gc, offset, config); + return pinctrl_gpio_set_config(gc, offset, config); } EXPORT_SYMBOL_GPL(gpiochip_generic_config); diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 5f40abef5c1e..6d427c22e57b 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -889,7 +889,7 @@ int pinctrl_gpio_direction_output(struct gpio_chip *gc, unsigned int offset) EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output); /** - * pinctrl_gpio_set_config_new() - Apply config to given GPIO pin + * pinctrl_gpio_set_config() - Apply config to given GPIO pin * @gc: GPIO chip structure from the GPIO subsystem * @offset: hardware offset of the GPIO relative to the controller * @config: the configuration to apply to the GPIO @@ -898,7 +898,7 @@ EXPORT_SYMBOL_GPL(pinctrl_gpio_direction_output); * they need to call the underlying pin controller to change GPIO config * (for example set debounce time). */ -int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, +int pinctrl_gpio_set_config(struct gpio_chip *gc, unsigned int offset, unsigned long config) { unsigned long configs[] = { config }; @@ -918,7 +918,7 @@ int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, return ret; } -EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config_new); +EXPORT_SYMBOL_GPL(pinctrl_gpio_set_config); static struct pinctrl_state *find_state(struct pinctrl *p, const char *name) diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index e7d660e98e86..73de70362b98 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -33,7 +33,7 @@ int pinctrl_gpio_direction_input(struct gpio_chip *gc, unsigned int offset); int pinctrl_gpio_direction_output(struct gpio_chip *gc, unsigned int offset); -int pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, +int pinctrl_gpio_set_config(struct gpio_chip *gc, unsigned int offset, unsigned long config); struct pinctrl * __must_check pinctrl_get(struct device *dev); @@ -97,7 +97,7 @@ pinctrl_gpio_direction_output(struct gpio_chip *gc, unsigned int offset) } static inline int -pinctrl_gpio_set_config_new(struct gpio_chip *gc, unsigned int offset, +pinctrl_gpio_set_config(struct gpio_chip *gc, unsigned int offset, unsigned long config) { return 0;