From: Márton Németh <[email protected]> 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 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 <[email protected]> Cc: Julia Lawall <[email protected]> Cc: [email protected] --- diff -u -p a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c --- a/drivers/edac/ppc4xx_edac.c 2009-12-03 04:51:21.000000000 +0100 +++ b/drivers/edac/ppc4xx_edac.c 2010-01-08 04:46:11.000000000 +0100 @@ -194,7 +194,7 @@ static int ppc4xx_edac_remove(struct of_ * Device tree node type and compatible tuples this driver can match * on. */ -static struct of_device_id ppc4xx_edac_match[] = { +static const struct of_device_id ppc4xx_edac_match[] = { { .compatible = "ibm,sdram-4xx-ddr2" }, diff -u -p a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c --- a/drivers/edac/mpc85xx_edac.c 2009-12-03 04:51:21.000000000 +0100 +++ b/drivers/edac/mpc85xx_edac.c 2010-01-08 04:46:17.000000000 +0100 @@ -328,7 +328,7 @@ static int mpc85xx_pci_err_remove(struct return 0; } -static struct of_device_id mpc85xx_pci_err_of_match[] = { +static const struct of_device_id mpc85xx_pci_err_of_match[] = { { .compatible = "fsl,mpc8540-pcix", }, @@ -633,7 +633,7 @@ static int mpc85xx_l2_err_remove(struct return 0; } -static struct of_device_id mpc85xx_l2_err_of_match[] = { +static const struct of_device_id mpc85xx_l2_err_of_match[] = { /* deprecate the fsl,85.. forms in the future, 2.6.30? */ { .compatible = "fsl,8540-l2-cache-controller", }, { .compatible = "fsl,8541-l2-cache-controller", }, @@ -973,7 +973,7 @@ static int mpc85xx_mc_err_remove(struct return 0; } -static struct of_device_id mpc85xx_mc_err_of_match[] = { +static const struct of_device_id mpc85xx_mc_err_of_match[] = { /* deprecate the fsl,85.. forms in the future, 2.6.30? */ { .compatible = "fsl,8540-memory-controller", }, { .compatible = "fsl,8541-memory-controller", }, _______________________________________________ Cocci mailing list [email protected] http://lists.diku.dk/mailman/listinfo/cocci (Web access from inside DIKUs LAN only)
