Skip to contentSkip to conversation

firewire: make PCI device id constant

PATCH In review Németh Márton 2 participants 2 messages Jan 10, 2010 Firewire

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 firewire: 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_table 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/firewire/ohci.c 2010-01-08 09:51:11.000000000 +0100 renamed from drivers/firewire/ohci.c 2010-01-07 19:08:39.000000000 +0100 +1 -1
diff -u -p a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
@@ -2657,7 +2657,7 @@ static int pci_resume(struct pci_dev *de
 }
 #endif
 
-static struct pci_device_id pci_table[] = {
+static const struct pci_device_id pci_table[] = {
 	{ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_FIREWIRE_OHCI, ~0) },
 	{ }
 };
#1 lore raw
Quoted 2 lines · Németh Márton

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

[...]

drivers/firewire/ohci.c 2010-01-08 09:51:11.000000000 +0100 static int pci_resume(struct pci_dev *de · line 2663

Quoted 11 lines
drivers/firewire/ohci.c 2010-01-08 09:51:11.000000000 +0100 renamed from drivers/firewire/ohci.c 2010-01-07 19:08:39.000000000 +0100 +1 -1
@@ -2657,7 +2657,7 @@ static int pci_resume(struct pci_dev *de
 }
 #endif
 
-static struct pci_device_id pci_table[] = {
+static const struct pci_device_id pci_table[] = {
 	{ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_FIREWIRE_OHCI, ~0) },
 	{ }
 };

Committed to linux1394-2.6.git with an adequately shortened changelog.

Signature · 3 lines
Stefan Richter
-=====-==-=- ---= -=-=-
http://arcgraph.de/sr/