Commit 7ef9bdec authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Dmitry Torokhov
Browse files

Input: Use str_enable_disable-like helpers 



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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20250114192701.912430-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 21d8dd0d

drivers/input/keyboard/dlink-dir685-touchkeys.c

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/delay.h>

#include <linux/input.h>

#include <linux/slab.h>

#include <linux/string_choices.h>

#include <linux/bitops.h>



struct dir685_touchkeys {
@@ -48,7 +49,7 @@ static irqreturn_t dir685_tk_irq_thread(int irq, void *data) 
	changed = tk->cur_key ^ key;

	for_each_set_bit(i, &changed, num_bits) {

		dev_dbg(tk->dev, "key %d is %s\n", i,

			test_bit(i, &key) ? "down" : "up");

			str_down_up(test_bit(i, &key)));

		input_report_key(tk->input, tk->codes[i], test_bit(i, &key));

	}

drivers/input/keyboard/lm8323.c

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/platform_data/lm8323.h>

#include <linux/pm.h>

#include <linux/slab.h>

#include <linux/string_choices.h>



/* Commands to send to the chip. */

#define LM8323_CMD_READ_ID		0x80 /* Read chip ID. */
@@ -269,7 +270,7 @@ static void process_keys(struct lm8323_chip *lm) 
		unsigned short keycode = lm->keymap[key];



		dev_vdbg(&lm->client->dev, "key 0x%02x %s\n",

			 key, isdown ? "down" : "up");

			 key, str_down_up(isdown));



		if (lm->kp_enabled) {

			input_event(lm->idev, EV_MSC, MSC_SCAN, key);

drivers/input/misc/max77693-haptic.c

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/platform_device.h>

#include <linux/pwm.h>

#include <linux/slab.h>

#include <linux/string_choices.h>

#include <linux/workqueue.h>

#include <linux/regulator/consumer.h>

#include <linux/mfd/max77693.h>
@@ -94,7 +95,7 @@ static int max77843_haptic_bias(struct max77693_haptic *haptic, bool on) 
				   on << MAINCTRL1_BIASEN_SHIFT);

	if (error) {

		dev_err(haptic->dev, "failed to %s bias: %d\n",

			on ? "enable" : "disable", error);

			str_enable_disable(on), error);

		return error;

	}

drivers/input/misc/regulator-haptic.c

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/platform_device.h>

#include <linux/regulator/consumer.h>

#include <linux/slab.h>

#include <linux/string_choices.h>



#define MAX_MAGNITUDE_SHIFT	16
@@ -44,7 +45,7 @@ static int regulator_haptic_toggle(struct regulator_haptic *haptic, bool on) 
		if (error) {

			dev_err(haptic->dev,

				"failed to switch regulator %s: %d\n",

				on ? "on" : "off", error);

				str_on_off(on), error);

			return error;

		}

drivers/input/mouse/elan_i2c_core.c

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/slab.h>

#include <linux/kernel.h>

#include <linux/sched.h>

#include <linux/string_choices.h>

#include <linux/input.h>

#include <linux/uaccess.h>

#include <linux/jiffies.h>
@@ -199,7 +200,7 @@ static int elan_set_power(struct elan_tp_data *data, bool on) 
	} while (--repeat > 0);



	dev_err(&data->client->dev, "failed to set power %s: %d\n",

		on ? "on" : "off", error);

		str_on_off(on), error);

	return error;

}