Commit 2523caab authored Mar 02, 2015 by Geert Uytterhoeven Committed by Dmitry Torokhov Mar 02, 2015

Input: cyapa - remove superfluous type check in cyapa_gen5_read_idac_data()

drivers/input/mouse/cyapa_gen5.c: In function ‘cyapa_gen5_read_idac_data’:
drivers/input/mouse/cyapa_gen5.c:1876: warning: ‘max_element_cnt’ may be used uninitialized in this function
drivers/input/mouse/cyapa_gen5.c:1873: warning: ‘offset’ may be used uninitialized in this function

If *data_size is non-zero, and idac_data_type contains an unknown type,
max_element_cnt and offset will be uninitialized, and the loop will
process non-existing data.

However, this cannot happen (for now), as there's a test for unknown
types at the top of cyapa_gen5_read_idac_data().

As no "if ... else if ..." is used in other places, remove the
superfluous "if" to silence the compiler warning.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Dudley Du <dudl@cypress.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

parent 17a28055

drivers/input/mouse/cyapa_gen5.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1926,7 +1926,7 @@ static int cyapa_gen5_read_idac_data(struct cyapa *cyapa,
		electrodes_tx = cyapa->electrodes_x;
		max_element_cnt = ((cyapa->aligned_electrodes_rx + 7) &
		~7u) * electrodes_tx;
		} else if (idac_data_type == GEN5_RETRIEVE_SELF_CAP_PWC_DATA) {
		} else {
		offset = 2;
		max_element_cnt = cyapa->electrodes_x +
		cyapa->electrodes_y;