Patchwork [1/3] nand: make PCI device id constant

login
register
mail settings
Submitter Németh Márton
Date Jan. 9, 2010, 2:10 p.m.
Message ID <4B488E5A.6060505@freemail.hu>
Download mbox | patch
Permalink /patch/42561/
State New, archived
Headers show

Comments

Németh Márton - Jan. 9, 2010, 2:10 p.m.
From: Márton Németh <nm127@freemail.hu>

The id_table field of the struct pci_driver is constant in <linux/pci.h>
so it is worth to make cafe_nand_tbl 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 <nm127@freemail.hu>
Cc: Julia Lawall <julia@diku.dk>
Cc: cocci@diku.dk
---

Patch

diff -u -p a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
--- a/drivers/mtd/nand/cafe_nand.c 2009-12-03 04:51:21.000000000 +0100
+++ b/drivers/mtd/nand/cafe_nand.c 2010-01-08 04:27:58.000000000 +0100
@@ -848,7 +848,7 @@  static void __devexit cafe_nand_remove(s
 	kfree(mtd);
 }

-static struct pci_device_id cafe_nand_tbl[] = {
+static const struct pci_device_id cafe_nand_tbl[] = {
 	{ PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_88ALP01_NAND,
 	  PCI_ANY_ID, PCI_ANY_ID },
 	{ }