Messages in this thread Patch in this message | | | Date | Sun, 10 Jan 2010 13:14:14 +0100 | From | Németh Márton <> | Subject | [PATCH] spi: 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 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/spi/xilinx_spi_of.c b/drivers/spi/xilinx_spi_of.c --- a/drivers/spi/xilinx_spi_of.c 2010-01-07 19:08:45.000000000 +0100 +++ b/drivers/spi/xilinx_spi_of.c 2010-01-08 09:11:27.000000000 +0100 @@ -99,7 +99,7 @@ static int __exit xilinx_spi_of_remove(s return xilinx_spi_remove(op); }
-static struct of_device_id xilinx_spi_of_match[] = { +static const struct of_device_id xilinx_spi_of_match[] = { { .compatible = "xlnx,xps-spi-2.00.a", }, { .compatible = "xlnx,xps-spi-2.00.b", }, {} diff -u -p a/drivers/spi/mpc52xx_spi.c b/drivers/spi/mpc52xx_spi.c --- a/drivers/spi/mpc52xx_spi.c 2010-01-07 19:08:45.000000000 +0100 +++ b/drivers/spi/mpc52xx_spi.c 2010-01-08 09:11:55.000000000 +0100 @@ -550,7 +550,7 @@ static int __devexit mpc52xx_spi_remove( return 0; }
-static struct of_device_id mpc52xx_spi_match[] __devinitdata = { +static const struct of_device_id mpc52xx_spi_match[] __devinitconst = { { .compatible = "fsl,mpc5200-spi", }, {} }; diff -u -p a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c --- a/drivers/spi/mpc52xx_psc_spi.c 2010-01-07 19:08:45.000000000 +0100 +++ b/drivers/spi/mpc52xx_psc_spi.c 2010-01-08 09:13:23.000000000 +0100 @@ -503,7 +503,7 @@ static int __exit mpc52xx_psc_spi_of_rem return mpc52xx_psc_spi_do_remove(&op->dev); }
-static struct of_device_id mpc52xx_psc_spi_of_match[] = { +static const struct of_device_id mpc52xx_psc_spi_of_match[] = { { .compatible = "fsl,mpc5200-psc-spi", }, { .compatible = "mpc5200-psc-spi", }, /* old */ {} diff -u -p a/drivers/spi/spi_ppc4xx.c b/drivers/spi/spi_ppc4xx.c --- a/drivers/spi/spi_ppc4xx.c 2009-12-03 04:51:21.000000000 +0100 +++ b/drivers/spi/spi_ppc4xx.c 2010-01-08 09:13:36.000000000 +0100 @@ -578,7 +578,7 @@ static int __exit spi_ppc4xx_of_remove(s return 0; }
-static struct of_device_id spi_ppc4xx_of_match[] = { +static const struct of_device_id spi_ppc4xx_of_match[] = { { .compatible = "ibm,ppc4xx-spi", }, {}, }; -- 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/
| |