From nobody Mon Dec 15 21:47:14 2025 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 AA97D1FF5E9 for ; Tue, 14 Jan 2025 20:36:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736886980; cv=none; b=BKc1CKX5jog/EM8hgaP8oUtG/v1zIbFhcU97Ak5Gpp4+37hvUoCOCv5Ge/6zfRWEgyOw6ZpbA0csHz5lzSaTJKfhZwwvWWzmB646Iajq7sOG3UYTJPOFQDCzaux1rd0H/IBju5NYAhaHvqsXC91GkcZ2UHJBHduA8iQc+jCiVsw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736886980; c=relaxed/simple; bh=gS2tWpA0GbEwM/UrYpG6nfxlsBb4yRzG9ZzVj5HoQ/s=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=KfEprWavhM9Dsej4tzVZfBcllOAknO4zh7i5s2cSqfnQYUQtpMb96SF/H1gmHWeHYpPUNmydxlxKULAYjoE1lr+v0xWKz9g51YcJXrozC9Auk5Qii0ZSKWk0TU2Jl8Uexo3bGZpHorzqmYWfyEoviIIL6cIQSPMAtoZ9rsCbFlY= 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=Tgf9Vwaw; arc=none smtp.client-ip=209.85.128.47 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="Tgf9Vwaw" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4361aa6e517so7516065e9.2 for ; Tue, 14 Jan 2025 12:36:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736886977; x=1737491777; 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=tqhlC6RQ0+FQLPBPdYr6MxzFHvj3QH9yoD42eRdXTpE=; b=Tgf9VwawuMcILGWUsD8A4Tb52+9ntk7X4Hz8AqWWYBDRFBIyp+YeJeE7IE2E2sNGm3 OeN1YA9ilvf2kC3doWCcUQFfhqmxsv7F2FGJM8SFv/xap8N5MQ0KeHQ+7yeMcWDTTtIa cZiCEA7wy/vgFzrp40Zi1R7vtAfZNoq+rVtDnQ2iSFO4RHMXkkIwytICVMmQ/bh1rLKx EsL3MRA79T3OyIvuuWfctFOlQv5CLH/HVpX07vJ27zUUnjYfD8ThOF5Go2mHiESTgKNV lGCjGPHLfkH/eIyn3EgPTPA5HKwOuSPg50s3VAVENTKUdaxbcgEpyjxNatKqP+ootTTN FoFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736886977; x=1737491777; 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=tqhlC6RQ0+FQLPBPdYr6MxzFHvj3QH9yoD42eRdXTpE=; b=gAjrPoftEtdq/nyTuhKO2cl2sA3NoU79lbBnKM8W/GWcown2HHPlejyuS2X9YFqOC0 JWj5voCXTpKjGBW5NtW1iobY3z8P7lDxJRlpA9IcljeRoDQQU1HyJr43wOaE6mx5rJBy iXkVmvT5WqcBVLUDwDpVlfmfsjUYFRNBRs4sbjj++d4TnNQ5sSgKrCh/fMj0jvb3pGi9 7h3YD1k/MOs+lZCVgUARWeU19vo1UjMZMQX9oC9eIzuqPnteKqmxjfqZqEvPXnDOAP3O bI8kR0mLulXw1CRMgnOcJ4/TFt+hUETEQbBhurjI/WWuaLu7t4NDJaC71QlVvBzGIA3Q MXag== X-Forwarded-Encrypted: i=1; AJvYcCURJv0yyLnvzkL/VmEjzLc84MxZ+kmtgJj1wU2Y/jmlYRT5PmKgdorHjr4kNL77GqmCWmZDBSvcwYR7oro=@vger.kernel.org X-Gm-Message-State: AOJu0YzMEYLu5RAKMuJT+IwUg44CAoMMoVPWiyUL9KC6eZ3oJFWY7AQ0 jdhP5Mom4eP9Mm3p6AIO1XzGRSGaUUwtNZY0Mom+9QpqBis5omJCSpDvLrO18Jg= X-Gm-Gg: ASbGncu3MmWo15CILT51LKIHM8Sj6+uc7vjS4yzN/JuwtwvrF19VixksO+2xyqfwYXf UFJNOck0htdPXo2bsuJt/QPGl3Nm1n6QXemIXd2p+Qd1d0aqUxA49AlT3cXBNw8R0jkG1vAUTts DI1TPkdtA5mbS6pjyX0egts9rzkpLuv/tPFMsZYm1V6TAcF2ldEmLnUBt6qfnBn+/91tCVVJKVC 5vIXZ0HB2QPmrkDZs2e1y3XNcBuvrBFAVGKDMPIq+geT87oFkxhuVyN5gDQ2+7cstQ7QWA= X-Google-Smtp-Source: AGHT+IFMhRoEAtSbN0L+Bt9NTb3syOW3OEuQGe010Dhx0qHFCjXkdD60E5s2ytRq5B5M4Gl29FBoCQ== X-Received: by 2002:a05:6000:402c:b0:386:3afb:19a with SMTP id ffacd0b85a97d-38a872ea989mr9171714f8f.4.1736886976759; Tue, 14 Jan 2025 12:36:16 -0800 (PST) Received: from krzk-bin.. ([178.197.223.165]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a8e4b7ff0sm15874440f8f.77.2025.01.14.12.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 12:36:15 -0800 (PST) From: Krzysztof Kozlowski To: Sebastian Reichel , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH] power: supply: Use str_enable_disable-like helpers Date: Tue, 14 Jan 2025 21:36:11 +0100 Message-ID: <20250114203611.1013324-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/power/supply/88pm860x_battery.c | 4 ++-- drivers/power/supply/charger-manager.c | 3 ++- drivers/power/supply/cpcap-charger.c | 3 ++- drivers/power/supply/da9030_battery.c | 3 ++- drivers/power/supply/sbs-battery.c | 5 +++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/power/supply/88pm860x_battery.c b/drivers/power/supply= /88pm860x_battery.c index b7938fbb24a5..edae1e843c51 100644 --- a/drivers/power/supply/88pm860x_battery.c +++ b/drivers/power/supply/88pm860x_battery.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include =20 @@ -503,8 +504,7 @@ static void pm860x_init_battery(struct pm860x_battery_i= nfo *info) data =3D pm860x_reg_read(info->i2c, PM8607_POWER_UP_LOG); bat_remove =3D data & BAT_WU_LOG; =20 - dev_dbg(info->dev, "battery wake up? %s\n", - bat_remove !=3D 0 ? "yes" : "no"); + dev_dbg(info->dev, "battery wake up? %s\n", str_yes_no(bat_remove)); =20 /* restore SOC from RTC domain register */ if (bat_remove =3D=3D 0) { diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/= charger-manager.c index a69faef444c0..c49e0e4d02f7 100644 --- a/drivers/power/supply/charger-manager.c +++ b/drivers/power/supply/charger-manager.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -1088,7 +1089,7 @@ static ssize_t charger_state_show(struct device *dev, if (!charger->externally_control) state =3D regulator_is_enabled(charger->consumer); =20 - return sysfs_emit(buf, "%s\n", state ? "enabled" : "disabled"); + return sysfs_emit(buf, "%s\n", str_enabled_disabled(state)); } =20 static ssize_t charger_externally_control_show(struct device *dev, diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cp= cap-charger.c index 7781b45a67a7..6625d539d9ae 100644 --- a/drivers/power/supply/cpcap-charger.c +++ b/drivers/power/supply/cpcap-charger.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -515,7 +516,7 @@ static void cpcap_charger_vbus_work(struct work_struct = *work) out_err: cpcap_charger_update_state(ddata, POWER_SUPPLY_STATUS_UNKNOWN); dev_err(ddata->dev, "%s could not %s vbus: %i\n", __func__, - ddata->vbus_enabled ? "enable" : "disable", error); + str_enable_disable(ddata->vbus_enabled), error); } =20 static int cpcap_charger_set_vbus(struct phy_companion *comparator, diff --git a/drivers/power/supply/da9030_battery.c b/drivers/power/supply/d= a9030_battery.c index 34328f5d556e..ac2e319e9517 100644 --- a/drivers/power/supply/da9030_battery.c +++ b/drivers/power/supply/da9030_battery.c @@ -15,6 +15,7 @@ #include #include #include +#include #include =20 #include @@ -138,7 +139,7 @@ static int bat_debug_show(struct seq_file *s, void *dat= a) { struct da9030_charger *charger =3D s->private; =20 - seq_printf(s, "charger is %s\n", charger->is_on ? "on" : "off"); + seq_printf(s, "charger is %s\n", str_on_off(charger->is_on)); if (charger->chdet) { seq_printf(s, "iset =3D %dmA, vset =3D %dmV\n", charger->mA, charger->mV); diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-= battery.c index a6c204c08232..6f3d0413b1c1 100644 --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -21,6 +21,7 @@ #include #include #include +#include =20 enum { REG_MANUFACTURER_DATA, @@ -320,8 +321,8 @@ static int sbs_update_presence(struct sbs_info *chip, b= ool is_present) client->flags &=3D ~I2C_CLIENT_PEC; } =20 - dev_dbg(&client->dev, "PEC: %s\n", (client->flags & I2C_CLIENT_PEC) ? - "enabled" : "disabled"); + dev_dbg(&client->dev, "PEC: %s\n", + str_enabled_disabled(client->flags & I2C_CLIENT_PEC)); =20 if (!chip->is_present && is_present && !chip->charger_broadcasts) sbs_disable_charger_broadcasts(chip); --=20 2.43.0