mtd: nand: make Open Firmware device id constant
authorMárton Németh <nm127@freemail.hu>
Sat, 9 Jan 2010 14:10:46 +0000 (15:10 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Thu, 25 Feb 2010 11:26:36 +0000 (11:26 +0000)
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 <nm127@freemail.hu>
Cc: Julia Lawall <julia@diku.dk>
Cc: cocci@diku.dk
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/mtd/nand/fsl_upm.c
drivers/mtd/nand/pasemi_nand.c
drivers/mtd/nand/socrates_nand.c

index ab06a5b514a95990c4ba0fdb67063d3f01d42c4f..d721ec055cbfd7493038a9dde4bfc6143c28082a 100644 (file)
@@ -349,7 +349,7 @@ static int __devexit fun_remove(struct of_device *ofdev)
        return 0;
 }
 
-static struct of_device_id of_fun_match[] = {
+static const struct of_device_id of_fun_match[] = {
        { .compatible = "fsl,upm-nand" },
        {},
 };
index a8b9376cf32404a9257fc8c4a1c97d9f1c8d8f36..090a05c12cbe0db0c67659a0abb39354aa0e11ff 100644 (file)
@@ -209,7 +209,7 @@ static int __devexit pasemi_nand_remove(struct of_device *ofdev)
        return 0;
 }
 
-static struct of_device_id pasemi_nand_match[] =
+static const struct of_device_id pasemi_nand_match[] =
 {
        {
                .compatible   = "pasemi,localbus-nand",
index a4519a7bd68356c20954de2d809767ccd6d5c559..65748ea2b348a824b2613ffef4cf48c4ea14352e 100644 (file)
@@ -290,7 +290,7 @@ static int __devexit socrates_nand_remove(struct of_device *ofdev)
        return 0;
 }
 
-static struct of_device_id socrates_nand_match[] =
+static const struct of_device_id socrates_nand_match[] =
 {
        {
                .compatible   = "abb,socrates-nand",