From patchwork Thu Nov 30 13:46:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 171893 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp396899vqy; Thu, 30 Nov 2023 05:47:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IEoDu8tvtvNBeT9g/gY6h6uG2jjbP9oNDosAdKT2kXzC3yi+QuVG6pCw/BWAZETudMh1SNP X-Received: by 2002:a17:902:e88f:b0:1cf:6832:46c with SMTP id w15-20020a170902e88f00b001cf6832046cmr29403125plg.6.1701352049899; Thu, 30 Nov 2023 05:47:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701352049; cv=none; d=google.com; s=arc-20160816; b=HcF4ekSI37BD0kcNh6X37PER6mqAl38Vma0W61R9G2RfxC3dZ5N8745ud9QQbqii6W fd51hSWstobumyayc0dATQGKqtr/HCbjtqA7/rzf4fhT/dIQV7Z6o9Stax7vY2HPhMJU 5hywtjZhn6Brkr7UGsMZengr6kd1DDF4u6VJfg4oR2jq3KPnZy/wKIjh2x++YQX4IQTq vASsjgO7mY9xi/G5sYKhvPaDTqxYEcpiFjUgEgdO3RQh28ChaEBKXuS4tRRe9El8i9Ln pHEW1oea7UbvoyvwHOpDttByWHl1UjgB0G/gYf0jFoyeu3EWFytydyqRU5jfe3TrzfTC tXgQ== 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=/NPguL+egm1B/3hLyNOqRomxlJRtvAY3YVXSaylJwM0=; fh=fw6biwzn34ngIUS3OuPB+D+TvAzoz1YwnvitHxA+Jyw=; b=IvLPVBtdbdlnUzYQ/G+v1EWyx0EuXblcFC5tw8waOclNocOZUcp7cJZehdbKIpvBQa kVe9efvQ/JRx7A+JPT9QNjWrR/FJ4824mdmT06qwbeSs7TyKyeplFJfQyPD+/IGHGfK5 IcN0CJsMznpAS2srMbPiq0mdfbLI1nX7/2QdOvTBBW+8DVbMa8Ewiel7mLY34jeYI8Tp S1Mrh0MHvtCI134+Uyn3qe7UxzZ81CZSKtHCMK6i7aeMlbhno0pZ5Hlfhcbcv3BQt+Ah STkLV8SYY/3sG2oSgUMMP5sNgKmuDV3ZFQ+58KHMhiYvvmYqbCYfMmjnCZOu8SyJ+1Uz a0uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=ZTsTAUO8; 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 u6-20020a170902e5c600b001cfbd996075si1284307plf.294.2023.11.30.05.47.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 05:47:29 -0800 (PST) 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=ZTsTAUO8; 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 74A8583F028F; Thu, 30 Nov 2023 05:47:21 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345857AbjK3NrA (ORCPT + 99 others); Thu, 30 Nov 2023 08:47:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345694AbjK3Nqi (ORCPT ); Thu, 30 Nov 2023 08:46:38 -0500 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 EAF9C1703 for ; Thu, 30 Nov 2023 05:46:44 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-40b4c2ef584so7730185e9.3 for ; Thu, 30 Nov 2023 05:46:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1701352003; x=1701956803; 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=/NPguL+egm1B/3hLyNOqRomxlJRtvAY3YVXSaylJwM0=; b=ZTsTAUO8Q5uQn33PwH90C0RCvf/d9jvERfPGPlJwgjE2f2UWjBaVy5KPIOpfvtUzOL zVA6S0UoM195MZr7cRWQz2g24tFJp/tg7DoN8qRtUd5mgr6+RyDZPgNjQyqUhz8L5xwn RTqqNYQmW2M8BUpfuNiuZD9pYl5oEjgoIgxfilf75+UGvc680VAok4QuHfiG7F0YjsKW PfSk7UW55TqmKvuykMhlZbryg7mX72hRc0Mv+Cd4NGbnQtRIcDWPe3poYU2U8Bw1Kecf +q+EuACXDr2HjP4pLhX990eAUw7h4rT0VLIUIeQptXzc5wKY3l+FNqkxDN0p0D6f4Rrl lj5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701352003; x=1701956803; 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=/NPguL+egm1B/3hLyNOqRomxlJRtvAY3YVXSaylJwM0=; b=ExytPLBNBejymZbZ+3fpw4dLQOH3+ADSRly/rlEFMoHserpy4LDHk0ELgUYuhmmJ4C m2c7KTYJ2XxNw5QRM8Kvlq9m2zc5BRFPJjj3LkYXkk15SI9NnddUwQXLaG5eU7wdI5pV OIOTZy29HZKotXOQf8cPtm3o3cfafnAYIBSHis23OirE59OvAT9XQ2eZYSR8T1hOfH8H 4J5om7yplcdhKL0QPO1O0q/t9FrLoTG7iNqHNgruxZ/Umlvk4edvgM2lgTg0qd1HwQzO 9nt0do9WHy/6Idks8Q8t6pE7QS4ykKBwCUCvIBs4upY3127fMLuEZiajMJBVJNfxZORq jHvg== X-Gm-Message-State: AOJu0Yw98OiHrBbijsab7YEFhIYup4zROSdhVIjVfx0cVTlVIQ2eXPMH y082mMnlW5TzlZ29pLgGZ7c5uQ== X-Received: by 2002:a05:600c:4592:b0:40b:26f1:57a2 with SMTP id r18-20020a05600c459200b0040b26f157a2mr16362430wmo.27.1701352003401; Thu, 30 Nov 2023 05:46:43 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:ae84:904:6602:ec1e]) by smtp.gmail.com with ESMTPSA id n18-20020adffe12000000b0032d2489a399sm1574824wrr.49.2023.11.30.05.46.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 05:46:42 -0800 (PST) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v2 06/10] pinctrl: nomadik: use gpiochip_dup_line_label() Date: Thu, 30 Nov 2023 14:46:26 +0100 Message-Id: <20231130134630.18198-7-brgl@bgdev.pl> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231130134630.18198-1-brgl@bgdev.pl> References: <20231130134630.18198-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 howler.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 (howler.vger.email [0.0.0.0]); Thu, 30 Nov 2023 05:47:21 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783996927108262419 X-GMAIL-MSGID: 1783996927108262419 From: Bartosz Golaszewski Use the new gpiochip_dup_line_label() helper to safely retrieve the descriptor label. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/nomadik/pinctrl-nomadik.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c index 863732287b1e..7911353ac97d 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c @@ -8,6 +8,7 @@ * Copyright (C) 2011-2013 Linus Walleij */ #include +#include #include #include #include @@ -917,7 +918,6 @@ static void nmk_gpio_dbg_show_one(struct seq_file *s, struct pinctrl_dev *pctldev, struct gpio_chip *chip, unsigned offset, unsigned gpio) { - const char *label = gpiochip_is_requested(chip, offset); struct nmk_gpio_chip *nmk_chip = gpiochip_get_data(chip); int mode; bool is_out; @@ -934,6 +934,10 @@ static void nmk_gpio_dbg_show_one(struct seq_file *s, [NMK_GPIO_ALT_C+4] = "altC4", }; + char *label = gpiochip_dup_line_label(chip, offset); + if (IS_ERR(label)) + return; + clk_enable(nmk_chip->clk); is_out = !!(readl(nmk_chip->addr + NMK_GPIO_DIR) & BIT(offset)); pull = !(readl(nmk_chip->addr + NMK_GPIO_PDIS) & BIT(offset));