Nathan Chancellor 6904679c84 Input: touchscreen - Fix backport of a02dcde595f7cbd240ccd64de96034ad91cffc40 ... Upstream commit a02dcde595f7 ("Input: touchscreen - avoid bitwise vs logical OR warning") was applied as commit f6e9e7be9b ("Input: touchscreen - avoid bitwise vs logical OR warning") in linux-5.4.y but it did not properly account for commit d9265e8a87 ("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: f6e9e7be9b ("Input: touchscreen - avoid bitwise vs logical OR warning") Signed-off-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2022-01-11 15:23:30 +01:00
..
88pm860x-ts.c
ad7877.c
ad7879-i2c.c
ad7879-spi.c
ad7879.c
ad7879.h
ads7846.c
ar1021_i2c.c
atmel_mxt_ts.c	Input: atmel_mxt_ts - fix double free in mxt_read_info_block	2021-12-29 12:23:36 +01:00
auo-pixcir-ts.c
bcm_iproc_tsc.c
bu21013_ts.c
bu21029_ts.c
chipone_icn8318.c
chipone_icn8505.c
colibri-vf50-ts.c
cy8ctmg110_ts.c
cyttsp4_core.c
cyttsp4_core.h
cyttsp4_i2c.c
cyttsp4_spi.c
cyttsp_core.c
cyttsp_core.h
cyttsp_i2c_common.c
cyttsp_i2c.c
cyttsp_spi.c
da9034-ts.c
da9052_tsi.c
dynapro.c
edt-ft5x06.c
eeti_ts.c
egalax_ts_serial.c
egalax_ts.c
ektf2127.c
elants_i2c.c	Input: elants_i2c - do not bind to i2c-hid compatible ACPI instantiated devices	2021-05-22 11:38:28 +02:00
elo.c	Input: elo - fix an error code in elo_connect()	2021-03-04 10:26:35 +01:00
exc3000.c
fsl-imx25-tcq.c
fujitsu_ts.c
goodix.c
gunze.c
hampshire.c
hideep.c	Input: hideep - fix the uninitialized use in hideep_nvm_unlock()	2021-07-20 16:10:45 +02:00
hp680_ts_input.c
htcpen.c
ili210x.c	Input: ili210x - add missing negation for touch indication on ili210x	2021-05-11 14:04:15 +02:00
imx6ul_tsc.c
inexio.c
ipaq-micro-ts.c
iqs5xx.c
jornada720_ts.c
Kconfig
lpc32xx_ts.c
mainstone-wm97xx.c
Makefile
max11801_ts.c
mc13783_ts.c
mcs5000_ts.c
melfas_mip4.c
migor_ts.c
mk712.c
mms114.c
mtouch.c
mxs-lradc-ts.c
of_touchscreen.c	Input: touchscreen - Fix backport of a02dcde595f7cbd240ccd64de96034ad91cffc40	2022-01-11 15:23:30 +01:00
pcap_ts.c
penmount.c
pixcir_i2c_ts.c
raspberrypi-ts.c
raydium_i2c_ts.c	Input: raydium_ts_i2c - do not send zero length	2021-03-04 10:26:40 +01:00
resistive-adc-touch.c
rohm_bu21023.c
s3c2410_ts.c
s6sy761.c	Input: s6sy761 - fix coordinate read bit shift	2021-04-21 12:56:15 +02:00
silead.c	Input: silead - add workaround for x86 BIOS-es which bring the chip up in a stuck state	2021-05-22 11:38:28 +02:00
sis_i2c.c
st1232.c
stmfts.c
stmpe-ts.c
sun4i-ts.c
sur40.c
surface3_spi.c
sx8654.c
ti_am335x_tsc.c
touchit213.c
touchright.c
touchwin.c
tps6507x-ts.c
ts4800-ts.c
tsc40.c
tsc200x-core.c
tsc200x-core.h
tsc2004.c
tsc2005.c
tsc2007_core.c
tsc2007_iio.c
tsc2007.h
ucb1400_ts.c
usbtouchscreen.c	Input: usbtouchscreen - fix control-request directions	2021-07-14 16:53:00 +02:00
wacom_i2c.c
wacom_w8001.c
wdt87xx_i2c.c
wm97xx-core.c
wm831x-ts.c
wm9705.c
wm9712.c
wm9713.c
zet6223.c
zforce_ts.c
zylonite-wm97xx.c