dma: make Open Firmware device id constant

PATCH New Németh Márton 1 participant 1 message Jan 12, 2010

Subsystems (2)

dmaengine Freescale DMA driver

lore

Share & tools

lore

Németh Márton

author

2010-01-12 07:58 UTC #0 lore raw

PATCH 1/1 dma: make Open Firmware device id constant

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 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 <[email protected]>

Cc Julia Lawall <[email protected]>

Cc [email protected]

---

drivers/dma/ppc4xx/adma.c 2010-01-08 14:22:37.000000000 +0100 renamed from drivers/dma/ppc4xx/adma.c 2010-01-07 19:08:39.000000000 +0100 +1 -1

diff -u -p a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
@@ -4940,7 +4940,7 @@ out_free:
 	return ret;
 }
 
-static struct of_device_id __devinitdata ppc440spe_adma_of_match[] = {
+static const struct of_device_id ppc440spe_adma_of_match[] __devinitconst = {
 	{ .compatible	= "ibm,dma-440spe", },
 	{ .compatible	= "amcc,xor-accelerator", },
 	{},

drivers/dma/fsldma.c 2010-01-08 14:22:49.000000000 +0100 renamed from drivers/dma/fsldma.c 2009-12-03 04:51:21.000000000 +0100 +1 -1

diff -u -p a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
@@ -1274,7 +1274,7 @@ static int of_fsl_dma_remove(struct of_d
 	return 0;
 }
 
-static struct of_device_id of_fsl_dma_ids[] = {
+static const struct of_device_id of_fsl_dma_ids[] = {
 	{ .compatible = "fsl,eloplus-dma", },
 	{ .compatible = "fsl,elo-dma", },
 	{}