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 = {