From nobody Tue Dec 16 07:11:28 2025 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 64E1B20F96B for ; Tue, 14 Jan 2025 10:56:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736852208; cv=none; b=QVr6Ul8N4EOA/qF8qQLLi7b2AAs0kglNRCMmzaYOdER+UgEtqzLrFTxP2+bZDDbsZpcxMqpMdk/Y7j+MPM6oSQD5rsLRRs2/40OV4JwbiVlB1Pd+y4jvWrjFiNCX7OK/puoAxdh7jE6SKp/eZ0axeWdE+0q1MqL2R9oa1Tm1eTI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736852208; c=relaxed/simple; bh=TG/8seqngn40G/0uo2/TuAvyW9NOt6h4rq97t0K+y2Y=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=hAE0niLRRyk4Y5ybhRbQfvVrfOU6Ipa5w89VF0Ll1LfmGRGg8Z/LRYpHvWbw0pRgBjtNB/uM5HwyxB3s11gpVAyBJ1fzFK56kNRS4LAZXRSSEjke60cIdmeRZ2HqE/auMfGJoiTwk2Gi2kzkITxq67lAmNrsRTCs0nVAcitlgYE= 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=i9qpJNR0; arc=none smtp.client-ip=209.85.218.49 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="i9qpJNR0" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-aa680fafb3eso68335666b.3 for ; Tue, 14 Jan 2025 02:56:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736852204; x=1737457004; 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=Dv8xOrPcHkPlaXmRS2RH96AOxuG34frapdG0yNHUuJY=; b=i9qpJNR0OvRplpZj9sEc571m5wCECOQvE92SYBTYITb0ATu6btudn6IeVHsAp//aHZ 9nhJaaCMmxXHm2TcAakxkniCyYt4KfO6wKLS2IGRKFzTn7cts71inEwTVDfCqN4Cn4JW UURi2RVzZ6/FZfc84iOEFalDO8596p6GHKnzxBfJXUYkUeHYq1u5tJ1X8crE3/v+LJEm 1OpMM8NSVJAAs4SHrIh21vmer7wEV+bQ4m0rkoXtpf+Mxqe7rtLo/Fayq2BWvViprtbp Bqq3/j7VlcFE52saW6qxlNSSZq1+DQTU65HjnTslg2ydGsFdFjp4YRFLTzxlQCqTS7Jk Jwyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736852205; x=1737457005; 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=Dv8xOrPcHkPlaXmRS2RH96AOxuG34frapdG0yNHUuJY=; b=RiwQLveZGk7ZGzXaxnw9V6m1MpkACa9SIH15/AXShsVDYYB9/LdUC2NF5tAFsTpqlg rR7N6Jg1aAygmRh2+XAHGqO2F8oHfIt23H5XMmErpLcwQ0sCTQVz/vQPRlIgYJoF5gnE O8ZTdnBkMrfmRg2tu5+rrfSERZsJ3vetCkdlVG22zhj+4Zo7hqaVajZE+rI0IhSTMYRf olhs+CnC6vvsO4W0RzACnq+V3GA06HTqeWffvCc71LJUnXmEdmASvs3iKovnGi+WfEyE +7Jz7WmZwW0mHxuAKBn5HCv5kvK/BOZsojmQ7+IwJsJLFCaXGPqzVRUSGb4bfHOhALm1 kN8w== X-Forwarded-Encrypted: i=1; AJvYcCXRtbySW7RJQrxi+Tr8OV66vGijumzYRP3u+CaAdr9NjLKt+LEDwFngCCJMXaEOWoGE9wpgN2QlXTnXHX8=@vger.kernel.org X-Gm-Message-State: AOJu0YwX3bBdv1hJosmT3bDAZSbi8ZH8EXi7xj3V68S4fymnAh4rX2UH eISj3bt7laDd5N6W20BD6p9jIB0SPYGTUmfdjQLbGlnpUzLdSNwq5AyDw46t+L0= X-Gm-Gg: ASbGncuRUuhrvI7DUGDyO4PkEqquXKcppp+mS33iXxhbXDIrbkAzQ1G1NpxHCD+jiHV D56RMlqvZNUNHeS924kBKUazvqwkpMwoJ7cQMt0jYvBaJHnbmTtjjvpJaDlHkjDOaq5THkEEVm5 6uj7ECGmLHzBpMwUApeBZJhZkx64Tc8Idg6Yfo0domzCI3+aIvcxP5DCLoFrHIhjMT7NzA/BpFM uL2PqfC81LX5D4z0JeQVFjqoCOisGrBwmwEuQNhlo/vSiSWiiBvCVN+QTSyI68RPVXN+Xo= X-Google-Smtp-Source: AGHT+IFDYSZs2EgXOxOs0j3TmkpApoppsmbQrtPhAy21A4L/1ijy2TMTCPfDFzQkImZHkPV0ZUNLKw== X-Received: by 2002:a17:907:d1b:b0:a9a:1a17:e1cc with SMTP id a640c23a62f3a-ab2aa7d1518mr822062866b.0.1736852204563; Tue, 14 Jan 2025 02:56:44 -0800 (PST) Received: from krzk-bin.. ([178.197.223.165]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab2c95aede8sm616837166b.136.2025.01.14.02.56.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2025 02:56:44 -0800 (PST) From: Krzysztof Kozlowski To: Marcel Holtmann , Luiz Augusto von Dentz , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH] Bluetooth: Use str_enable_disable-like helpers Date: Tue, 14 Jan 2025 11:56:41 +0100 Message-ID: <20250114105641.273451-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/bluetooth/btintel.c | 17 +++++++++-------- drivers/bluetooth/btmrvl_main.c | 3 ++- drivers/bluetooth/hci_qca.c | 5 +++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index d496cf2c3411..d2540b28bc7a 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -506,13 +507,13 @@ int btintel_version_info_tlv(struct hci_dev *hdev, =20 bt_dev_info(hdev, "Device revision is %u", version->dev_rev_id); bt_dev_info(hdev, "Secure boot is %s", - version->secure_boot ? "enabled" : "disabled"); + str_enabled_disabled(version->secure_boot)); bt_dev_info(hdev, "OTP lock is %s", - version->otp_lock ? "enabled" : "disabled"); + str_enabled_disabled(version->otp_lock)); bt_dev_info(hdev, "API lock is %s", - version->api_lock ? "enabled" : "disabled"); + str_enabled_disabled(version->api_lock)); bt_dev_info(hdev, "Debug lock is %s", - version->debug_lock ? "enabled" : "disabled"); + str_enabled_disabled(version->debug_lock)); bt_dev_info(hdev, "Minimum firmware build %u week %u %u", version->min_fw_build_nn, version->min_fw_build_cw, 2000 + version->min_fw_build_yy); @@ -927,16 +928,16 @@ int btintel_read_boot_params(struct hci_dev *hdev, le16_to_cpu(params->dev_revid)); =20 bt_dev_info(hdev, "Secure boot is %s", - params->secure_boot ? "enabled" : "disabled"); + str_enabled_disabled(params->secure_boot)); =20 bt_dev_info(hdev, "OTP lock is %s", - params->otp_lock ? "enabled" : "disabled"); + str_enabled_disabled(params->otp_lock)); =20 bt_dev_info(hdev, "API lock is %s", - params->api_lock ? "enabled" : "disabled"); + str_enabled_disabled(params->api_lock)); =20 bt_dev_info(hdev, "Debug lock is %s", - params->debug_lock ? "enabled" : "disabled"); + str_enabled_disabled(params->debug_lock)); =20 bt_dev_info(hdev, "Minimum firmware build %u week %u %u", params->min_fw_build_nn, params->min_fw_build_cw, diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_mai= n.c index 18f34998a120..e26b07a9387d 100644 --- a/drivers/bluetooth/btmrvl_main.c +++ b/drivers/bluetooth/btmrvl_main.c @@ -7,6 +7,7 @@ =20 #include #include +#include #include #include #include @@ -88,7 +89,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, str= uct sk_buff *skb) else adapter->psmode =3D 0; BT_DBG("PS Mode:%s", - (adapter->psmode) ? "Enable" : "Disable"); + str_enable_disable(adapter->psmode)); } else { BT_DBG("PS Mode command failed"); } diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 5d75087cca99..0cfe40393600 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include =20 @@ -343,8 +344,8 @@ static void serial_clock_vote(unsigned long vote, struc= t hci_uart *hu) else __serial_clock_off(hu->tty); =20 - BT_DBG("Vote serial clock %s(%s)", new_vote ? "true" : "false", - vote ? "true" : "false"); + BT_DBG("Vote serial clock %s(%s)", str_true_false(new_vote), + str_true_false(vote)); =20 diff =3D jiffies_to_msecs(jiffies - qca->vote_last_jif); =20 --=20 2.43.0