From patchwork Thu Nov 30 13:46:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 171898 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp397123vqy; Thu, 30 Nov 2023 05:47:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IGn1u04TeMB0oBNt/ZkRwEuuBGtf5Xs/ObIe6qEfr/qyTWTx+7QZaAiKayj+vP4AD43TVfq X-Received: by 2002:a05:6a00:1ca3:b0:692:b6e8:ce88 with SMTP id y35-20020a056a001ca300b00692b6e8ce88mr23263645pfw.17.1701352073652; Thu, 30 Nov 2023 05:47:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701352073; cv=none; d=google.com; s=arc-20160816; b=zszEtCaM0OntSn2WdpQSldEDUT+yKtfEWvlaOhbrf5WKKQTEn/r3fWJWua+kRtBNA2 ReHh9XZNdlQ9afkb1QcNr0qAMwBp82imgZvqcaPMejf0Zg1cVS0snNn1aW1rHRYdqK+G uDjhOzpWzxpHHNBjgC7/5EwhBqgdY+wUBIldUGNnbhqp5y2OU3NUmnn4zl9+bSBWjeAx P7A0HxCw3eVyP96s2tD9KO61+7PDwAsn/MbIltNMJgApxCMGdlXKPJTj08TQMZRNFbwa 0JfvGQ+v13GmYoVvUM9lcy/NMKFeX7TVfQOnJCR4q2oacnUVcNWOzdlDJMDlRlKPMRtW AScA== 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=FDkm1mz5JKda1Ie70um5gnCumWIdGzqKbagKhi4Mqgw=; fh=fw6biwzn34ngIUS3OuPB+D+TvAzoz1YwnvitHxA+Jyw=; b=kUqpGGZ5OSvFnF5xH6j2J4DikkvfmKRne1fEhoqekvVOKtvutSA4oXlcO43DzAiZuA /GGhyGesEJBwv3woswNV8Y1Kmhr07jp+RZUNPAqmU0Xvc0+IoFtvggKh7ptgQIrODAFZ K7CgkN5PUIHjpwm10vFpzzilFvyuCatXhZbFFDi+jDRlxlmm9lSpZS4AvEQxUXg93FVE 9ynHIVOOpWhOCFnbIMLAc37syp0QFxvtg45IixldUcGMfIteIPf28WB2w29WPgH2ofB3 6Ld4kEMj/Xg/gRKpZZRTnKiBkNutGAxtAzdzvnm20+zZQxjaxeFY6nDLyyaNoo/blrJ4 1+iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b="zO8d/RkZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id d2-20020a056a00244200b006cda14566f1si1295160pfj.150.2023.11.30.05.47.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 05:47:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b="zO8d/RkZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 2D40580239A0; Thu, 30 Nov 2023 05:47:48 -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 S1345733AbjK3Nqw (ORCPT + 99 others); Thu, 30 Nov 2023 08:46:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345795AbjK3Nqg (ORCPT ); Thu, 30 Nov 2023 08:46:36 -0500 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82550D40 for ; Thu, 30 Nov 2023 05:46:40 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40b31232bf0so7768965e9.1 for ; Thu, 30 Nov 2023 05:46:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1701351999; x=1701956799; 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=FDkm1mz5JKda1Ie70um5gnCumWIdGzqKbagKhi4Mqgw=; b=zO8d/RkZCozzHJ1jQKXdjSYznCbMIc23SHbSreyOKRFdYVhP+l2K2kxpdx5TeawVYM VObqZNzZkS73Kgy2UHewywsdJy3thgug3aq1ahTKAS2Oi61OSGMT8uHiliaZMkCBqGKH c/EkgFyKTTd878s3uk4QQTsN4e9IODJ/PNeZq24BOYkTKTyQYtJQExNUIUiCGvf+2tSo xdavwY5etTRVDax7kAnqhIAWMcrNnOQWIEyv/JuUXmRpPS6qHavUxpja+hqxJqokGvMP rnkdRhh4xz5psfSzzIlgywWJONcSfUzV2v8aoKx4MrWMERKU0/fYnxP8nCNj2vGPnRzF qJIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701351999; x=1701956799; 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=FDkm1mz5JKda1Ie70um5gnCumWIdGzqKbagKhi4Mqgw=; b=E9w89mgLY6Azld3+Rk5WDLfHJuRWLjn0tQBmM6Dlxb+C80pfbFTtnHhkax74bxV70q aB7tuL7PvVU/FMdB0IA3LwcYB50+YIDqvBBam2QcaWIvPiyVFAEVq1mV07vJjXRtiGOV 9BQFj7KFss+J4hKa0MDoc3ZHuo/8BAJlTaHqTPjgwZuUaRT0hLfMCrXANUmK2xGl0Dtl 8IuHZKV36xPUpAi4jT3jji6zVwGDqYCBLSP9cV61uzebJ2xQI+y7GSsuhXKWvH48g/7H KJ+1uFsJBmnhjs3QlSAPwimB2myPDtxWQvctgNHPAFKV03xuKOg46ya0tUOJam8/VOSc ADZA== X-Gm-Message-State: AOJu0YzsYp1l8RFE+Reej2AipEzKmXHMZDpahhZWe+mIrIr8TRG4Kb8m F5DLxjyPdCDMt+oGLIn2cPCdeg== X-Received: by 2002:a05:600c:290:b0:40b:377a:2ac1 with SMTP id 16-20020a05600c029000b0040b377a2ac1mr15522069wmk.20.1701351998814; Thu, 30 Nov 2023 05:46:38 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 05:46:38 -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 03/10] gpio: wm8994: use gpiochip_dup_line_label() Date: Thu, 30 Nov 2023 14:46:23 +0100 Message-Id: <20231130134630.18198-4-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 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]); Thu, 30 Nov 2023 05:47:48 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783996952061178303 X-GMAIL-MSGID: 1783996952061178303 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-wm8994.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpio-wm8994.c b/drivers/gpio/gpio-wm8994.c index f4a474cef32d..bf05c9b5882b 100644 --- a/drivers/gpio/gpio-wm8994.c +++ b/drivers/gpio/gpio-wm8994.c @@ -8,6 +8,7 @@ * */ +#include #include #include #include @@ -193,18 +194,20 @@ static void wm8994_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) for (i = 0; i < chip->ngpio; i++) { int gpio = i + chip->base; int reg; - const char *label; /* We report the GPIO even if it's not requested since * we're also reporting things like alternate * functions which apply even when the GPIO is not in * use as a GPIO. */ - label = gpiochip_is_requested(chip, i); - if (!label) - label = "Unrequested"; + char *label __free(kfree) = gpiochip_dup_line_label(chip, i); + if (IS_ERR(label)) { + dev_err(wm8994->dev, "Failed to duplicate label\n"); + continue; + } - seq_printf(s, " gpio-%-3d (%-20.20s) ", gpio, label); + seq_printf(s, " gpio-%-3d (%-20.20s) ", gpio, + label ?: "Unrequested"); reg = wm8994_reg_read(wm8994, WM8994_GPIO_1 + i); if (reg < 0) {