From nobody Tue Dec 16 05:58:56 2025 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F08D1FC10E for ; Tue, 14 Jan 2025 19:14:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736882088; cv=none; b=MH7zGFVCU5+blFfhirV5iHHjnIm91k3g9EuNijtZxlISkb1Vmrz8mI2ZU3dJWE36IBEErVhDq9uOvm2G1MiZPRmtPNIFqZSjhVaQtBoCxw8x0pLgKIXr2wldxIBk9Atu6NJo/DAXAyVLOAJijacmkm5UPdMgiNwYcu1QE4Q24Jc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736882088; c=relaxed/simple; bh=WobRk9G+jzoYeDi9BvlQAf+Z+kwUm1ZqcHZtiyky5Ps=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=dyKo6J9p/r2gjMmSEshLqymfvHu72RdTUIuDE8A4qQGCQAzwKNdGBjSp4HIhKSD1O9DVM+rhlPomV6gH6BHB0zGZx1KCbmpBOleloyHdbBHUk7ZTYCSLdG7SNdmEyKhFutZnUBZXqfDI8TGrWLcqMAJ8eOfiDa1GOjTwy1vjEXM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=K8W8VpTI; arc=none smtp.client-ip=209.85.221.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="K8W8VpTI" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-38625aa01b3so562469f8f.3 for ; Tue, 14 Jan 2025 11:14:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736882085; x=1737486885; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=oQ6kl1euqxUXFmiD96nPxmfZ3b58EO9sP3qhQv0QOX0=; b=K8W8VpTIu70Kult+qkd4T88tfhplrW6U6Bo5lRXsaGIJq6z50J32rqmyqYwrUfab2p fDjR5es7UqPCmTturauhtWbv7qnVsjRKdrFNLV1wrKrHQ2YYkx3Oaj/P2eOZZypfSiJ0 xSSHKkpOf93Z8MLaOUGEo0soSBzDawL7bUd3brPEwE2LCgWtiQgOXaRkk1HWsKfUU2XR 0X2X6F43mwU7t58J/MkqJ527aKHlfJQ7giABEL/EH/Y7yVfaM/MctvhntQRlTqqeDm7T SQDyhAHY8iKPCvdLUHl/gL7TCuzAkVkKzAbPRX4itwJ+aXGmUjq3Spe2Ijj70pE4jLFl jy9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736882085; x=1737486885; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oQ6kl1euqxUXFmiD96nPxmfZ3b58EO9sP3qhQv0QOX0=; b=dg06pnlkADypHLc5ey0sWIipjLjwu31dTZnRdNYqPrD1apu1r7nACimjQ3MN7QbrEG stBFCScDQdUGWr5Tz6ZgKijFjvRR43kBr411ZUbV/2mggzFHuQAsvv9mYOfhJRD1Uk+2 4a4cavO1iwpw5dcHxQnskDS4lpbWF4CpLkSAUk/+En/jewLuaKpu340wIyBefh5413mr xLFbvkZH/nZXozibyuYIPXmuCpu8Hz/mR+s5IaBmokFXkT+HFbj5QRhjBXT1AnZSrqqD bIXMMoBaLs7nvWcA6fN7jknPygHLxzEVU5QZ49/XlruyAfuriMdHIRa0wMpVWa9Zisac 0wcA== X-Forwarded-Encrypted: i=1; AJvYcCU2lJ4jwPfZpE2B8tf8XI5WEJyAyibVM0oyfVQQ/My5pSl8MeWBvhBeRGtqGRBUg3KlTPvoyK6DIDE8f3s=@vger.kernel.org X-Gm-Message-State: AOJu0YwJQ4CiG5Jk/fy28bcomSVgrvj5yF+5d94HOtMK77Yn6xL9OBGX xP6PckZKovuNWN4k1CsKFitU5SjfB3KmkQ8D/KuhbmsHHg/QK5xEwEUN3MfIsAk= X-Gm-Gg: ASbGncujafBzCNeP1rBFCYwezMK5ASAs+u3wuYLSXi8vgaAVmWzWMcYmiFsaMk2T0bz 8rozJT3obnkMhJjHxVi44DJwE1AKoB1okRyiygf6PrPfX5nAA3CPGXvazGu2VBKjb/Y1v2ZbyIq hmXx5DsGLLr6N45NPcX9/LySBlv5wDtyGdtV5KMJdIXDo5a6K7OakKJrxtCdV6AwzNvuy8kJQ2x urCXShaBvw8gjXlU+124IUSEwzn8N4EV7lGsaOEl2flp3bcOXR5BGhGt6lNgtKMrzMKcVQ= X-Google-Smtp-Source: AGHT+IH1zV4TdpuGEzXlmDKzlhTZeOglE/e6Vh0NhLYPgPb3r+w0Yshbz4UIzt3sqXZwggicjeJV+A== X-Received: by 2002:a05:6000:18a3:b0:38a:615c:8266 with SMTP id ffacd0b85a97d-38a872d2e1cmr9347396f8f.1.1736882084522; Tue, 14 Jan 2025 11:14:44 -0800 (PST) Received: from krzk-bin.. ([178.197.223.165]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a8e4b80b2sm15415992f8f.80.2025.01.14.11.14.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 11:14:43 -0800 (PST) From: Krzysztof Kozlowski To: Doug Berger , Florian Fainelli , Broadcom internal kernel review list , Linus Walleij , Bartosz Golaszewski , Andy Shevchenko , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Maxime Coquelin , Alexandre Torgue , Kuppuswamy Sathyanarayanan , Nandor Han , linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, patches@opensource.cirrus.com Cc: Krzysztof Kozlowski Subject: [PATCH v2] gpio: Use str_enable_disable-like helpers Date: Tue, 14 Jan 2025 20:14:38 +0100 Message-ID: <20250114191438.857656-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace ternary (condition ? "enable" : "disable") syntax with helpers from string_choices.h because: 1. Simple function call with one argument is easier to read. Ternary operator has three arguments and with wrapping might lead to quite long code. 2. Is slightly shorter thus also easier to read. 3. It brings uniformity in the text - same string. 4. Allows deduping by the linker, which results in a smaller binary file. Reviewed-by: Florian Fainelli Signed-off-by: Krzysztof Kozlowski Acked-by: Doug Berger Reviewed-by: Charles Keepax Reviewed-by: Linus Walleij --- Changes in v2: 1. Many more files changed. --- drivers/gpio/gpio-brcmstb.c | 3 ++- drivers/gpio/gpio-crystalcove.c | 3 ++- drivers/gpio/gpio-grgpio.c | 3 ++- drivers/gpio/gpio-mvebu.c | 7 ++++--- drivers/gpio/gpio-nomadik.c | 3 ++- drivers/gpio/gpio-stmpe.c | 6 +++--- drivers/gpio/gpio-wcove.c | 3 ++- drivers/gpio/gpio-wm831x.c | 3 ++- drivers/gpio/gpio-xra1403.c | 3 ++- drivers/gpio/gpiolib.c | 3 ++- 10 files changed, 23 insertions(+), 14 deletions(-) diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index 491b529d25f8..ca3472977431 100644 --- a/drivers/gpio/gpio-brcmstb.c +++ b/drivers/gpio/gpio-brcmstb.c @@ -9,6 +9,7 @@ #include #include #include +#include =20 enum gio_reg_index { GIO_REG_ODEN =3D 0, @@ -224,7 +225,7 @@ static int brcmstb_gpio_priv_set_wake(struct brcmstb_gp= io_priv *priv, ret =3D disable_irq_wake(priv->parent_wake_irq); if (ret) dev_err(&priv->pdev->dev, "failed to %s wake-up interrupt\n", - enable ? "enable" : "disable"); + str_enable_disable(enable)); return ret; } =20 diff --git a/drivers/gpio/gpio-crystalcove.c b/drivers/gpio/gpio-crystalcov= e.c index 25db014494a4..56effd0f50c7 100644 --- a/drivers/gpio/gpio-crystalcove.c +++ b/drivers/gpio/gpio-crystalcove.c @@ -15,6 +15,7 @@ #include #include #include +#include #include =20 #define CRYSTALCOVE_GPIO_NUM 16 @@ -317,7 +318,7 @@ static void crystalcove_gpio_dbg_show(struct seq_file *= s, struct gpio_chip *chip offset =3D gpio % 8; seq_printf(s, " gpio-%-2d %s %s %s %s ctlo=3D%2x,%s %s %s\n", gpio, ctlo & CTLO_DIR_OUT ? "out" : "in ", - ctli & 0x1 ? "hi" : "lo", + str_hi_lo(ctli & 0x1), ctli & CTLI_INTCNT_NE ? "fall" : " ", ctli & CTLI_INTCNT_PE ? "rise" : " ", ctlo, diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c index 169f33c41c59..30a0522ae735 100644 --- a/drivers/gpio/gpio-grgpio.c +++ b/drivers/gpio/gpio-grgpio.c @@ -30,6 +30,7 @@ #include #include #include +#include =20 #define GRGPIO_MAX_NGPIO 32 =20 @@ -438,7 +439,7 @@ static int grgpio_probe(struct platform_device *ofdev) } =20 dev_info(dev, "regs=3D0x%p, base=3D%d, ngpio=3D%d, irqs=3D%s\n", - priv->regs, gc->base, gc->ngpio, priv->domain ? "on" : "off"); + priv->regs, gc->base, gc->ngpio, str_on_off(priv->domain)); =20 return 0; } diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c index 5ffb332e9849..363bad286c32 100644 --- a/drivers/gpio/gpio-mvebu.c +++ b/drivers/gpio/gpio-mvebu.c @@ -49,6 +49,7 @@ #include #include #include +#include =20 /* * GPIO unit register offsets. @@ -907,14 +908,14 @@ static void mvebu_gpio_dbg_show(struct seq_file *s, s= truct gpio_chip *chip) =20 if (is_out) { seq_printf(s, " out %s %s\n", - out & msk ? "hi" : "lo", + str_hi_lo(out & msk), blink & msk ? "(blink )" : ""); continue; } =20 seq_printf(s, " in %s (act %s) - IRQ", - (data_in ^ in_pol) & msk ? "hi" : "lo", - in_pol & msk ? "lo" : "hi"); + str_hi_lo((data_in ^ in_pol) & msk), + str_lo_hi(in_pol & msk)); if (!((edg_msk | lvl_msk) & msk)) { seq_puts(s, " disabled\n"); continue; diff --git a/drivers/gpio/gpio-nomadik.c b/drivers/gpio/gpio-nomadik.c index 836f1cc760c2..fa19a44943fd 100644 --- a/drivers/gpio/gpio-nomadik.c +++ b/drivers/gpio/gpio-nomadik.c @@ -30,6 +30,7 @@ #include #include #include +#include #include =20 #include @@ -430,7 +431,7 @@ void nmk_gpio_dbg_show_one(struct seq_file *s, struct p= inctrl_dev *pctldev, seq_printf(s, " gpio-%-3d (%-20.20s) out %s %s", gpio, label ?: "(none)", - data_out ? "hi" : "lo", + str_hi_lo(data_out), (mode < 0) ? "unknown" : modes[mode]); } else { int irq =3D chip->to_irq(chip, offset); diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c index 75a3633ceddb..2e22e1eb7495 100644 --- a/drivers/gpio/gpio-stmpe.c +++ b/drivers/gpio/gpio-stmpe.c @@ -15,6 +15,7 @@ #include #include #include +#include =20 /* * These registers are modified under the irq bus lock and cached to avoid @@ -273,8 +274,7 @@ static void stmpe_dbg_show_one(struct seq_file *s, =20 if (dir) { seq_printf(s, " gpio-%-3d (%-20.20s) out %s", - gpio, label ?: "(none)", - val ? "hi" : "lo"); + gpio, label ?: "(none)", str_hi_lo(val)); } else { u8 edge_det_reg; u8 rise_reg; @@ -343,7 +343,7 @@ static void stmpe_dbg_show_one(struct seq_file *s, =20 seq_printf(s, " gpio-%-3d (%-20.20s) in %s %13s %13s %25s %25s", gpio, label ?: "(none)", - val ? "hi" : "lo", + str_hi_lo(val), edge_det_values[edge_det], irqen ? "IRQ-enabled" : "IRQ-disabled", rise_values[rise], diff --git a/drivers/gpio/gpio-wcove.c b/drivers/gpio/gpio-wcove.c index 94ca9d03c094..1ec24f6f9300 100644 --- a/drivers/gpio/gpio-wcove.c +++ b/drivers/gpio/gpio-wcove.c @@ -15,6 +15,7 @@ #include #include #include +#include =20 /* * Whiskey Cove PMIC has 13 physical GPIO pins divided into 3 banks: @@ -393,7 +394,7 @@ static void wcove_gpio_dbg_show(struct seq_file *s, str= uct gpio_chip *chip) =20 seq_printf(s, " gpio-%-2d %s %s %s %s ctlo=3D%2x,%s %s\n", gpio, ctlo & CTLO_DIR_OUT ? "out" : "in ", - ctli & 0x1 ? "hi" : "lo", + str_hi_lo(ctli & 0x1), ctli & CTLI_INTCNT_NE ? "fall" : " ", ctli & CTLI_INTCNT_PE ? "rise" : " ", ctlo, diff --git a/drivers/gpio/gpio-wm831x.c b/drivers/gpio/gpio-wm831x.c index f7d5120ff8f1..61bb83a1e8ae 100644 --- a/drivers/gpio/gpio-wm831x.c +++ b/drivers/gpio/gpio-wm831x.c @@ -16,6 +16,7 @@ #include #include #include +#include =20 #include #include @@ -234,7 +235,7 @@ static void wm831x_gpio_dbg_show(struct seq_file *s, st= ruct gpio_chip *chip) seq_printf(s, " %s %s %s %s%s\n" " %s%s (0x%4x)\n", reg & WM831X_GPN_DIR ? "in" : "out", - wm831x_gpio_get(chip, i) ? "high" : "low", + str_high_low(wm831x_gpio_get(chip, i)), pull, powerdomain, reg & WM831X_GPN_POL ? "" : " inverted", diff --git a/drivers/gpio/gpio-xra1403.c b/drivers/gpio/gpio-xra1403.c index dc2710c21c50..842cf875bb92 100644 --- a/drivers/gpio/gpio-xra1403.c +++ b/drivers/gpio/gpio-xra1403.c @@ -13,6 +13,7 @@ #include #include #include +#include #include =20 /* XRA1403 registers */ @@ -140,7 +141,7 @@ static void xra1403_dbg_show(struct seq_file *s, struct= gpio_chip *chip) seq_printf(s, " gpio-%-3d (%-12s) %s %s\n", chip->base + i, label, (gcr & BIT(i)) ? "in" : "out", - (gsr & BIT(i)) ? "hi" : "lo"); + str_hi_lo(gsr & BIT(i))); } } #else diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 679ed764cb14..be3351583508 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -26,6 +26,7 @@ #include #include #include +#include =20 #include #include @@ -5007,7 +5008,7 @@ static void gpiolib_dbg_show(struct seq_file *s, stru= ct gpio_device *gdev) seq_printf(s, " gpio-%-3u (%-20.20s|%-20.20s) %s %s %s%s\n", gpio, desc->name ?: "", gpiod_get_label(desc), is_out ? "out" : "in ", - value >=3D 0 ? (value ? "hi" : "lo") : "? ", + value >=3D 0 ? str_hi_lo(value) : "? ", is_irq ? "IRQ " : "", active_low ? "ACTIVE LOW" : ""); } else if (desc->name) { --=20 2.43.0