HID: thrustmaster: clean up Makefile and adapt quirks
Subsystems (2)
PATCH 1/1 HID: thrustmaster: clean up Makefile and adapt quirks
Commit c49c33637802 ("HID: support for initialization of some Thrustmaster wheels") messed up the Makefile and quirks during the refactoring of this commit.
Luckily, ./scripts/checkkconfigsymbols.py warns on non-existing configs:
HID_TMINIT
Referencing files: drivers/hid/Makefile, drivers/hid/hid-quirks.c
Following the discussion (see Link), CONFIG_HID_THRUSTMASTER is the intended config for CONFIG_HID_TMINIT and the file hid-tminit.c was actually added as hid-thrustmaster.c.
So, clean up Makefile and adapt quirks to that refactoring.
---
Dario, Kim, please review, test and ack. Jiri, Benjamin, please pick this quick fix-up patch.
drivers/hid/Makefile | 1 - drivers/hid/hid-quirks.c | 2 -- 2 files changed, 3 deletions(-)
drivers/hid/Makefile +0 -1
@@ -115,7 +115,6 @@ obj-$(CONFIG_HID_STEELSERIES) += hid-steelseries.o obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o hid-thrustmaster.o -obj-$(CONFIG_HID_TMINIT) += hid-tminit.o obj-$(CONFIG_HID_TIVO) += hid-tivo.o obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o obj-$(CONFIG_HID_TWINHAN) += hid-twinhan.o
drivers/hid/hid-quirks.c +0 -2
@@ -662,8 +662,6 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) }, -#endif -#if IS_ENABLED(CONFIG_HID_TMINIT) { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65d) }, #endif #if IS_ENABLED(CONFIG_HID_TIVO)
Signature · 1 line
2.17.1
Works on my VM.
Kim
ti 10. elok. 2021 klo 13.21 Lukas Bulwahn ([email protected]) kirjoitti:
Quoted 55 lines
Commit
c49c33637802("HID: support for initialization of some Thrustmaster wheels") messed up theMakefileand quirks during the refactoring of this commit.Luckily,
./scripts/checkkconfigsymbols.pywarns on non-existing configs:
HID_TMINIT
Referencing files:drivers/hid/Makefile,drivers/hid/hid-quirks.cFollowing the discussion (see Link),
CONFIG_HID_THRUSTMASTERis the intended config forCONFIG_HID_TMINITand the filehid-tminit.cwas actually added ashid-thrustmaster.c.So, clean up
Makefileand adapt quirks to that refactoring.Fixes c49c33637802 ("HID: support for initialization of some Thrustmaster wheels")Link https://lore.kernel.org/linux-input/CAKXUXMx6dByO03f3dX0X5zjvQp0j2AhJBg0vQFDmhZUhtKxRxw@mail.gmail.com/ open hereSigned-off-by Lukas Bulwahn <[email protected]>---
Dario, Kim, please review, test and ack. Jiri, Benjamin, please pick this quick fix-up patch.drivers/hid/Makefile | 1 - drivers/hid/hid-quirks.c | 2 -- 2 files changed, 3 deletions(-)drivers/hid/Makefile +0
-1@@ -115,7 +115,6 @@ obj-$(CONFIG_HID_STEELSERIES) += hid-steelseries.o obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o hid-thrustmaster.o -obj-$(CONFIG_HID_TMINIT) += hid-tminit.o obj-$(CONFIG_HID_TIVO) += hid-tivo.o obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o obj-$(CONFIG_HID_TWINHAN) += hid-twinhan.odrivers/hid/hid-quirks.c +0
-3@@ -662,8 +662,6 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) }, -#endif -#if IS_ENABLED(CONFIG_HID_TMINIT) { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65d) }, #endif #if IS_ENABLED(CONFIG_HID_TIVO) --2.17.1
Quoted 13 lines · Lukas Bulwahn
Commit
c49c33637802("HID: support for initialization of some Thrustmaster wheels") messed up theMakefileand quirks during the refactoring of this commit.Luckily,
./scripts/checkkconfigsymbols.pywarns on non-existing configs:
HID_TMINIT
Referencing files:drivers/hid/Makefile,drivers/hid/hid-quirks.cFollowing the discussion (see Link),
CONFIG_HID_THRUSTMASTERis the intended config forCONFIG_HID_TMINITand the filehid-tminit.cwas actually added ashid-thrustmaster.c.
Quoted 5 lines
So, clean up
Makefileand adapt quirks to that refactoring.Fixes c49c33637802 ("HID: support for initialization of some Thrustmaster wheels")Link https://lore.kernel.org/linux-input/CAKXUXMx6dByO03f3dX0X5zjvQp0j2AhJBg0vQFDmhZUhtKxRxw@mail.gmail.com/ open hereSigned-off-by Lukas Bulwahn <[email protected]>
Applied, thanks Lukas.
Signature · 2 lines
Jiri Kosina SUSE Labs