2021-08-10 16:22:16

by Lukas Bulwahn

Subject: [PATCH] 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.

Fixes: c49c33637802 ("HID: support for initialization of some Thrustmaster wheels")
Link: https://lore.kernel.org/linux-input/CAKXUXMx6dByO03f3dX0X5zjvQp0j2AhJBg0vQFDmhZUhtKxRxw@mail.gmail.com/
Signed-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(-)

diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 1ea1a7c0b20f..e29efcb1c040 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -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
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 51b39bda9a9d..2e104682c22b 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -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

2021-08-10 19:24:24

by Kim Kuparinen

Subject: Re: [PATCH] HID: thrustmaster: clean up Makefile and adapt quirks

Works on my VM.

Kim

ti 10. elok. 2021 klo 13.21 Lukas Bulwahn ([email protected]) kirjoitti:
>
> 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.
>
> Fixes: c49c33637802 ("HID: support for initialization of some Thrustmaster wheels")
> Link: https://lore.kernel.org/linux-input/CAKXUXMx6dByO03f3dX0X5zjvQp0j2AhJBg0vQFDmhZUhtKxRxw@mail.gmail.com/
> Signed-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(-)
>
> diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
> index 1ea1a7c0b20f..e29efcb1c040 100644
> --- a/drivers/hid/Makefile
> +++ b/drivers/hid/Makefile
> @@ -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
> diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
> index 51b39bda9a9d..2e104682c22b 100644
> --- a/drivers/hid/hid-quirks.c
> +++ b/drivers/hid/hid-quirks.c
> @@ -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
>

2021-08-20 12:57:14

by Jiri Kosina

Subject: Re: [PATCH] HID: thrustmaster: clean up Makefile and adapt quirks

On Tue, 10 Aug 2021, Lukas Bulwahn wrote:

> 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.
>
> Fixes: c49c33637802 ("HID: support for initialization of some Thrustmaster wheels")
> Link: https://lore.kernel.org/linux-input/CAKXUXMx6dByO03f3dX0X5zjvQp0j2AhJBg0vQFDmhZUhtKxRxw@mail.gmail.com/
> Signed-off-by: Lukas Bulwahn <[email protected]>

Applied, thanks Lukas.

--
Jiri Kosina
SUSE Labs