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@xxxxxxxxxx>
> ---
> drivers/input/touchscreen/of_touchscreen.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
Now queued up,t hanks.
greg k-h
