Skip to contentSkip to conversation

memstick: make PCI device id constant

PATCH New Németh Márton 1 participant 1 message Jan 9, 2010 Sony memorystick

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 memstick: 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 pci_device_id 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>

---

drivers/memstick/host/jmb38x_ms.c 2010-01-08 19:37:31.000000000 +0100 renamed from drivers/memstick/host/jmb38x_ms.c 2009-12-03 04:51:21.000000000 +0100 +1 -1
diff -u -p a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c
@@ -981,7 +981,7 @@ static void jmb38x_ms_remove(struct pci_
 	kfree(jm);
 }
 
-static struct pci_device_id jmb38x_ms_id_tbl [] = {
+static const struct pci_device_id jmb38x_ms_id_tbl[] = {
 	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_MS, PCI_ANY_ID,
 	  PCI_ANY_ID, 0, 0, 0 },
 	{ }