diff options
author | Márton Németh <nm127@freemail.hu> | 2010-01-09 09:10:46 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-25 06:26:36 -0500 |
commit | b2d4fbab79bd2b121c56db757c3a0f06ec7e0868 (patch) | |
tree | be65572cc2e8b2f3ea8134e0d787dd749c8b565c | |
parent | b3acd638a2b8b9c3cd1b52b83e285c88d34ef7f3 (diff) |
mtd: nand: make Open Firmware device id constant
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>
-rw-r--r-- | drivers/mtd/nand/fsl_upm.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/pasemi_nand.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/socrates_nand.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c index ab06a5b514a9..d721ec055cbf 100644 --- a/drivers/mtd/nand/fsl_upm.c +++ b/drivers/mtd/nand/fsl_upm.c | |||
@@ -349,7 +349,7 @@ static int __devexit fun_remove(struct of_device *ofdev) | |||
349 | return 0; | 349 | return 0; |
350 | } | 350 | } |
351 | 351 | ||
352 | static struct of_device_id of_fun_match[] = { | 352 | static const struct of_device_id of_fun_match[] = { |
353 | { .compatible = "fsl,upm-nand" }, | 353 | { .compatible = "fsl,upm-nand" }, |
354 | {}, | 354 | {}, |
355 | }; | 355 | }; |
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c index a8b9376cf324..090a05c12cbe 100644 --- a/drivers/mtd/nand/pasemi_nand.c +++ b/drivers/mtd/nand/pasemi_nand.c | |||
@@ -209,7 +209,7 @@ static int __devexit pasemi_nand_remove(struct of_device *ofdev) | |||
209 | return 0; | 209 | return 0; |
210 | } | 210 | } |
211 | 211 | ||
212 | static struct of_device_id pasemi_nand_match[] = | 212 | static const struct of_device_id pasemi_nand_match[] = |
213 | { | 213 | { |
214 | { | 214 | { |
215 | .compatible = "pasemi,localbus-nand", | 215 | .compatible = "pasemi,localbus-nand", |
diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c index a4519a7bd683..65748ea2b348 100644 --- a/drivers/mtd/nand/socrates_nand.c +++ b/drivers/mtd/nand/socrates_nand.c | |||
@@ -290,7 +290,7 @@ static int __devexit socrates_nand_remove(struct of_device *ofdev) | |||
290 | return 0; | 290 | return 0; |
291 | } | 291 | } |
292 | 292 | ||
293 | static struct of_device_id socrates_nand_match[] = | 293 | static const struct of_device_id socrates_nand_match[] = |
294 | { | 294 | { |
295 | { | 295 | { |
296 | .compatible = "abb,socrates-nand", | 296 | .compatible = "abb,socrates-nand", |