From patchwork Thu Nov 30 13:46:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 171894 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp396913vqy; Thu, 30 Nov 2023 05:47:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IEKqCIeIXf2k7yhIvJ7XnWwMMzkHeeSPLYQ8yPp8kI3cIU8fo5dL5r4+/A6+cs9rHmTouwt X-Received: by 2002:a05:6a21:62f:b0:18b:b97:cdf4 with SMTP id ll47-20020a056a21062f00b0018b0b97cdf4mr19139240pzb.3.1701352050933; Thu, 30 Nov 2023 05:47:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701352050; cv=none; d=google.com; s=arc-20160816; b=E6yk3Tibz6wQAiBAdJr0muBarlkhzp0F8DDF+ERaZByuaEkAla4eJzzZ3UDEGH37rK OjrMx9ANWPJ4cadcPvDctGbQGOspTuGzeapc3aSUL3D/EPOoT9tkFMtCUwaxo0i+FwV+ rBN4Wi8NLF/qxRiM+KAfrCmRR8Gj+nb285Gx0dB0EHgCuRFsMZpZL+LvDRa4+/hudgIy ZrDHDKpWQomKOez3fj92WPvGy7AaYEiSueMLbYAwy+LrECDddk9QvDnEXNsb3uFx2ny0 4QHMdi89q3HOUQmlUN3uWisuvLFsZzFZRqqYMUOw8UE38U/zR4FMXDZ5rysNy4qyKyvm 4E7g== 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=lX1sqlEJJ4vEUK91SFq6mj5SEAnM+ha5YxcxRVGS6+w=; fh=fw6biwzn34ngIUS3OuPB+D+TvAzoz1YwnvitHxA+Jyw=; b=mP+Mlzse2Kd+4B5Pphsh79bPIlhfL453q6OG6Ddn/lSG0z2YTLcef1ys1LFajRZMOQ hYOxKT6lPYbORhbg4jqxDlUzePorA6cGCZPjOHq2ONbA+HASy3YfbrhU78Ya5/8VzyZw d/gcyjd3ZxPQKlAvQV+844KRs0ucw2JtQfOe94esaKEZZSq8PE2iMgJXYRZ2pcnR+iJM 5cRWoJroGCG+rM9PsnP3cSueTit4JJLS2eXf7WbmRt+jOoGJbGDGn3ge3xiGCObuxinv 0yFGGZko/f+mOhu7481LvPOenI/AxdSUpJkCVQ/8x5/HYk1gIpfwHSzX6XyhyA4fSC0H yU5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=hPzNjZP3; 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 b11-20020a63e70b000000b005b929886d2bsi1358034pgi.138.2023.11.30.05.47.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 05:47:30 -0800 (PST) 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=hPzNjZP3; 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 133FF8030E5A; Thu, 30 Nov 2023 05:47:25 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345887AbjK3NrD (ORCPT + 99 others); Thu, 30 Nov 2023 08:47:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345721AbjK3Nqj (ORCPT ); Thu, 30 Nov 2023 08:46:39 -0500 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5A4D10E5 for ; Thu, 30 Nov 2023 05:46:45 -0800 (PST) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-332ed1bd4cbso605720f8f.2 for ; Thu, 30 Nov 2023 05:46:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1701352004; x=1701956804; 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=lX1sqlEJJ4vEUK91SFq6mj5SEAnM+ha5YxcxRVGS6+w=; b=hPzNjZP3MiHNlaiBNK5uHoOFDkljjmXAmcylnoFm60bgMec4QC4X5skCapr3qftKoj PgR9V1jJg3RAPnvw7nxRVZGHqVMrpqrAtH0pxO71h7Ihfy7hGyL700YhG6gWF4cIHFux +eCppziCbu5N52REsxeqWAonVjw497Af7hLBVoD/6VUFEbZ01bPwA4iMUAGUIJqsHNT/ b1biUc5LuPW2PI3W0Yk+RSMcUmYAQoTPnAv24qPVsboxDUO12E915sDm9jcu18CYRRVl H8rjZCZFUlBL4z1GdJk6pSEkm282W9ZIiIotZQY9ZbNwicOCJOyxEc/qVeOi5ywpjYbi RgBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701352004; x=1701956804; 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=lX1sqlEJJ4vEUK91SFq6mj5SEAnM+ha5YxcxRVGS6+w=; b=PpAm0tyCeLW9IDrhoV4/Tm+yGwB7Mv1Yqaj498AteiXRYDt1e38Q4/MmE7ko0l4GF0 12V2EOmcKz19lpWd2M3KKpyT+VH4FoKxJRZ/N4f7/jrHJA0wSXvMEo/zC9KjstX+NhgH 1z08lrn9SVRMH0qI7m/HOS8DA/IIwv/4m7z4EK5X1FxrL908/4K5gTnq+sxzELuk+itm 7b7rwjQzE6FyAAOB+Iwu4WyjD8CIk+CXR87wyKBrs1zg+uudf3q/uhPuLGAk93bxqnbo 0waqqZ0MVdfj7MKGxYJgaqg2HwOl0/Hk4blRUqFCHhgYhwTU1dQQPIxsrhu7actOp/aO TmGA== X-Gm-Message-State: AOJu0YzjByANexlW2gjDgXeqg5vuJ3uR/AW/VkctXSC/XL8AsuuMuleu bzAePPeiwQDaSMYcahDDvGr/yQ== X-Received: by 2002:adf:f305:0:b0:333:2e28:46f5 with SMTP id i5-20020adff305000000b003332e2846f5mr53628wro.1.1701352004522; Thu, 30 Nov 2023 05:46:44 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 05:46:43 -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 07/10] pinctrl: baytrail: use gpiochip_dup_line_label() Date: Thu, 30 Nov 2023 14:46:27 +0100 Message-Id: <20231130134630.18198-8-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 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]); Thu, 30 Nov 2023 05:47:25 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783996928106327265 X-GMAIL-MSGID: 1783996928106327265 From: Bartosz Golaszewski Use the new gpiochip_dup_line_label() helper to safely retrieve the descriptor label. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/intel/pinctrl-baytrail.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-baytrail.c b/drivers/pinctrl/intel/pinctrl-baytrail.c index 3cd0798ee631..3c8c02043481 100644 --- a/drivers/pinctrl/intel/pinctrl-baytrail.c +++ b/drivers/pinctrl/intel/pinctrl-baytrail.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -1173,7 +1174,6 @@ static void byt_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) const char *pull_str = NULL; const char *pull = NULL; unsigned long flags; - const char *label; unsigned int pin; pin = vg->soc->pins[i].number; @@ -1200,9 +1200,10 @@ static void byt_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) seq_printf(s, "Pin %i: can't retrieve community\n", pin); continue; } - label = gpiochip_is_requested(chip, i); - if (!label) - label = "Unrequested"; + + char *label __free(kfree) = gpiochip_dup_line_label(chip, i); + if (IS_ERR(label)) + continue; switch (conf0 & BYT_PULL_ASSIGN_MASK) { case BYT_PULL_ASSIGN_UP: @@ -1231,7 +1232,7 @@ static void byt_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) seq_printf(s, " gpio-%-3d (%-20.20s) %s %s %s pad-%-3d offset:0x%03x mux:%d %s%s%s", pin, - label, + label ?: "Unrequested", val & BYT_INPUT_EN ? " " : "in", val & BYT_OUTPUT_EN ? " " : "out", str_hi_lo(val & BYT_LEVEL),