Input: Drop unused assignments from pnp_device_id arrays

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@baylibre.com>
Link: https://patch.msgid.link/f987c14dea1d3236d3889e5cf96c01eef6a2445d.1781016727.git.u.kleine-koenig@baylibre.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c
index fdece6ec1df334a951c62193bb4c0c209ccf226d..f70a96c4f1fd6d474421dc50a4082fb9656a9943 100644 (file)
--- 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 */
+       { }
 };
 
 MODULE_DEVICE_TABLE(pnp, pnp_devids);

diff --git a/drivers/input/serio/i8042-acpipnpio.h b/drivers/input/serio/i8042-acpipnpio.h
index 8ebdf4fb9030807883c29441fad26ba14808a44d..412f82d7a303b75ff13daa2faf6dd1261b76fdbd 100644 (file)
--- a/drivers/input/serio/i8042-acpipnpio.h
+++ b/drivers/input/serio/i8042-acpipnpio.h
@@ -1539,22 +1539,22 @@ static int i8042_pnp_aux_probe(struct pnp_dev *dev, const struct pnp_device_id *
 }
 
 static const struct pnp_device_id pnp_kbd_devids[] = {
-       { .id = "PNP0300", .driver_data = 0 },
-       { .id = "PNP0301", .driver_data = 0 },
-       { .id = "PNP0302", .driver_data = 0 },
-       { .id = "PNP0303", .driver_data = 0 },
-       { .id = "PNP0304", .driver_data = 0 },
-       { .id = "PNP0305", .driver_data = 0 },
-       { .id = "PNP0306", .driver_data = 0 },
-       { .id = "PNP0309", .driver_data = 0 },
-       { .id = "PNP030a", .driver_data = 0 },
-       { .id = "PNP030b", .driver_data = 0 },
-       { .id = "PNP0320", .driver_data = 0 },
-       { .id = "PNP0343", .driver_data = 0 },
-       { .id = "PNP0344", .driver_data = 0 },
-       { .id = "PNP0345", .driver_data = 0 },
-       { .id = "CPQA0D7", .driver_data = 0 },
-       { .id = "", },
+       { .id = "PNP0300" },
+       { .id = "PNP0301" },
+       { .id = "PNP0302" },
+       { .id = "PNP0303" },
+       { .id = "PNP0304" },
+       { .id = "PNP0305" },
+       { .id = "PNP0306" },
+       { .id = "PNP0309" },
+       { .id = "PNP030a" },
+       { .id = "PNP030b" },
+       { .id = "PNP0320" },
+       { .id = "PNP0343" },
+       { .id = "PNP0344" },
+       { .id = "PNP0345" },
+       { .id = "CPQA0D7" },
+       { }
 };
 MODULE_DEVICE_TABLE(pnp, pnp_kbd_devids);
 
@@ -1569,18 +1569,18 @@ static struct pnp_driver i8042_pnp_kbd_driver = {
 };
 
 static const struct pnp_device_id pnp_aux_devids[] = {
-       { .id = "AUI0200", .driver_data = 0 },
-       { .id = "FJC6000", .driver_data = 0 },
-       { .id = "FJC6001", .driver_data = 0 },
-       { .id = "PNP0f03", .driver_data = 0 },
-       { .id = "PNP0f0b", .driver_data = 0 },
-       { .id = "PNP0f0e", .driver_data = 0 },
-       { .id = "PNP0f12", .driver_data = 0 },
-       { .id = "PNP0f13", .driver_data = 0 },
-       { .id = "PNP0f19", .driver_data = 0 },
-       { .id = "PNP0f1c", .driver_data = 0 },
-       { .id = "SYN0801", .driver_data = 0 },
-       { .id = "", },
+       { .id = "AUI0200" },
+       { .id = "FJC6000" },
+       { .id = "FJC6001" },
+       { .id = "PNP0f03" },
+       { .id = "PNP0f0b" },
+       { .id = "PNP0f0e" },
+       { .id = "PNP0f12" },
+       { .id = "PNP0f13" },
+       { .id = "PNP0f19" },
+       { .id = "PNP0f1c" },
+       { .id = "SYN0801" },
+       { },
 };
 MODULE_DEVICE_TABLE(pnp, pnp_aux_devids);