From patchwork Thu Nov 30 13:46:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 171891 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp396758vqy; Thu, 30 Nov 2023 05:47:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IF4H4XV/y9CfcLx0XkvT3a+ElqWtAIatjBgWoa2CiZqvry2QWdNb3HhLuv4pA5x17KlhZde X-Received: by 2002:a05:6a20:4328:b0:18b:f4c6:4334 with SMTP id h40-20020a056a20432800b0018bf4c64334mr28536080pzk.6.1701352033219; Thu, 30 Nov 2023 05:47:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701352033; cv=none; d=google.com; s=arc-20160816; b=bPhfY1RC0Kb25RTKDJq+proh0OTzXCc263oJfBJAFOuggISbUMwKplRIUnOibqxcLf 9vOiSp11JQb60M1emyEeSLz1/ZAtF0DCXFfxz2jDH1Wvv9qY+zTqj5M4OMsRpwxxBPL7 p43gevVdTS0K8vZuyuSkBmc76HirmmTf+m+I1AUb8qLN7Tdo0ccSNyAnMw2bq5Sm4erS 7WFGgDjCFzuI3UQVMwLTJjnUSt7/Jed4ouBWhjypqijT+QwfrleP0AXCg9mht1Hz7sCd 9Si10QJUPwDjyrciY5HWmkbXIffXL8emENTuE/tSqBhRxWMZWTcQMb7sXYK7YoVXSptk ZR3g== 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=S7P6Y0m2hGBRRFmWFTt/dmCRHf+pQxLzAw7kKW52hRs=; fh=fw6biwzn34ngIUS3OuPB+D+TvAzoz1YwnvitHxA+Jyw=; b=Zs4Y7M8/is03lVqFaLcJnm4VtPcd6Z55DEuxCZyXw1n0TV82HAP0F4UMnYGNGQAYcO N41/KTo7EG24ujxoanZIxkkD8WtMBisS90tIho1nlBGaWbbScQQ/Vzx8b8ErK/L1eNls bXxCqpaUJktTI389+Qpk4SD2D/arORSejUiWv+03hxBDlGxmXlMqbbFYX2k6HvmmhkbR CnhsMqpaOB4vBKvIsO7TJnrzuz4owAgpuaZgqZm2h1sPRf+cRxfekk+iFLGD4JehtySz SARnRtPYXlWIM1bYYeEguDp6g/8yoooRs0vfoAhKI8xaG1Su/ybeT9ipa4fEVGsqCQYc zdyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=VIRvQo3R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id n21-20020a17090ac69500b002748c1bbd79si3597538pjt.6.2023.11.30.05.47.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 05:47:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=VIRvQo3R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id CE14A8028868; Thu, 30 Nov 2023 05:47:11 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345769AbjK3Nqz (ORCPT + 99 others); Thu, 30 Nov 2023 08:46:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345798AbjK3Nqg (ORCPT ); Thu, 30 Nov 2023 08:46:36 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECC1010F2 for ; Thu, 30 Nov 2023 05:46:41 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40b472f98b1so7713355e9.3 for ; Thu, 30 Nov 2023 05:46:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1701352000; x=1701956800; 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=S7P6Y0m2hGBRRFmWFTt/dmCRHf+pQxLzAw7kKW52hRs=; b=VIRvQo3RT4aiG5EG4mKWHcQyV7GPvY5DBdbAPcDXbhbaKucRHdzGN4jts4uum9Yp+h MXxwwlcBEY3tAjPfQqiPovgDFo0WhertxXzvHgTixfkA0XUejUFeScHRjNg/EJChvwTM C2L/0X88tdGU7Bz7WOl/KsiMq0mPmLWbjBsSOo63tmZleFRRZuHITTFIOHtPv6NUfEOr xV/VbgrHCmiPRQqcPOyIcV9hAANERBqVAVPSzCN8CrMcD2YKh2c8GeNfTGzqwPTXG/Ea fxBMjec+osOQDklpJDk29qj42/3FkypLIViummhPNnLTqjmr2S0QSN3+hEK/Nzz0Srcy dCvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701352000; x=1701956800; 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=S7P6Y0m2hGBRRFmWFTt/dmCRHf+pQxLzAw7kKW52hRs=; b=Ylhn6DqHZOtREWuZXabPe7bAPyyXI4hIMySwVQhxVeJINsveoNQjt66dN3Mr5NNUn1 L+PSRlfy1TTMYrjyYkO3EZbffGzTHKQzp2Yw4w3sh6x0wU47yqeQ61TJsiunshD7yr2j HDUUpb59scLCGTms5njs0osXAnSpvxqfny7LUOX4FZ/uobQM0fTGL7zUhvAl2nChy46b y/zAGKCq23LtlG+vUhgQyq1JLm8GuJlh8OFqbZ5GkgpnhNmYLxgEMyOjBAdoLr6O3eD6 B+zHn8fzeoTzKEiliheLwdM2vkEXtERwLeGXu+0D7csPZgSz+MwGHUUB0IxWXAnenU/G TsUg== X-Gm-Message-State: AOJu0Ywi5h4iS9SzEjH/ezIxZMPuNxBj8rlrpnslFexSOyJ1kGqoclqd l0YqmGf5feGpX6MBVUMLIz552w== X-Received: by 2002:a05:600c:46ce:b0:405:37bb:d942 with SMTP id q14-20020a05600c46ce00b0040537bbd942mr16123768wmo.4.1701352000315; Thu, 30 Nov 2023 05:46:40 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 05:46:39 -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 04/10] gpio: stmpe: use gpiochip_dup_line_label() Date: Thu, 30 Nov 2023 14:46:24 +0100 Message-Id: <20231130134630.18198-5-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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Thu, 30 Nov 2023 05:47:12 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783996909186530664 X-GMAIL-MSGID: 1783996909186530664 From: Bartosz Golaszewski Use the new gpiochip_dup_line_label() helper to safely retrieve the descriptor label. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-stmpe.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c index 27cc4da53565..6c5ee81d71b3 100644 --- a/drivers/gpio/gpio-stmpe.c +++ b/drivers/gpio/gpio-stmpe.c @@ -5,6 +5,7 @@ * Author: Rabin Vincent for ST-Ericsson */ +#include #include #include #include @@ -255,7 +256,6 @@ static void stmpe_dbg_show_one(struct seq_file *s, { struct stmpe_gpio *stmpe_gpio = gpiochip_get_data(gc); struct stmpe *stmpe = stmpe_gpio->stmpe; - const char *label = gpiochip_is_requested(gc, offset); bool val = !!stmpe_gpio_get(gc, offset); u8 bank = offset / 8; u8 dir_reg = stmpe->regs[STMPE_IDX_GPDR_LSB + bank]; @@ -263,6 +263,10 @@ static void stmpe_dbg_show_one(struct seq_file *s, int ret; u8 dir; + char *label __free(kfree) = gpiochip_dup_line_label(gc, offset); + if (IS_ERR(label)) + return; + ret = stmpe_reg_read(stmpe, dir_reg); if (ret < 0) return;