input: make PCI device id constant

PATCH Applied Németh Márton 1 participant 1 message Jan 9, 2010

Subsystems (2)

HID Input drivers

lore

Share & tools

lore

Németh Márton

author

2010-01-09 12:56 UTC #0 lore raw

PATCH 3/5 input: make PCI device id constant

From: Márton Németh <[email protected]>

The id_table field of the struct pci_driver is constant in <linux/pci.h> so it is worth to make initialization data also constant.

The semantic match that finds this kind of pattern is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r@
disable decl_init,const_decl_init;
identifier I1, I2, x;
@@

	struct I1 {
	  ...
	  const struct I2 *x;
	  ...
	};

@s@
identifier r.I1, y;
identifier r.x, E;
@@

	struct I1 y = {
	  .x = E,
	};

@c@
identifier r.I2;
identifier s.E;
@@

	const struct I2 E[] = ... ;

@depends on !c@
identifier r.I2;
identifier s.E;
@@
+ const

	struct I2 E[] = ...;

// </smpl>

Signed-off-by Márton Németh <[email protected]>

Cc Julia Lawall <[email protected]>

Cc [email protected]

---

drivers/input/serio/pcips2.c 2010-01-08 19:12:05.000000000 +0100 renamed from drivers/input/serio/pcips2.c 2009-12-03 04:51:21.000000000 +0100 +1 -1

diff -u -p a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c
@@ -186,7 +186,7 @@ static void __devexit pcips2_remove(stru
 	pci_disable_device(dev);
 }
 
-static struct pci_device_id pcips2_ids[] = {
+static const struct pci_device_id pcips2_ids[] = {
 	{
 		.vendor		= 0x14f2,	/* MOBILITY */
 		.device		= 0x0123,	/* Keyboard */

drivers/input/gameport/fm801-gp.c 2010-01-08 19:22:57.000000000 +0100 renamed from drivers/input/gameport/fm801-gp.c 2009-12-03 04:51:21.000000000 +0100 +1 -1

diff -u -p a/drivers/input/gameport/fm801-gp.c b/drivers/input/gameport/fm801-gp.c
@@ -140,7 +140,7 @@ static void __devexit fm801_gp_remove(st
 	}
 }
 
-static struct pci_device_id fm801_gp_id_table[] = {
+static const struct pci_device_id fm801_gp_id_table[] = {
 	{ PCI_VENDOR_ID_FORTEMEDIA, PCI_DEVICE_ID_FM801_GP, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0  },
 	{ 0 }
 };

drivers/input/gameport/emu10k1-gp.c 2010-01-08 19:23:20.000000000 +0100 renamed from drivers/input/gameport/emu10k1-gp.c 2009-12-03 04:51:21.000000000 +0100 +1 -1

diff -u -p a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c
@@ -46,7 +46,7 @@ struct emu {
 	int size;
 };
 
-static struct pci_device_id emu_tbl[] = {
+static const struct pci_device_id emu_tbl[] = {
 
 	{ 0x1102, 0x7002, PCI_ANY_ID, PCI_ANY_ID }, /* SB Live gameport */
 	{ 0x1102, 0x7003, PCI_ANY_ID, PCI_ANY_ID }, /* Audigy gameport */

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html