Skip to content

Commit 09c3e01

Browse files
committed
Input: do not use property bits when generating module alias
The commit 8724ecb ("Input: allow matching device IDs on property bits") started using property bits when generating module aliases for input handlers, but did not adjust the generation of MODALIAS attribute on input device uevents, breaking automatic module loading. Given that no handler currently uses property bits in their module tables, let's revert this part of the commit for now. Reported-by: Damien Wyart <damien.wyart@gmail.com> Tested-by: Damien Wyart <damien.wyart@gmail.com> Fixes: 8724ecb ("Input: allow matching device IDs on property bits") Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent ea04efe commit 09c3e01

2 files changed

Lines changed: 1 addition & 6 deletions

File tree

scripts/mod/devicetable-offsets.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ int main(void)
105105
DEVID_FIELD(input_device_id, sndbit);
106106
DEVID_FIELD(input_device_id, ffbit);
107107
DEVID_FIELD(input_device_id, swbit);
108-
DEVID_FIELD(input_device_id, propbit);
109108

110109
DEVID(eisa_device_id);
111110
DEVID_FIELD(eisa_device_id, sig);

scripts/mod/file2alias.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ static void do_input(char *alias,
761761
sprintf(alias + strlen(alias), "%X,*", i);
762762
}
763763

764-
/* input:b0v0p0e0-eXkXrXaXmXlXsXfXwXprX where X is comma-separated %02X. */
764+
/* input:b0v0p0e0-eXkXrXaXmXlXsXfXwX where X is comma-separated %02X. */
765765
static int do_input_entry(const char *filename, void *symval,
766766
char *alias)
767767
{
@@ -779,7 +779,6 @@ static int do_input_entry(const char *filename, void *symval,
779779
DEF_FIELD_ADDR(symval, input_device_id, sndbit);
780780
DEF_FIELD_ADDR(symval, input_device_id, ffbit);
781781
DEF_FIELD_ADDR(symval, input_device_id, swbit);
782-
DEF_FIELD_ADDR(symval, input_device_id, propbit);
783782

784783
sprintf(alias, "input:");
785784

@@ -817,9 +816,6 @@ static int do_input_entry(const char *filename, void *symval,
817816
sprintf(alias + strlen(alias), "w*");
818817
if (flags & INPUT_DEVICE_ID_MATCH_SWBIT)
819818
do_input(alias, *swbit, 0, INPUT_DEVICE_ID_SW_MAX);
820-
sprintf(alias + strlen(alias), "pr*");
821-
if (flags & INPUT_DEVICE_ID_MATCH_PROPBIT)
822-
do_input(alias, *propbit, 0, INPUT_DEVICE_ID_PROP_MAX);
823819
return 1;
824820
}
825821
ADD_TO_DEVTABLE("input", input_device_id, do_input_entry);

0 commit comments

Comments
 (0)