From patchwork Thu Oct 19 17:34:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 155666 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp548691vqb; Thu, 19 Oct 2023 10:36:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFGDpIRVDANeyNEnrXxspdw9s0aKiI/pCJkg1YbQk0qyGkjGGj5jPSpR8cvG2AlgzWRcnW/ X-Received: by 2002:a17:902:d2d1:b0:1ca:8252:a91 with SMTP id n17-20020a170902d2d100b001ca82520a91mr3334111plc.41.1697737016327; Thu, 19 Oct 2023 10:36:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697737016; cv=none; d=google.com; s=arc-20160816; b=GLCU+dUofN6mucuz45lu4g8fIkNDLGS77HDh6g/2+P1dDtl7ESJ59QHwKi1ObJjYyC vfAfkmy1pqHxCiFw4eMePla0L/KLx+pMsfZrKhsCfapbBAvQeEqBttsvgYRdoX71PD3P R4GMLDmbgOgXH+e6TO5K5C4f+H9loCGw6Q1qPkCYstQks3gC0E0PIJAOKTCrW2PC3blG Rab0dYZNOq0Z445mRUmGXWwbGQy08nZ+izsbDSZUHk1CR/o+4Ad3rugDmHtQjJ//+5XG 9X99CwJaHGiuiSf+2e7howmkeBoIu7uLx9SHV1TpIyU5da/hHXTAWz3EAmrne2GBHKf3 e0gw== 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=XfbBmhRgEIz+gNMz158x/DbKNfDqJFUnwB0B8yf5S4c=; fh=7/omDlK7dosONq5l8CePi/uH/LZ0eAviv1Treoi9wLU=; b=fi2IodlVBPdQs5KYDhSHccranloyWCdEHudN+joOljbpH9vut6/vyQar3yn5K5qm9x 2qKmbYd7rV1p5lF6SfWVzOF9WWuIWeeQdPih4L14kNDS9Xmfx0NjOf7xV1R76SX+x1Cf L0T23jyFyGPiRla0um2+gItgkAw3NMy35ndH+TViIm2wCccMlBw7fRhc0RUN8/n55YVG ALHhcftyxQ10ETVhmCAkmudBpmvjnfRMIHSnjqxiDOTUKELNajseatlF+yLPGo/c+ku5 e2jDJCxkrenhXOsdSQxAgvfFJcb4JJuBeR6y4cjlo+bc9kNuJCgDdCzIVWmgDh7kP/d1 eSHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=FK3dayYJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id s17-20020a170902a51100b001bdd35033ebsi2370960plq.361.2023.10.19.10.36.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 10:36:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=FK3dayYJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 2307880A53D4; Thu, 19 Oct 2023 10:35:37 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346359AbjJSRfT (ORCPT + 26 others); Thu, 19 Oct 2023 13:35:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235501AbjJSRfJ (ORCPT ); Thu, 19 Oct 2023 13:35:09 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79398187; Thu, 19 Oct 2023 10:35:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697736907; x=1729272907; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3LQFQSjAmhdexmjB2MNVF4dNzHqUHaGq6iDWHa57HD8=; b=FK3dayYJ/IsW38/39Fd9b1lUfTJb1y5FN3c3veNQFrsbbzZnNcPO3lIB Hh7QAsKpaZzAXcIicrZpilpHj8/MGxx/DqkW6RwkzNsRaJ2TtFz2BuUYW iQFQyll3ocE5IgtUpPWGufM+wricACyO7B9q12u4UJ7f5pWwCjasucqJa DNwxIGvMAsh35gMUZEYWZmWIDTatqRQLNOMs5HMITsYLwIflpldD22zVB sb1GLXl62h181Sr9Nqj+on1AgosvX9/FlQn2j7jf/E6s5QtxlF+Jh+o5W AJRyyp4khZGsExmnDX7xg+pK5oTGD1Q5xUBvAl/cV1qU/tygjedgB/dJt g==; X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="389184265" X-IronPort-AV: E=Sophos;i="6.03,237,1694761200"; d="scan'208";a="389184265" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2023 10:35:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="760723569" X-IronPort-AV: E=Sophos;i="6.03,237,1694761200"; d="scan'208";a="760723569" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 19 Oct 2023 10:35:02 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 676D9A46; Thu, 19 Oct 2023 20:35:01 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Dmitry Torokhov , Bartosz Golaszewski , Linus Walleij , linux-gpio@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg , Bartosz Golaszewski , Hans de Goede , Ferry Toth Subject: [PATCH v1 3/3] gpiolib: Make debug messages in gpiod_find_by_fwnode() less confusing Date: Thu, 19 Oct 2023 20:34:57 +0300 Message-Id: <20231019173457.2445119-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231019173457.2445119-1-andriy.shevchenko@linux.intel.com> References: <20231019173457.2445119-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.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 (morse.vger.email [0.0.0.0]); Thu, 19 Oct 2023 10:35:38 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780206289244646330 X-GMAIL-MSGID: 1780206289244646330 Currently the extended debug messages have added confusion, but value when con_id is NULL, which is the case for, e.g., GPIO LEDs. Improve the messaging by using GPIO function name rather than con_id. This requires to split and move the second part after the respective calls. Reported-by: Ferry Toth Fixes: 8eb1f71e7acc ("gpiolib: consolidate GPIO lookups") Signed-off-by: Andy Shevchenko Acked-by: Linus Walleij --- drivers/gpio/gpiolib.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index beac3031246e..2cc275fb62b6 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -3946,18 +3946,15 @@ static struct gpio_desc *gpiod_find_by_fwnode(struct fwnode_handle *fwnode, struct gpio_desc *desc = ERR_PTR(-ENOENT); if (is_of_node(fwnode)) { - dev_dbg(consumer, "using DT '%pfw' for '%s' GPIO lookup\n", - fwnode, con_id); + dev_dbg(consumer, "using DT '%pfw' for GPIO lookup\n", fwnode); desc = of_find_gpio(to_of_node(fwnode), con_id, idx, propname, propsize, lookupflags); } else if (is_acpi_node(fwnode)) { - dev_dbg(consumer, "using ACPI '%pfw' for '%s' GPIO lookup\n", - fwnode, con_id); + dev_dbg(consumer, "using ACPI '%pfw' for GPIO lookup\n", fwnode); desc = acpi_find_gpio(fwnode, con_id, idx, propname, propsize, flags, lookupflags); } else if (is_software_node(fwnode)) { - dev_dbg(consumer, "using swnode '%pfw' for '%s' GPIO lookup\n", - fwnode, con_id); + dev_dbg(consumer, "using swnode '%pfw' for GPIO lookup\n", fwnode); desc = swnode_find_gpio(fwnode, con_id, idx, propname, propsize, lookupflags); } @@ -3993,10 +3990,12 @@ static struct gpio_desc *gpiod_find_and_request(struct device *consumer, } if (IS_ERR(desc)) { - dev_dbg(consumer, "No GPIO consumer %s found\n", con_id); + dev_dbg(consumer, "No GPIO descriptor for '%s' found\n", funcname); return desc; } + dev_dbg(consumer, "Found GPIO descriptor for '%s'\n", funcname); + /* * If a connection label was passed use that, else attempt to use * the device name as label @@ -4015,13 +4014,13 @@ static struct gpio_desc *gpiod_find_and_request(struct device *consumer, * FIXME: Make this more sane and safe. */ dev_info(consumer, - "nonexclusive access to GPIO for %s\n", con_id); + "nonexclusive access to GPIO for %s\n", funcname); return desc; } ret = gpiod_configure_flags(desc, funcname, lookupflags, flags); if (ret < 0) { - dev_dbg(consumer, "setup of GPIO %s failed\n", con_id); + dev_dbg(consumer, "setup of GPIO %s failed\n", funcname); gpiod_put(desc); return ERR_PTR(ret); }