From patchwork Thu Nov 30 13:46:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 171895 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp396919vqy; Thu, 30 Nov 2023 05:47:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IHK/npDKibZL0EYfnq+5GJ5zCW5sJMAR5U+SkO8E1eZpTA2YKEhaOAjpErJUtoESsr6ryiN X-Received: by 2002:a17:902:e5c2:b0:1cf:dd41:dd1 with SMTP id u2-20020a170902e5c200b001cfdd410dd1mr12276048plf.27.1701352051965; Thu, 30 Nov 2023 05:47:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701352051; cv=none; d=google.com; s=arc-20160816; b=xY5C0OUeyWF8GMx5zQq9LcC7Yf64/1d/GACvFCWz4OBTSZVMFuUdyfVT4cLr302+rr MVwB3Aibp1F/P7Mpv/oJUmTeOws0v9OyfjdNkhTNOxREHamN3f2/iglmBFFRh0txElFZ XdGRJtoFZdx1bWREZyv7dSAnbLSkYYTCCMWGRbniF8mTrtDWICXA54eGMo7DD2LX5rPd 2XlrfqY8vXp4iQsxwXlYjY21yDzhzYov0hrSJpcd3432i5sm4+o+wKAnPfsiAVA6IgJS lwZG122cwW3sH1nDSHuvHSbYx+gdaVB/TzZZy8IlwWgtBA5sV3pMAdJM6ZTaNIf8H3qc Zc8w== 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=rQ4oN2yBzcOb1+JXtPZKrl0tpOl2eK1zlq9JfJmTld4=; fh=fw6biwzn34ngIUS3OuPB+D+TvAzoz1YwnvitHxA+Jyw=; b=PJwTj7BqzhHQ/d2J5DTRkjE8dL/XUAeZvpB6f69xKedJlnF02ntMD80kyyWEdwGM9u GDKr/niNIeximaaH8grT29aeQ1yolCA2R5rsh1dhZBZJpEBLJhTWxrBC2Lz57rkZ9cQI JHsgnSfsoDhs6fZct2FsH828X1eLVjKBPR6l0gsz+ESKCpYLfIXEqpy/JG2dqJVU8Wss 7+ton3oZH2wYZNY1c28tn8DZ7eyg5mBaOh+oGrSiiaQE6DdTYRSAug5epTKw6wq9KaD6 DZ7ts7JiM9xmOgRvR7lyA3gJuEze1Z3/jejOl8Mag4zmnsZTd/39wZKsGfJEABo//wRZ a61g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b="O52R2/k6"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id k1-20020a170902ba8100b001cfc2c87fbesi1208039pls.534.2023.11.30.05.47.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 05:47:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b="O52R2/k6"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 6F4E38030E54; Thu, 30 Nov 2023 05:47:26 -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 S1345894AbjK3NrG (ORCPT + 99 others); Thu, 30 Nov 2023 08:47:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345683AbjK3Nqk (ORCPT ); Thu, 30 Nov 2023 08:46:40 -0500 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA46C1709 for ; Thu, 30 Nov 2023 05:46:46 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-333229dcebdso431198f8f.0 for ; Thu, 30 Nov 2023 05:46:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1701352005; x=1701956805; 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=rQ4oN2yBzcOb1+JXtPZKrl0tpOl2eK1zlq9JfJmTld4=; b=O52R2/k6OkskTQsBSvj/PTMwCFu3+2ETaBaUKYlr+AhO7mU950wIaLOvdbkqLYXtwC FNvvbW3vJwBDY3GGVBdFrWqhhyEMcch0+u6A0q15Y75qGntWN18Get/3ZWiFhENlIhN3 H6ysmJdqT/OpBJ5JJjZblDE+8kvFtNZ3qMR9shrQaLnzaHJikcNbrlONwhY/QZikoMLR oS4NFXrfd1MrbaOdTfeqUcbccWPDpjJfX4vDpwz6l2bvYS5/Pb6VkTfM4GUYZ4g2TH/B wd75FZh9asf6VPD+U+0j/OPy3pBgKPkkV5zFUqcThO16qjsTshRWrDgTuvbmfP8MDeB2 MNSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701352005; x=1701956805; 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=rQ4oN2yBzcOb1+JXtPZKrl0tpOl2eK1zlq9JfJmTld4=; b=L+nU+A3c5syINU2m1XWt54wktwVdiNbJBUvXKz4DF2coLYlymp7ppgsTN2hCShWHPl y6bSMy5DOcCE0yk/g2qrz8QfiX9hZp27NyLywjk3MmQct0dOy9B3sKlfI6cp6b8Qs2PM J8pagZcp081TLel+z7jiRR7Ju3Yn4DbkLwpc/+XT3DaMvcS2Brnz29IUl1ApGw0ouW+x FgZuJQwMGbd9BDB1X4QkgsOY1irindg6Ig/ldHFdR2yLHcyqNXQ3thGVzWd50fIc0Wx2 zwcRmCoL5a9A9lF0kYUiXo5MT35sfgYZKkxn9dNh9jY8ej5UXZ9rQPQS3FkgacCkIHdV qk8A== X-Gm-Message-State: AOJu0YwKuownJM1DBlT7xluazitQNjCWCcNKTfvbuYlGyXzynhTaBoJe ykK0lJ8Tr2X6zyOhD5qffjY/Vw== X-Received: by 2002:a05:6000:114d:b0:333:2736:1e55 with SMTP id d13-20020a056000114d00b0033327361e55mr640974wrx.38.1701352005511; Thu, 30 Nov 2023 05:46:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 05:46:44 -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 08/10] pinctrl: sppctl: use gpiochip_dup_line_label() Date: Thu, 30 Nov 2023 14:46:28 +0100 Message-Id: <20231130134630.18198-9-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:26 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783996929033002801 X-GMAIL-MSGID: 1783996929033002801 From: Bartosz Golaszewski Use the new gpiochip_dup_line_label() helper to safely retrieve the descriptor label. Signed-off-by: Bartosz Golaszewski --- drivers/pinctrl/sunplus/sppctl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/pinctrl/sunplus/sppctl.c b/drivers/pinctrl/sunplus/sppctl.c index bb5ef391dbe4..ae156f779a16 100644 --- a/drivers/pinctrl/sunplus/sppctl.c +++ b/drivers/pinctrl/sunplus/sppctl.c @@ -4,6 +4,7 @@ * Copyright (C) Sunplus Tech / Tibbo Tech. */ +#include #include #include #include @@ -500,16 +501,15 @@ static int sppctl_gpio_set_config(struct gpio_chip *chip, unsigned int offset, static void sppctl_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) { - const char *label; int i; for (i = 0; i < chip->ngpio; i++) { - label = gpiochip_is_requested(chip, i); - if (!label) - label = ""; + char *label __free(kfree) = gpiochip_dup_line_label(chip, i); + if (IS_ERR(label)) + continue; seq_printf(s, " gpio-%03d (%-16.16s | %-16.16s)", i + chip->base, - chip->names[i], label); + chip->names[i], label ?: ""); seq_printf(s, " %c", sppctl_gpio_get_direction(chip, i) ? 'I' : 'O'); seq_printf(s, ":%d", sppctl_gpio_get(chip, i)); seq_printf(s, " %s", sppctl_first_get(chip, i) ? "gpi" : "mux");