diff options
author | Márton Németh <nm127@freemail.hu> | 2010-01-12 02:56:13 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 11:37:34 -0500 |
commit | 63c9a8b3023e6e276343da56e0f31a98c28ece9b (patch) | |
tree | 99681b03ff491817a38b4bee7060061a143e1241 /drivers/pcmcia | |
parent | c6be9c5ab426693a052e67d7469df19a1c50faf4 (diff) |
pcmcia: 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 the initialization data 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
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/electra_cf.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/m8xx_pcmcia.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c index d187ba4c5e0e..89cfddca089a 100644 --- a/drivers/pcmcia/electra_cf.c +++ b/drivers/pcmcia/electra_cf.c | |||
@@ -347,7 +347,7 @@ static int __devexit electra_cf_remove(struct of_device *ofdev) | |||
347 | return 0; | 347 | return 0; |
348 | } | 348 | } |
349 | 349 | ||
350 | static struct of_device_id electra_cf_match[] = { | 350 | static const struct of_device_id electra_cf_match[] = { |
351 | { | 351 | { |
352 | .compatible = "electra-cf", | 352 | .compatible = "electra-cf", |
353 | }, | 353 | }, |
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index 3a1fe3ab2cd4..61c215918128 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c | |||
@@ -1303,7 +1303,7 @@ static int m8xx_resume(struct platform_device *pdev) | |||
1303 | #define m8xx_resume NULL | 1303 | #define m8xx_resume NULL |
1304 | #endif | 1304 | #endif |
1305 | 1305 | ||
1306 | static struct of_device_id m8xx_pcmcia_match[] = { | 1306 | static const struct of_device_id m8xx_pcmcia_match[] = { |
1307 | { | 1307 | { |
1308 | .type = "pcmcia", | 1308 | .type = "pcmcia", |
1309 | .compatible = "fsl,pq-pcmcia", | 1309 | .compatible = "fsl,pq-pcmcia", |