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; }