From patchwork Wed Nov 29 14:24:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 171385 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp374659vqn; Wed, 29 Nov 2023 06:26:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IFOA9QtoH7rJ6pW8LgJUzdIIZltv5s4LeP4Zl/swem/tQPfudfw1pe2Aft0cMAgI39ekxBv X-Received: by 2002:a05:6a21:6d95:b0:18c:9705:47cd with SMTP id wl21-20020a056a216d9500b0018c970547cdmr12631806pzb.52.1701267979704; Wed, 29 Nov 2023 06:26:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701267979; cv=none; d=google.com; s=arc-20160816; b=vI1dBjcOvA+v3sMy8iP0KU2yNX8c6k7QikO4S7MmYciAZRKoBchIsQ3RBPlO2kyS/j yoH+nOxNLmY45WiAHM+ho7MDwzGqWIHCu8nh1J/rrVCvnHZ9z0epghhKWERQRWGiFv+h /r+vRTsZ0UBVx3N0uJH7WQ/jNMN6v9nBiqU3l3jAwr0fFjDKDf4a9RqAr0E+02PAgPqq g6uy8MKAa3iAobvimJ3TK1mDSuBYI9pFhCy8PAkqp+w8Mzhu94bwj5ThF+q8h8xa5s3o vJmc8etJlQIM2KC+Ev8GoDnyK8VmgcKrb85TV5EEMVz6bNF89NX5irkCEIzDRhXLJpJc IRmQ== 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=qsuc13wUNymNgjsAcqpF0OUShSQ8LfWj9LDdemQBbq+p03GvaWMjD0ddhU/osx0kTl bvqda7jO+LXGZP21sxXTg83KqxQRpITsjxITXDtJixx1SiRocIwp2/NcbTiDz01F4sgl HnEj1rSDq8OHoF1wEi7eq3o8c/aZfH6D29Whl31f+MGH66cwFn6NEANaajNqXXl2Pk1u PKJY3Gc1koEwUqmYR7HTdwdkZcsLYM/ux/PWTxqjzLdR68o62Vz+JpVH9FF/fQ6kohdL aPqhs+66HCTFu80DM1nDxUfAmIZQwUcK5o/+05OE9D+0mj7TeWL3QaVrBrg4CuOj/mVL RBUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=cmui+8oU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id i18-20020a635852000000b005c61b749588si205685pgm.248.2023.11.29.06.26.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 06:26:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=cmui+8oU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id F3240807C5EA; Wed, 29 Nov 2023 06:25:16 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234391AbjK2OYj (ORCPT + 99 others); Wed, 29 Nov 2023 09:24:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234381AbjK2OYc (ORCPT ); Wed, 29 Nov 2023 09:24:32 -0500 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 211D1D6C for ; Wed, 29 Nov 2023 06:24:31 -0800 (PST) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2c8879a1570so86867521fa.1 for ; Wed, 29 Nov 2023 06:24:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1701267869; x=1701872669; 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=cmui+8oUvf4Ks+gTyWIBhQm5JG7ZMZ4iUa+RgGSbI1FOXXh9qfUqryLfKlHRm/NsR8 3sTfsLnrqes8B593KPQegLIqTkPCQIOTPGwqmxWQsxxNfg4po7gJhejOJJdSe2w0u5wA 6ulnaQENKCaSj9XjN1tQiW9dcMQ0iNIwMbLAsSqIAJXYeUAbjnLbB7m3sOJu18bNTQEG 7MYUe/nOcN3msrJCjSoDfUBtJg1ZtYInl6Qz+zmigAqKSkk5BXJ/3WdTlpPRKbj9wqZq zqYKZIj7A78lP+mkRl1K6S7ahdKTqSzi3Umd2dqBup5tKd7kR/FglystB0cuEw+uMHc2 dkdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701267869; x=1701872669; 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=e0SXF75sf9+RBz4J2pOqL+YYXDS+wr1eJThlKnd9eCz1Sce/nnXsoSYz8RCaA2ss8F wG3j18o+Hpovsgm4CyjQ5wTnNLifZdmOVZlXxcxkRVP7RWeKDGnbN//ow2EvLPQwUnYR DAp0L3AndlBBAfkAKeM7MM9QSX0P12tX+plhY54XTbIxttRZw1zUVCdxpWp2rGpT4t7h Jza9VzKoDRsKgGSVDp+8FzWDoVXVSue0JhcvDewNcpXEHIBUDGCSkozhsgnnz4FkP3Ub Y26RMoqYMQqrmAJ3Ec2WMh9jlkIUjjS1pZvO4IWI4vO4huAZI7JLM9Iitj61T2l42gU3 VXJA== X-Gm-Message-State: AOJu0YwsTQuoGo8iyqMowbA8mlrZdDyBS68ug2kskp0A1fx0Wj7z3+Xl Q1TEEELw2ODmKG5L2lyg30y9bg== X-Received: by 2002:a2e:9855:0:b0:2c9:c00a:c28e with SMTP id e21-20020a2e9855000000b002c9c00ac28emr1331701ljj.33.1701267869205; Wed, 29 Nov 2023 06:24:29 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:4520:2f25:4d3a:4adf]) by smtp.gmail.com with ESMTPSA id n40-20020a05600c3ba800b0040b34720206sm2406848wms.12.2023.11.29.06.24.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 06:24:28 -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 07/10] pinctrl: baytrail: use gpiochip_dup_line_label() Date: Wed, 29 Nov 2023 15:24:08 +0100 Message-Id: <20231129142411.76863-8-brgl@bgdev.pl> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231129142411.76863-1-brgl@bgdev.pl> References: <20231129142411.76863-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 pete.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 (pete.vger.email [0.0.0.0]); Wed, 29 Nov 2023 06:25:17 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783908772856686047 X-GMAIL-MSGID: 1783908772856686047 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),