[PATCH 1/2] 1-wire: make PCI device id constant

From: NÃmeth MÃrton
Date: Sun Jan 10 2010 - 07:13:33 EST


From: MÃrton NÃmeth <nm127@xxxxxxxxxxx>

The id_table field of the struct pci_driver is constant in <linux/pci.h>
so it is worth to make matrox_w1_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@xxxxxxxxxxx>
Cc: Julia Lawall <julia@xxxxxxx>
Cc: cocci@xxxxxxx
---
diff -u -p a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c
--- a/drivers/w1/masters/matrox_w1.c 2009-12-03 04:51:21.000000000 +0100
+++ b/drivers/w1/masters/matrox_w1.c 2010-01-08 07:52:22.000000000 +0100
@@ -42,7 +42,7 @@ MODULE_LICENSE("GPL");
MODULE_AUTHOR("Evgeniy Polyakov <johnpol@xxxxxxxxxxx>");
MODULE_DESCRIPTION("Driver for transport(Dallas 1-wire prtocol) over VGA DDC(matrox gpio).");

-static struct pci_device_id matrox_w1_tbl[] = {
+static const struct pci_device_id matrox_w1_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G400) },
{ },
};
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/