nand: make Open Firmware device id constant

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

Subsystems (3)

PowerPC Memory technology devices (MTD) NAND flash

lore

Share & tools

lore

Németh Márton

author

2010-01-09 14:10 UTC #0 lore raw

PATCH 3/3 nand: make Open Firmware device id constant

From: Márton Németh <[email protected]>

The match_table field of the struct of_device_id is constant in <linux/of_platform.h> so it is worth to make xps2_of_match 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 <[email protected]>

Cc Julia Lawall <[email protected]>

Cc [email protected]

---

drivers/mtd/nand/pasemi_nand.c 2010-01-08 04:26:40.000000000 +0100 renamed from drivers/mtd/nand/pasemi_nand.c 2009-12-03 04:51:21.000000000 +0100 +1 -1

diff -u -p a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
@@ -209,7 +209,7 @@ static int __devexit pasemi_nand_remove(
 	return 0;
 }
 
-static struct of_device_id pasemi_nand_match[] =
+static const struct of_device_id pasemi_nand_match[] =
 {
 	{
 		.compatible   = "pasemi,localbus-nand",

drivers/mtd/nand/fsl_upm.c 2010-01-08 04:28:52.000000000 +0100 renamed from drivers/mtd/nand/fsl_upm.c 2010-01-07 19:08:42.000000000 +0100 +1 -1

diff -u -p a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
@@ -349,7 +349,7 @@ static int __devexit fun_remove(struct o
 	return 0;
 }
 
-static struct of_device_id of_fun_match[] = {
+static const struct of_device_id of_fun_match[] = {
 	{ .compatible = "fsl,upm-nand" },
 	{},
 };

drivers/mtd/nand/socrates_nand.c 2010-01-08 04:29:01.000000000 +0100 renamed from drivers/mtd/nand/socrates_nand.c 2009-12-03 04:51:21.000000000 +0100 +1 -1

diff -u -p a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
@@ -290,7 +290,7 @@ static int __devexit socrates_nand_remov
 	return 0;
 }
 
-static struct of_device_id socrates_nand_match[] =
+static const struct of_device_id socrates_nand_match[] =
 {
 	{
 		.compatible   = "abb,socrates-nand",