From patchwork Sat Jan  9 14:10:40 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [2/3] nand: make USB device id constant
Date: Sat, 09 Jan 2010 04:10:40 -0000
From: =?utf-8?b?TsOpbWV0aCBNw6FydG9u?= <nm127@freemail.hu>
X-Patchwork-Id: 42560
Message-Id: <4B488E60.4070604@freemail.hu>
To: David Woodhouse <dwmw2@infradead.org>
Cc: Julia Lawall <julia@diku.dk>, linux-mtd@lists.infradead.org,
 LKML <linux-kernel@vger.kernel.org>, cocci@diku.dk

From: Márton Németh <nm127@freemail.hu>

The id_table field of the struct usb_device_id is constant in <linux/usb.h>
so it is worth to make alauda_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>

Signed-off-by: Márton Németh <nm127@freemail.hu>
Cc: Julia Lawall <julia@diku.dk>
Cc: cocci@diku.dk

---


diff -u -p a/drivers/mtd/nand/alauda.c b/drivers/mtd/nand/alauda.c
--- a/drivers/mtd/nand/alauda.c 2010-01-07 19:08:42.000000000 +0100
+++ b/drivers/mtd/nand/alauda.c 2010-01-08 04:26:29.000000000 +0100
@@ -49,7 +49,7 @@

 #define TIMEOUT HZ

-static struct usb_device_id alauda_table [] = {
+static const struct usb_device_id alauda_table[] = {
 	{ USB_DEVICE(0x0584, 0x0008) },	/* Fujifilm DPC-R1 */
 	{ USB_DEVICE(0x07b4, 0x010a) },	/* Olympus MAUSB-10 */
 	{ }