Commit a02dcde5 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Dmitry Torokhov

Input: touchscreen - avoid bitwise vs logical OR warning

A new warning in clang points out a few places in this driver where a
bitwise OR is being used with boolean types:

drivers/input/touchscreen.c:81:17: warning: use of bitwise '|' with boolean operands [-Wbitwise-instead-of-logical]
        data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x",
                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

This use of a bitwise OR is intentional, as bitwise operations do not
short circuit, which allows all the calls to touchscreen_get_prop_u32()
to happen so that the last parameter is initialized while coalescing the
results of the calls to make a decision after they are all evaluated.

To make this clearer to the compiler, use the '|=' operator to assign
the result of each touchscreen_get_prop_u32() call to data_present,
which keeps the meaning of the code the same but makes it obvious that
every one of these calls is expected to happen.
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Reported-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Link: https://lore.kernel.org/r/20211014205757.3474635-1-nathan@kernel.orgSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 3378a07d
...@@ -80,27 +80,27 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch, ...@@ -80,27 +80,27 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch,
data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x", data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x",
input_abs_get_min(input, axis_x), input_abs_get_min(input, axis_x),
&minimum) | &minimum);
touchscreen_get_prop_u32(dev, "touchscreen-size-x", data_present |= touchscreen_get_prop_u32(dev, "touchscreen-size-x",
input_abs_get_max(input, input_abs_get_max(input,
axis_x) + 1, axis_x) + 1,
&maximum) | &maximum);
touchscreen_get_prop_u32(dev, "touchscreen-fuzz-x", data_present |= touchscreen_get_prop_u32(dev, "touchscreen-fuzz-x",
input_abs_get_fuzz(input, axis_x), input_abs_get_fuzz(input, axis_x),
&fuzz); &fuzz);
if (data_present) if (data_present)
touchscreen_set_params(input, axis_x, minimum, maximum - 1, fuzz); touchscreen_set_params(input, axis_x, minimum, maximum - 1, fuzz);
data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-y", data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-y",
input_abs_get_min(input, axis_y), input_abs_get_min(input, axis_y),
&minimum) | &minimum);
touchscreen_get_prop_u32(dev, "touchscreen-size-y", data_present |= touchscreen_get_prop_u32(dev, "touchscreen-size-y",
input_abs_get_max(input, input_abs_get_max(input,
axis_y) + 1, axis_y) + 1,
&maximum) | &maximum);
touchscreen_get_prop_u32(dev, "touchscreen-fuzz-y", data_present |= touchscreen_get_prop_u32(dev, "touchscreen-fuzz-y",
input_abs_get_fuzz(input, axis_y), input_abs_get_fuzz(input, axis_y),
&fuzz); &fuzz);
if (data_present) if (data_present)
touchscreen_set_params(input, axis_y, minimum, maximum - 1, fuzz); touchscreen_set_params(input, axis_y, minimum, maximum - 1, fuzz);
...@@ -108,11 +108,11 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch, ...@@ -108,11 +108,11 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch,
data_present = touchscreen_get_prop_u32(dev, data_present = touchscreen_get_prop_u32(dev,
"touchscreen-max-pressure", "touchscreen-max-pressure",
input_abs_get_max(input, axis), input_abs_get_max(input, axis),
&maximum) | &maximum);
touchscreen_get_prop_u32(dev, data_present |= touchscreen_get_prop_u32(dev,
"touchscreen-fuzz-pressure", "touchscreen-fuzz-pressure",
input_abs_get_fuzz(input, axis), input_abs_get_fuzz(input, axis),
&fuzz); &fuzz);
if (data_present) if (data_present)
touchscreen_set_params(input, axis, 0, maximum, fuzz); touchscreen_set_params(input, axis, 0, maximum, fuzz);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment