diff options
author | Márton Németh <nm127@freemail.hu> | 2010-01-09 20:43:14 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-01-14 21:26:04 -0500 |
commit | 46759a7c132648d79121518d2f7c34edc3f0cf58 (patch) | |
tree | fd61a6427c502907a863408beaf391853bdc5436 | |
parent | 4bf936b9e484bb8ee5f32bfd1351893810864f58 (diff) |
powerpc/macintosh: 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
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r-- | drivers/macintosh/smu.c | 2 | ||||
-rw-r--r-- | drivers/macintosh/therm_pm72.c | 2 | ||||
-rw-r--r-- | drivers/macintosh/therm_windtunnel.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index 96faa799b82a..f96feeb6b9ce 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c | |||
@@ -660,7 +660,7 @@ static int smu_platform_probe(struct of_device* dev, | |||
660 | return 0; | 660 | return 0; |
661 | } | 661 | } |
662 | 662 | ||
663 | static struct of_device_id smu_platform_match[] = | 663 | static const struct of_device_id smu_platform_match[] = |
664 | { | 664 | { |
665 | { | 665 | { |
666 | .type = "smu", | 666 | .type = "smu", |
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index ea32c7e5a9af..454bc501df3c 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c | |||
@@ -2211,7 +2211,7 @@ static int fcu_of_remove(struct of_device* dev) | |||
2211 | return 0; | 2211 | return 0; |
2212 | } | 2212 | } |
2213 | 2213 | ||
2214 | static struct of_device_id fcu_match[] = | 2214 | static const struct of_device_id fcu_match[] = |
2215 | { | 2215 | { |
2216 | { | 2216 | { |
2217 | .type = "fcu", | 2217 | .type = "fcu", |
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index 3fbe41b0ac07..ba48fd76396e 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c | |||
@@ -457,7 +457,7 @@ therm_of_remove( struct of_device *dev ) | |||
457 | return 0; | 457 | return 0; |
458 | } | 458 | } |
459 | 459 | ||
460 | static struct of_device_id therm_of_match[] = {{ | 460 | static const struct of_device_id therm_of_match[] = {{ |
461 | .name = "fan", | 461 | .name = "fan", |
462 | .compatible = "adm1030" | 462 | .compatible = "adm1030" |
463 | }, {} | 463 | }, {} |