Commit 45353186 authored by Lee Jones's avatar Lee Jones Committed by Dmitry Torokhov
Browse files

Input: cyttsp4 - move 'cyttsp4_tch_abs_string' to the only file that references it 



Fixes the following W=1 kernel build warning(s):

In file included from drivers/input/touchscreen/cyttsp_i2c_common.c:24:
 drivers/input/touchscreen/cyttsp4_core.h:236:27: warning: ‘cyttsp4_tch_abs_string’ defined but not used [-Wunused-const-variable=]
 236 | static const char  const cyttsp4_tch_abs_string[] = {
 | ^~~~~~~~~~~~~~~~~~~~~~
 In file included from drivers/input/touchscreen/cyttsp4_i2c.c:17:
 drivers/input/touchscreen/cyttsp4_core.h:236:27: warning: ‘cyttsp4_tch_abs_string’ defined but not used [-Wunused-const-variable=]
 236 | static const char * const cyttsp4_tch_abs_string[] = {
 | ^~~~~~~~~~~~~~~~~~~~~~
 In file included from drivers/input/touchscreen/cyttsp4_spi.c:17:
 drivers/input/touchscreen/cyttsp4_core.h:236:27: warning: ‘cyttsp4_tch_abs_string’ defined but not used [-Wunused-const-variable=]
 236 | static const char * const cyttsp4_tch_abs_string[] = {
 | ^~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20201104162427.2984742-16-lee.jones@linaro.org


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 136feb4c

drivers/input/touchscreen/cyttsp4_core.c

+14 −0
Original line number Diff line number Diff line
@@ -30,6 +30,20 @@ 


#define CY_CORE_STARTUP_RETRY_COUNT		3



static const char * const cyttsp4_tch_abs_string[] = {

	[CY_TCH_X]	= "X",

	[CY_TCH_Y]	= "Y",

	[CY_TCH_P]	= "P",

	[CY_TCH_T]	= "T",

	[CY_TCH_E]	= "E",

	[CY_TCH_O]	= "O",

	[CY_TCH_W]	= "W",

	[CY_TCH_MAJ]	= "MAJ",

	[CY_TCH_MIN]	= "MIN",

	[CY_TCH_OR]	= "OR",

	[CY_TCH_NUM_ABS] = "INVALID"

};



static const u8 ldr_exit[] = {

	0xFF, 0x01, 0x3B, 0x00, 0x00, 0x4F, 0x6D, 0x17

};

drivers/input/touchscreen/cyttsp4_core.h

+0 −14
Original line number Diff line number Diff line
@@ -233,20 +233,6 @@ enum cyttsp4_tch_abs { /* for ordering within the extracted touch data array */ 
	CY_TCH_NUM_ABS

};



static const char * const cyttsp4_tch_abs_string[] = {

	[CY_TCH_X]	= "X",

	[CY_TCH_Y]	= "Y",

	[CY_TCH_P]	= "P",

	[CY_TCH_T]	= "T",

	[CY_TCH_E]	= "E",

	[CY_TCH_O]	= "O",

	[CY_TCH_W]	= "W",

	[CY_TCH_MAJ]	= "MAJ",

	[CY_TCH_MIN]	= "MIN",

	[CY_TCH_OR]	= "OR",

	[CY_TCH_NUM_ABS] = "INVALID"

};



struct cyttsp4_touch {

	int abs[CY_TCH_NUM_ABS];

};