Re: [PATCH v1] Input: Drop unused assignments from pnp_device_id arrays
From: Dmitry Torokhov
Date: Wed Jun 10 2026 - 02:15:00 EST
Hi Uwe,
On Tue, Jun 09, 2026 at 04:53:25PM +0200, Uwe Kleine-König (The Capable Hub) wrote:
> Explicitly assigning .driver_data in drivers that don't use this member
> is silly and a bit irritating. Drop these. Also simplify the list
> terminator entry to be just empty to match what most other device_id
> tables do.
>
> There is no changed semantic, not even a change in the compiled result.
>
> Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@xxxxxxxxxxxx>
> ---
> drivers/input/gameport/ns558.c | 46 +++++++++++-----------
> drivers/input/serio/i8042-acpipnpio.h | 56 +++++++++++++--------------
> 2 files changed, 51 insertions(+), 51 deletions(-)
>
> diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c
> index fdece6ec1df3..f70a96c4f1fd 100644
> --- a/drivers/input/gameport/ns558.c
> +++ b/drivers/input/gameport/ns558.c
> @@ -148,29 +148,29 @@ static int ns558_isa_probe(int io)
> #ifdef CONFIG_PNP
>
> static const struct pnp_device_id pnp_devids[] = {
> - { .id = "@P@0001", .driver_data = 0 }, /* ALS 100 */
> - { .id = "@P@0020", .driver_data = 0 }, /* ALS 200 */
> - { .id = "@P@1001", .driver_data = 0 }, /* ALS 100+ */
> - { .id = "@P@2001", .driver_data = 0 }, /* ALS 120 */
> - { .id = "ASB16fd", .driver_data = 0 }, /* AdLib NSC16 */
> - { .id = "AZT3001", .driver_data = 0 }, /* AZT1008 */
> - { .id = "CDC0001", .driver_data = 0 }, /* Opl3-SAx */
> - { .id = "CSC0001", .driver_data = 0 }, /* CS4232 */
> - { .id = "CSC000f", .driver_data = 0 }, /* CS4236 */
> - { .id = "CSC0101", .driver_data = 0 }, /* CS4327 */
> - { .id = "CTL7001", .driver_data = 0 }, /* SB16 */
> - { .id = "CTL7002", .driver_data = 0 }, /* AWE64 */
> - { .id = "CTL7005", .driver_data = 0 }, /* Vibra16 */
> - { .id = "ENS2020", .driver_data = 0 }, /* SoundscapeVIVO */
> - { .id = "ESS0001", .driver_data = 0 }, /* ES1869 */
> - { .id = "ESS0005", .driver_data = 0 }, /* ES1878 */
> - { .id = "ESS6880", .driver_data = 0 }, /* ES688 */
> - { .id = "IBM0012", .driver_data = 0 }, /* CS4232 */
> - { .id = "OPT0001", .driver_data = 0 }, /* OPTi Audio16 */
> - { .id = "YMH0006", .driver_data = 0 }, /* Opl3-SA */
> - { .id = "YMH0022", .driver_data = 0 }, /* Opl3-SAx */
> - { .id = "PNPb02f", .driver_data = 0 }, /* Generic */
> - { .id = "", },
> + { .id = "@P@0001" }, /* ALS 100 */
> + { .id = "@P@0020" }, /* ALS 200 */
> + { .id = "@P@1001" }, /* ALS 100+ */
> + { .id = "@P@2001" }, /* ALS 120 */
> + { .id = "ASB16fd" }, /* AdLib NSC16 */
> + { .id = "AZT3001" }, /* AZT1008 */
> + { .id = "CDC0001" }, /* Opl3-SAx */
> + { .id = "CSC0001" }, /* CS4232 */
> + { .id = "CSC000f" }, /* CS4236 */
> + { .id = "CSC0101" }, /* CS4327 */
> + { .id = "CTL7001" }, /* SB16 */
> + { .id = "CTL7002" }, /* AWE64 */
> + { .id = "CTL7005" }, /* Vibra16 */
> + { .id = "ENS2020" }, /* SoundscapeVIVO */
> + { .id = "ESS0001" }, /* ES1869 */
> + { .id = "ESS0005" }, /* ES1878 */
> + { .id = "ESS6880" }, /* ES688 */
> + { .id = "IBM0012" }, /* CS4232 */
> + { .id = "OPT0001" }, /* OPTi Audio16 */
> + { .id = "YMH0006" }, /* Opl3-SA */
> + { .id = "YMH0022" }, /* Opl3-SAx */
> + { .id = "PNPb02f" }, /* Generic */
> + { }
This goes BOOOM! You have to keep empty .id string as terminator.
Thanks.
--
Dmitry