Messages in this thread Patch in this message | | | Date | Sun, 10 Jan 2010 12:43:14 +0100 | From | Németh Márton <> | Subject | [PATCH] macintosh: make Open Firmware device id constant |
| |
From: Márton Németh <nm127@freemail.hu>
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 --- diff -u -p a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c --- a/drivers/macintosh/therm_windtunnel.c 2010-01-07 19:08:40.000000000 +0100 +++ b/drivers/macintosh/therm_windtunnel.c 2010-01-08 04:47:10.000000000 +0100 @@ -457,7 +457,7 @@ therm_of_remove( struct of_device *dev ) return 0; }
-static struct of_device_id therm_of_match[] = {{ +static const struct of_device_id therm_of_match[] = {{ .name = "fan", .compatible = "adm1030" }, {} diff -u -p a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c --- a/drivers/macintosh/smu.c 2009-12-03 04:51:21.000000000 +0100 +++ b/drivers/macintosh/smu.c 2010-01-08 04:47:28.000000000 +0100 @@ -660,7 +660,7 @@ static int smu_platform_probe(struct of_ return 0; }
-static struct of_device_id smu_platform_match[] = +static const struct of_device_id smu_platform_match[] = { { .type = "smu", diff -u -p a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c --- a/drivers/macintosh/therm_pm72.c 2009-12-03 04:51:21.000000000 +0100 +++ b/drivers/macintosh/therm_pm72.c 2010-01-08 04:50:17.000000000 +0100 @@ -2211,7 +2211,7 @@ static int fcu_of_remove(struct of_devic return 0; }
-static struct of_device_id fcu_match[] = +static const struct of_device_id fcu_match[] = { { .type = "fcu", -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |