Commit dc24f0e7 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

kbuild: remove dependency on input.h from file2alias 



Almost all definitions used by file2alias was already
present in mod_devicetable.h.
Added the last definition and killed the input.h usage.

The errornous include was pointed out
by: Jan Engelhardt <jengelh@linux01.gwdg.de>

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Jan Engelhardt <jengelh@linux01.gwdg.de>
Cc: Deepak Saxena <dsaxena@plexity.net>
parent 5a4910fb

include/linux/input.h

+4 −0
Original line number Diff line number Diff line
@@ -1010,6 +1010,10 @@ struct input_dev { 
#error "EV_MAX and INPUT_DEVICE_ID_EV_MAX do not match"

#endif



#if KEY_MIN_INTERESTING != INPUT_DEVICE_ID_KEY_MIN_INTERESTING

#error "KEY_MIN_INTERESTING and INPUT_DEVICE_ID_KEY_MIN_INTERESTING do not match"

#endif



#if KEY_MAX != INPUT_DEVICE_ID_KEY_MAX

#error "KEY_MAX and INPUT_DEVICE_ID_KEY_MAX do not match"

#endif

include/linux/mod_devicetable.h

+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ struct i2c_device_id { 


/* Input */

#define INPUT_DEVICE_ID_EV_MAX		0x1f

#define INPUT_DEVICE_ID_KEY_MIN_INTERESTING	0x71

#define INPUT_DEVICE_ID_KEY_MAX		0x1ff

#define INPUT_DEVICE_ID_REL_MAX		0x0f

#define INPUT_DEVICE_ID_ABS_MAX		0x3f

scripts/mod/file2alias.c

+11 −10
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ typedef unsigned char __u8; 
 * even potentially has different endianness and word sizes, since

 * we handle those differences explicitly below */

#include "../../include/linux/mod_devicetable.h"

#include "../../include/linux/input.h"



#define ADD(str, sep, cond, field)                              \

do {                                                            \
@@ -416,31 +415,33 @@ static int do_input_entry(const char *filename, struct input_device_id *id, 


	sprintf(alias + strlen(alias), "-e*");

	if (id->flags & INPUT_DEVICE_ID_MATCH_EVBIT)

		do_input(alias, id->evbit, 0, EV_MAX);

		do_input(alias, id->evbit, 0, INPUT_DEVICE_ID_EV_MAX);

	sprintf(alias + strlen(alias), "k*");

	if (id->flags & INPUT_DEVICE_ID_MATCH_KEYBIT)

		do_input(alias, id->keybit, KEY_MIN_INTERESTING, KEY_MAX);

		do_input(alias, id->keybit,

			 INPUT_DEVICE_ID_KEY_MIN_INTERESTING,

			 INPUT_DEVICE_ID_KEY_MAX);

	sprintf(alias + strlen(alias), "r*");

	if (id->flags & INPUT_DEVICE_ID_MATCH_RELBIT)

		do_input(alias, id->relbit, 0, REL_MAX);

		do_input(alias, id->relbit, 0, INPUT_DEVICE_ID_REL_MAX);

	sprintf(alias + strlen(alias), "a*");

	if (id->flags & INPUT_DEVICE_ID_MATCH_ABSBIT)

		do_input(alias, id->absbit, 0, ABS_MAX);

		do_input(alias, id->absbit, 0, INPUT_DEVICE_ID_ABS_MAX);

	sprintf(alias + strlen(alias), "m*");

	if (id->flags & INPUT_DEVICE_ID_MATCH_MSCIT)

		do_input(alias, id->mscbit, 0, MSC_MAX);

		do_input(alias, id->mscbit, 0, INPUT_DEVICE_ID_MSC_MAX);

	sprintf(alias + strlen(alias), "l*");

	if (id->flags & INPUT_DEVICE_ID_MATCH_LEDBIT)

		do_input(alias, id->ledbit, 0, LED_MAX);

		do_input(alias, id->ledbit, 0, INPUT_DEVICE_ID_LED_MAX);

	sprintf(alias + strlen(alias), "s*");

	if (id->flags & INPUT_DEVICE_ID_MATCH_SNDBIT)

		do_input(alias, id->sndbit, 0, SND_MAX);

		do_input(alias, id->sndbit, 0, INPUT_DEVICE_ID_SND_MAX);

	sprintf(alias + strlen(alias), "f*");

	if (id->flags & INPUT_DEVICE_ID_MATCH_FFBIT)

		do_input(alias, id->ffbit, 0, FF_MAX);

		do_input(alias, id->ffbit, 0, INPUT_DEVICE_ID_FF_MAX);

	sprintf(alias + strlen(alias), "w*");

	if (id->flags & INPUT_DEVICE_ID_MATCH_SWBIT)

		do_input(alias, id->swbit, 0, SW_MAX);

		do_input(alias, id->swbit, 0, INPUT_DEVICE_ID_SW_MAX);

	return 1;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE