From nobody Tue Dec 16 07:20:39 2025 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 5AD3514A60C for ; Tue, 14 Jan 2025 19:25:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736882757; cv=none; b=nqLa+E3dN5Cmgp4Gh62ixMlvqfjnMDlt0BrFKGrSRCBBVcLm4t1L55XQnBd7t6M8nZXMUUHmLc7drm2LbUowWt/j83AylGAMrKRZOkfHsCF9xbhefTGFvS7yoBPAtBdZ47d9sPDJr96TiJQZbC2qfxzfy2X60tkslzLzfZBETf8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736882757; c=relaxed/simple; bh=630Dtk9XqVXd+b2z4IE+0htAQoPu0Pp8fzQGvvHU508=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Eqg6az6d8xHrMtXNBA7Dg2pwi8/ufm0OMlgP2o0vFT9z1ftqcO/OKDDcPnSQuLose2swXPVLOll+YmyyNOYNC7yndYypkoRW11XoT+H0rHCA3wMcUR1tkHvP+dVCE3sPZybGbZYeZUD5qBG3+Z1ByUNtBdPX162CXrTGb+cb/GE= 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=l52aBARx; arc=none smtp.client-ip=209.85.128.44 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="l52aBARx" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-436246b1f9bso7397085e9.1 for ; Tue, 14 Jan 2025 11:25:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736882754; x=1737487554; 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=ZGRORRzHlqqoLcj+KiekPEOP4XsmPqTRLnpcdnHBZZs=; b=l52aBARxOJkokZwVqM+pVwRHN8hf0ld4KgGGMd/WsrCbVbaEgqDEPseGFoBz54Wx0c zeYnTM02afdRxdd9euOf/2YRY+XwmN8P5Qpynue3wUOjFfKfdzrMZOV2JS+iwPmmY00N WWuZBmxkF6DX1e9a2rk8e7dnMl02pSR7xhh1b5gr7E/TtwG0TQnD7WCVgIkI2rViWATo 9HVfT6RG3SXVno1KqzSjWmF+Ayt1acSB907jXdP+dDhHgl+NBHnHgIpD+abOrTK9AZHL xUMheKMiQZPy0nDnLkEDzFlNYeSMN8Kr3kRGw+RrnMcZWvl6zMefvBFWqQKbaRFfEn5h QLcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736882754; x=1737487554; 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=ZGRORRzHlqqoLcj+KiekPEOP4XsmPqTRLnpcdnHBZZs=; b=tSnbWf2UQdgZ+VoCWqLCesTTF+HRxLq3jRBJeQgQTUIUyP6T2rZyw6EGYAAhf5zudN 9oteKuGA03LsxhlJIl1YB2ikjHVqJ0REH8KmOFo80qZXXLFV3G7543QsxFQ4xCcTrqCX n8po+sy+ySn8WIrIYoLj+sKooDqIcXMsf/uYItYGZvpO7mTTFhygHe1+P6LbDJazfd0v vSgAOd0dinWZ3r/ipauHfOP4JdvzEkCxv9XCO2DB9EZrgYep4dGE8iT5LQjS18dNAXJk OaBCQGgGOZSKdLQdIgiJcQVMZWVbJkQQ1ndE53RDYVFbBIQmxqKBWN8VM1RilEwaBJGK JTlg== X-Forwarded-Encrypted: i=1; AJvYcCVRHZdO9OXLsGHFQqpHSyoySY7WRdr+7wt0DjlJyDqX+ysOdySrTBzeDchvgH8Gdz15Ym/xeOVP86l4BLc=@vger.kernel.org X-Gm-Message-State: AOJu0YwP3T1lDbk7CZdNufPOLKEW4ZHGDZj6wzwfybcVyq2OAwcdgsep LMuzuNm7sNkNlQpTkkpopA3oe24LhCstwa8bSEeMdj6ZkXc66HWnmp898isGvQxinYs30QoTP5s 8 X-Gm-Gg: ASbGncuXCcHTWq6L3rf81Tl0t6Mo6WjoI9yhlE5hyJU/v7Z7+7e9Qv8jMqDNtt1aPu1 WdSmrWm7C3ll8mgXD4ZSoJKxtiUf/TPn2lCBJyvUh9U32HHtTSLclwPKpQGTcCwj1kmYX123YD9 DAyLX662edIp5jIHV5QMhduRV1UNfDZMoMIjWd+x1isGVaB9mjN6Lrer/xHJvt2gsp7FzH1Hvfl 8yYT5MrmNChyhIXBfnN1ZTD83yDLxewgV7K1eJUo0ld5leNB82vwr4mpUGIDY0JVttXGy0= X-Google-Smtp-Source: AGHT+IHIZypvcMDyCvn9SatlpMmBUwuZv5AlIybdSSYlRKwIkNu8eDSrYecF7Gd7paZ7Ywia8ZKXhg== X-Received: by 2002:a05:600c:1d07:b0:436:1902:23b5 with SMTP id 5b1f17b1804b1-436e26f4abbmr93184505e9.4.1736882753534; Tue, 14 Jan 2025 11:25:53 -0800 (PST) Received: from krzk-bin.. ([178.197.223.165]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e9e37d7fsm183566775e9.32.2025.01.14.11.25.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 11:25:52 -0800 (PST) From: Krzysztof Kozlowski To: Lee Jones , linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH] mfd: Use str_enable_disable-like helpers Date: Tue, 14 Jan 2025 20:25:38 +0100 Message-ID: <20250114192538.911970-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. Signed-off-by: Krzysztof Kozlowski --- drivers/mfd/ipaq-micro.c | 3 ++- drivers/mfd/tps65010.c | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/mfd/ipaq-micro.c b/drivers/mfd/ipaq-micro.c index 2370b44e2214..4b757d847282 100644 --- a/drivers/mfd/ipaq-micro.c +++ b/drivers/mfd/ipaq-micro.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -267,7 +268,7 @@ static void __init ipaq_micro_eeprom_dump(struct ipaq_m= icro *micro) dev_info(micro->dev, "page mode: %u\n", ipaq_micro_to_u16(dump+84)); dev_info(micro->dev, "country ID: %u\n", ipaq_micro_to_u16(dump+86)); dev_info(micro->dev, "color display: %s\n", - ipaq_micro_to_u16(dump+88) ? "yes" : "no"); + str_yes_no(ipaq_micro_to_u16(dump + 88))); dev_info(micro->dev, "ROM size: %u MiB\n", ipaq_micro_to_u16(dump+90)); dev_info(micro->dev, "RAM size: %u KiB\n", ipaq_micro_to_u16(dump+92)); dev_info(micro->dev, "screen: %u x %u\n", diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c index 710364435b6b..00fb12c4f491 100644 --- a/drivers/mfd/tps65010.c +++ b/drivers/mfd/tps65010.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include =20 @@ -250,7 +251,7 @@ static int dbg_show(struct seq_file *s, void *_) v2 =3D i2c_smbus_read_byte_data(tps->client, TPS_LED1_PER); seq_printf(s, "led1 %s, on=3D%02x, per=3D%02x, %d/%d msec\n", (value & 0x80) - ? ((v2 & 0x80) ? "on" : "off") + ? str_on_off(v2 & 0x80) : ((v2 & 0x80) ? "blink" : "(nPG)"), value, v2, (value & 0x7f) * 10, (v2 & 0x7f) * 100); @@ -259,7 +260,7 @@ static int dbg_show(struct seq_file *s, void *_) v2 =3D i2c_smbus_read_byte_data(tps->client, TPS_LED2_PER); seq_printf(s, "led2 %s, on=3D%02x, per=3D%02x, %d/%d msec\n", (value & 0x80) - ? ((v2 & 0x80) ? "on" : "off") + ? str_on_off(v2 & 0x80) : ((v2 & 0x80) ? "blink" : "off"), value, v2, (value & 0x7f) * 10, (v2 & 0x7f) * 100); @@ -738,7 +739,7 @@ int tps65010_set_gpio_out_value(unsigned gpio, unsigned= value) TPS_DEFGPIO, defgpio); =20 pr_debug("%s: gpio%dout =3D %s, defgpio 0x%02x\n", DRIVER_NAME, - gpio, value ? "high" : "low", + gpio, str_high_low(value), i2c_smbus_read_byte_data(the_tps->client, TPS_DEFGPIO)); =20 mutex_unlock(&the_tps->lock); @@ -850,7 +851,7 @@ int tps65010_set_vib(unsigned value) status =3D i2c_smbus_write_byte_data(the_tps->client, TPS_VDCDC2, vdcdc2); =20 - pr_debug("%s: vibrator %s\n", DRIVER_NAME, value ? "on" : "off"); + pr_debug("%s: vibrator %s\n", DRIVER_NAME, str_on_off(value)); =20 mutex_unlock(&the_tps->lock); return status; @@ -872,7 +873,7 @@ int tps65010_set_low_pwr(unsigned mode) mutex_lock(&the_tps->lock); =20 pr_debug("%s: %s low_pwr, vdcdc1 0x%02x\n", DRIVER_NAME, - mode ? "enable" : "disable", + str_enable_disable(mode), i2c_smbus_read_byte_data(the_tps->client, TPS_VDCDC1)); =20 vdcdc1 =3D i2c_smbus_read_byte_data(the_tps->client, TPS_VDCDC1); @@ -984,7 +985,7 @@ int tps65013_set_low_pwr(unsigned mode) =20 pr_debug("%s: %s low_pwr, chgconfig 0x%02x vdcdc1 0x%02x\n", DRIVER_NAME, - mode ? "enable" : "disable", + str_enable_disable(mode), i2c_smbus_read_byte_data(the_tps->client, TPS_CHGCONFIG), i2c_smbus_read_byte_data(the_tps->client, TPS_VDCDC1)); =20 --=20 2.43.0