From patchwork Wed Nov 15 16:50: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: 165495 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp2667927vqg; Wed, 15 Nov 2023 08:50:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IHMZORzVDCEXhNfovdDNLl9UZKLS5vA51GdNeOF3RRd9Wyh/AJaVXaOrHqvn6ZWb9Gw/IW9 X-Received: by 2002:a05:6e02:1d0a:b0:359:7d0:256a with SMTP id i10-20020a056e021d0a00b0035907d0256amr17842672ila.7.1700067058942; Wed, 15 Nov 2023 08:50:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700067058; cv=none; d=google.com; s=arc-20160816; b=AzbqelusQEITzIEvGO5FGp//S/Gy3Pl9bhfu91rlM5GVEqHqa2YVFyzfG5vcvtYWWK mgSBlsCDb9zvl/1XmCBSw0UGjfFTOnKRwMqsD4TZWS+mxnI77K1pUwYWa4UsR7CysuBo VDXC31lZ84AFGhEhKlf3foCTGzsp4vzH+TTKyaSS5+TSkODT6VG7LYtcj6SKMdQUAAXJ sq/EGwdIu/Gz/7iepu7jXfSix2KD3WUpCLVs/xhue/J4pyzR/FkFpsV04ApYRUApVkTg 3wSoCfxvGumgqLh07h7UWy5kId6YRkomuxk8gge24TsJiAeD9GwaIygg/XAA4QWb7Ebd mISw== 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=6/+c2VO8PV1RqLkhAzMdFyQNC3apc5LK2X9ZNQJCpQY=; fh=kOxmq+prcfKKX/dgMaMxTb6TRjzyc//QKXZBiaS/a94=; b=ozohpkMOhkSVa5X0qbbjUTohuPeI5vlPff7Bazc6Y9R9QoCGCapp1fZjxvHhZSVoxb w6KckTh7j8yuHg5bqOLVW63wnZbXxlgPn1be9c77xeNHjVBEO2a+7uLsuXOYiWNy4BHG jim58rX5fi2xIJv36IyYN5uWjJjvusKuUoc9CsAnhYSFYgmxVWKPbSk6wTvyjHXQrBcP VNTRpDAnHlSSn3tC1V8kEIlYOTY6riw89M0yRE750Umc3BhNK+8InmCBTpf8ZeL7PNAf elMEIL0t0yiFGq1Ul4h8xEAw2YqVMqskT0CCQ0MyeWIGglDA/DQlKRWyJexyDfZwxB0U 8vBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=pZ3F0WMx; 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 w184-20020a6382c1000000b00577fc59373fsi9734197pgd.296.2023.11.15.08.50.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 08:50:58 -0800 (PST) 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=pZ3F0WMx; 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 7ED1E807D998; Wed, 15 Nov 2023 08:50:36 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232405AbjKOQuO (ORCPT + 29 others); Wed, 15 Nov 2023 11:50:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232210AbjKOQuK (ORCPT ); Wed, 15 Nov 2023 11:50:10 -0500 Received: from mail-ua1-x92e.google.com (mail-ua1-x92e.google.com [IPv6:2607:f8b0:4864:20::92e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 981051A4 for ; Wed, 15 Nov 2023 08:50:06 -0800 (PST) Received: by mail-ua1-x92e.google.com with SMTP id a1e0cc1a2514c-7b9bd9f8bfaso2637069241.0 for ; Wed, 15 Nov 2023 08:50:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1700067005; x=1700671805; 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=6/+c2VO8PV1RqLkhAzMdFyQNC3apc5LK2X9ZNQJCpQY=; b=pZ3F0WMxzknwX8Erg7N0MyTRtZdHeP/CSYxMYlbTW9KCnXX/GG6t7wT44v649yh3B6 CMQBbFLPqEV6iQL/wmkHytQ6SjG98W1iUIL+E86SPT528c0JIdWPVXPQtl0tiHKQw+v2 qrBWrgAxJ63rLPqpV55Orzog3Hl8cwF8EE+GjXl2lpoBxTjHKuHzZlh2ah0Pk8iaCV7r BNIyI4JsZ6SJbg2p/DxA2n+2d90tZSzeC8qO+UIpb6Wrnw24bo3ri1EQJrTSO03NYWPz By2gFNxqwrPgPk61wzqB5iY9LwKXeJqMIeSWIA2HSxxWIucZHfRmW80uF/Yz62vSc7nQ cv2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700067005; x=1700671805; 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=6/+c2VO8PV1RqLkhAzMdFyQNC3apc5LK2X9ZNQJCpQY=; b=SP3xwfAIZCq/Hkj7hN0RFFC7/YKzl1wZtN+86Z4fyB3OwCTdoBp8S4nGUyYZb+uprM dr0L+69mB3/RbToB9X5UON8MQ8nFb/3IfeIFUpDbGl0hXKDSbqySSFKlWM4Poiir86Ze TAVe/DY2C/UU4Eac+tYTP6j8R7rhHKFxKCtrOrBS+YHbM8uuRT40fQMu3NqszUki+Jm0 BeEVIXFnjiWgW9x9qoL+w9iT0DNojItOowYnspGI9bcVxvSw5hZRleDkMU3JZBJtCrzI +qg9nLE0V/oQ1KpNTuLS0mw98MonXBDX2YZqkpEE7udFFOHayOe/KPBPYOvPjxHOlYKg qhlg== X-Gm-Message-State: AOJu0YyDody6E0vLNEb03bzQHQostaeCz7nnDwwMdNBWm8+2t3u4rMdE OsGNrveeKN69AJHgtPlkFIDCcw== X-Received: by 2002:a67:c218:0:b0:45d:9224:a898 with SMTP id i24-20020a67c218000000b0045d9224a898mr13122998vsj.16.1700067005671; Wed, 15 Nov 2023 08:50:05 -0800 (PST) Received: from brgl-uxlite.. ([12.186.190.1]) by smtp.gmail.com with ESMTPSA id mn16-20020a0562145ed000b00670a8921170sm658781qvb.112.2023.11.15.08.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 08:50:05 -0800 (PST) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 2/3] pinctrl: stop using gpiod_to_chip() Date: Wed, 15 Nov 2023 17:50:00 +0100 Message-Id: <20231115165001.2932350-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231115165001.2932350-1-brgl@bgdev.pl> References: <20231115165001.2932350-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,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on 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]); Wed, 15 Nov 2023 08:50:36 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782649516256257166 X-GMAIL-MSGID: 1782649516256257166 From: Bartosz Golaszewski Don't dereference struct gpio_chip directly, use dedicated gpio_device getters instead. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/core.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 1fa89be29b8f..0b4d07aea387 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -13,6 +13,7 @@ #define pr_fmt(fmt) "pinctrl core: " fmt #include +#include #include #include #include @@ -1649,8 +1650,8 @@ static int pinctrl_pins_show(struct seq_file *s, void *what) const struct pinctrl_ops *ops = pctldev->desc->pctlops; unsigned i, pin; #ifdef CONFIG_GPIOLIB + struct gpio_device *gdev __free(gpio_device_put) = NULL; struct pinctrl_gpio_range *range; - struct gpio_chip *chip; int gpio_num; #endif @@ -1685,11 +1686,11 @@ static int pinctrl_pins_show(struct seq_file *s, void *what) * we need to get rid of the range->base eventually and * get the descriptor directly from the gpio_chip. */ - chip = gpiod_to_chip(gpio_to_desc(gpio_num)); - else - chip = NULL; - if (chip) - seq_printf(s, "%u:%s ", gpio_num - chip->gpiodev->base, chip->label); + gdev = gpiod_to_gpio_device(gpio_to_desc(gpio_num)); + if (gdev) + seq_printf(s, "%u:%s ", + gpio_num - gpio_device_get_base(gdev), + gpio_device_get_label(gdev)); else seq_puts(s, "0:? "); #endif