From patchwork Mon Mar 6 19:55:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 65093 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2043850wrd; Mon, 6 Mar 2023 12:00:25 -0800 (PST) X-Google-Smtp-Source: AK7set/juV7KZDFObNIZYHsVh3PJpTnF3gdcZkZ1xOwS0opOszGLSo29AmiyHEe9Zs1kYqX0WIRm X-Received: by 2002:a05:6402:6cc:b0:4af:7dff:7b8d with SMTP id n12-20020a05640206cc00b004af7dff7b8dmr11548231edy.17.1678132825218; Mon, 06 Mar 2023 12:00:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678132825; cv=none; d=google.com; s=arc-20160816; b=BQxkRDlnj687n5LOAGdWCxM/8FUvlyeEjmqB7WnsS42pg3dC7TSXBhiNMD77oPGego hOZ2AQJ/tPlORRg+aUTr9qWJJHDJlhxqWensCyPJqVGEa6cqW96kmmdM1C7QBEiSm/G2 IlJY22Fs/NL/SyhjLwDRCUda9vquMcg/eLOhkAWmG2bpbzn2e7avpWFTEZYS67q4sbaG DXSH1Wi8mQ+9U+joLAUPzMyHRunpTdfra/bPrCf5ZZxr9e1EYAap6KLVqFFevpf7iBAi VcHgNSvojTlWaPzL3EF3RlkXUv7FrqV9XZ/Smup195qALBGoGXkXV2gzp0NOTuQjQ5Dx vHkg== 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=Y/PIICcPyvKCJoeIeaw4l0R5zBI4aRV6nXI7n+MunjQ=; b=xnYcTAdNta5Oi6eRDiySFuT/qstna2q84c8JZYcwZ7YYlfjy+OgCqjoKlPK74aiNxi KPkK7xT/yWezleNqGVW5Js/YHMtebYUXDPQwMESw1uPCxAhQS13I1bsv9YhJlArHvc+3 7vCkAlRN572d0zuDEt2cEGpvxERNTB4enLosx1CKrH9nXXEw8hC6SIHinwEanu2MkSAS flKlgIT/sL1gGYWDCPpPqqJvVsj+Lxw+BXX3oIWezLy8T2YfvZoQ/UK8qTqqJQpuWYGi 9isxTCXcdKrYVJbKIk0QqGHSxRZYJuLyMiQw0NCf9e9JgK8VUiNgnkFv2szYbzu4hU7x Fb9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=f+3A19+S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n23-20020aa7db57000000b004acb85b9c41si10772173edt.328.2023.03.06.12.00.00; Mon, 06 Mar 2023 12:00:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=f+3A19+S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230280AbjCFT4E (ORCPT + 99 others); Mon, 6 Mar 2023 14:56:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230180AbjCFTzq (ORCPT ); Mon, 6 Mar 2023 14:55:46 -0500 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE8F169238; Mon, 6 Mar 2023 11:55:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678132541; x=1709668541; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Dt4pdLMszFVaAbdqwI08UXnnW0vBxyo1Sqmq45vpnHo=; b=f+3A19+Sb1OHKZkOqtkN6wV8qFdXllCAYLRw2MPd1v98muXw5HMOfJTn qBT0tuwqpF4pWrYRhzD8otAeR55A7uYAfnS4EYrk/XLt8pE7TCqYllvzX 1WUHIIQXcXlq3tSPLBpEauCAy0wFYx4VhaLvez6DNMiqLiOZK66sB2xdo eGKq7mtUJ2N31g1c0mFgjjCyDCDMk+zF1uvML5yiSzmIbJ/AM2rjXq3v/ FmZ/MeGZJHmToWnGtVxSr9TGvncDE2DWHUZbq/qB+9ULTCxn+hcoc6Jsf f7cVQjKfvyo09tqrdL4GZCJpsL8OrL5FHNTN68VXqb3A7IzpNEPsYIgr0 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10641"; a="398240789" X-IronPort-AV: E=Sophos;i="5.98,238,1673942400"; d="scan'208";a="398240789" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 11:55:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10641"; a="819423558" X-IronPort-AV: E=Sophos;i="5.98,238,1673942400"; d="scan'208";a="819423558" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 06 Mar 2023 11:55:29 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 7A2E93CB; Mon, 6 Mar 2023 21:56:12 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Schspa Shi , Marc Zyngier , Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pwm@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, patches@opensource.cirrus.com Cc: Linus Walleij , Doug Berger , Florian Fainelli , Broadcom internal kernel review list , Andy Shevchenko , Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Maxime Coquelin , Alexandre Torgue , Kuppuswamy Sathyanarayanan , Nandor Han , Semi Malinen Subject: [PATCH v1 05/16] gpiolib: Utilize helpers from string_choices.h Date: Mon, 6 Mar 2023 21:55:45 +0200 Message-Id: <20230306195556.55475-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230306195556.55475-1-andriy.shevchenko@linux.intel.com> References: <20230306195556.55475-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759649805606197025?= X-GMAIL-MSGID: =?utf-8?q?1759649805606197025?= There are a few helpers available to convert a boolean variable to the dedicated string literals depending on the application. Use them in the driver. While at, utilize specifier field for padding the strings where it's required. Signed-off-by: Andy Shevchenko --- drivers/gpio/gpiolib-sysfs.c | 3 ++- drivers/gpio/gpiolib.c | 13 ++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c index c1cbf71329f0..54dc53b74dc4 100644 --- a/drivers/gpio/gpiolib-sysfs.c +++ b/drivers/gpio/gpiolib-sysfs.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -82,7 +83,7 @@ static ssize_t direction_show(struct device *dev, mutex_unlock(&data->mutex); - return sysfs_emit(buf, "%s\n", value ? "out" : "in"); + return sysfs_emit(buf, "%s\n", str_out_in(value)); } static ssize_t direction_store(struct device *dev, diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 700195a1faae..b554ad435245 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -4198,6 +4199,8 @@ EXPORT_SYMBOL_GPL(gpiod_get_index_optional); int gpiod_hog(struct gpio_desc *desc, const char *name, unsigned long lflags, enum gpiod_flags dflags) { + bool out = dflags & GPIOD_FLAGS_BIT_DIR_OUT; + bool hi = dflags & GPIOD_FLAGS_BIT_DIR_VAL; struct gpio_chip *gc; struct gpio_desc *local_desc; int hwnum; @@ -4218,10 +4221,7 @@ int gpiod_hog(struct gpio_desc *desc, const char *name, /* Mark GPIO as hogged so it can be identified and removed later */ set_bit(FLAG_IS_HOGGED, &desc->flags); - gpiod_info(desc, "hogged as %s%s\n", - (dflags & GPIOD_FLAGS_BIT_DIR_OUT) ? "output" : "input", - (dflags & GPIOD_FLAGS_BIT_DIR_OUT) ? - (dflags & GPIOD_FLAGS_BIT_DIR_VAL) ? "/high" : "/low" : ""); + gpiod_info(desc, "hogged as %s/%s\n", str_output_input(out), out ? str_high_low(hi) : "?"); return 0; } @@ -4509,10 +4509,9 @@ static void gpiolib_dbg_show(struct seq_file *s, struct gpio_device *gdev) value = gpio_chip_get_value(gc, desc); is_irq = test_bit(FLAG_USED_AS_IRQ, &desc->flags); active_low = test_bit(FLAG_ACTIVE_LOW, &desc->flags); - seq_printf(s, " gpio-%-3d (%-20.20s|%-20.20s) %s %s %s%s\n", + seq_printf(s, " gpio-%-3d (%-20.20s|%-20.20s) %-3.3s %-2.2s %s%s\n", gpio, desc->name ?: "", desc->label, - is_out ? "out" : "in ", - value >= 0 ? (value ? "hi" : "lo") : "? ", + str_out_in(is_out), value < 0 ? "?" : str_hi_lo(value), is_irq ? "IRQ " : "", active_low ? "ACTIVE LOW" : ""); } else if (desc->name) {