| Message ID | 20220103192935.3438038-1-nathan@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | [5.4] Input: touchscreen - Fix backport of a02dcde595f7cbd240ccd64de96034ad91cffc40 | expand |
On Mon, Jan 03, 2022 at 12:29:35PM -0700, Nathan Chancellor wrote: > Upstream commit a02dcde595f7 ("Input: touchscreen - avoid bitwise vs > logical OR warning") was applied as commit f6e9e7be9b80 ("Input: > touchscreen - avoid bitwise vs logical OR warning") in linux-5.4.y but > it did not properly account for commit d9265e8a878a ("Input: > of_touchscreen - add support for touchscreen-min-x|y"), which means the > warning mentioned in the commit message is not fully fixed: > > drivers/input/touchscreen/of_touchscreen.c:78:17: warning: use of bitwise '|' with boolean operands [-Wbitwise-instead-of-logical] > data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x", > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/input/touchscreen/of_touchscreen.c:78:17: note: cast one or both operands to int to silence this warning > drivers/input/touchscreen/of_touchscreen.c:92:17: warning: use of bitwise '|' with boolean operands [-Wbitwise-instead-of-logical] > data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-y", > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/input/touchscreen/of_touchscreen.c:92:17: note: cast one or both operands to int to silence this warning > 2 warnings generated. > > It seems like the 4.19 backport was applied to the 5.4 tree, which did > not have any conflicts so no issue was noticed at that point. > > Fix up the backport to bring it more in line with the upstream version > so that there is no warning. > > Fixes: f6e9e7be9b80 ("Input: touchscreen - avoid bitwise vs logical OR warning") > Signed-off-by: Nathan Chancellor <nathan@kernel.org> > --- > drivers/input/touchscreen/of_touchscreen.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Now queued up,t hanks. greg k-h
diff --git a/drivers/input/touchscreen/of_touchscreen.c b/drivers/input/touchscreen/of_touchscreen.c index 2962c3747adc..ed5fbcb40e3f 100644 --- a/drivers/input/touchscreen/of_touchscreen.c +++ b/drivers/input/touchscreen/of_touchscreen.c @@ -77,8 +77,8 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch, axis = multitouch ? ABS_MT_POSITION_X : ABS_X; data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x", input_abs_get_min(input, axis), - &minimum) | - touchscreen_get_prop_u32(dev, "touchscreen-size-x", + &minimum); + data_present |= touchscreen_get_prop_u32(dev, "touchscreen-size-x", input_abs_get_max(input, axis) + 1, &maximum); @@ -91,8 +91,8 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch, axis = multitouch ? ABS_MT_POSITION_Y : ABS_Y; data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-y", input_abs_get_min(input, axis), - &minimum) | - touchscreen_get_prop_u32(dev, "touchscreen-size-y", + &minimum); + data_present |= touchscreen_get_prop_u32(dev, "touchscreen-size-y", input_abs_get_max(input, axis) + 1, &maximum);
Upstream commit a02dcde595f7 ("Input: touchscreen - avoid bitwise vs logical OR warning") was applied as commit f6e9e7be9b80 ("Input: touchscreen - avoid bitwise vs logical OR warning") in linux-5.4.y but it did not properly account for commit d9265e8a878a ("Input: of_touchscreen - add support for touchscreen-min-x|y"), which means the warning mentioned in the commit message is not fully fixed: drivers/input/touchscreen/of_touchscreen.c:78:17: warning: use of bitwise '|' with boolean operands [-Wbitwise-instead-of-logical] data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x", ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/input/touchscreen/of_touchscreen.c:78:17: note: cast one or both operands to int to silence this warning drivers/input/touchscreen/of_touchscreen.c:92:17: warning: use of bitwise '|' with boolean operands [-Wbitwise-instead-of-logical] data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-y", ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/input/touchscreen/of_touchscreen.c:92:17: note: cast one or both operands to int to silence this warning 2 warnings generated. It seems like the 4.19 backport was applied to the 5.4 tree, which did not have any conflicts so no issue was noticed at that point. Fix up the backport to bring it more in line with the upstream version so that there is no warning. Fixes: f6e9e7be9b80 ("Input: touchscreen - avoid bitwise vs logical OR warning") Signed-off-by: Nathan Chancellor <nathan@kernel.org> --- drivers/input/touchscreen/of_touchscreen.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) base-commit: 4ca2eaf1d477ce4316989b22e765fb915652b86e