iommu/io-pgtable-arm: Use const and __initconst for iommu_gather_ops structures

goyalbhumika · wildea01 · commit dfed5f01e246 · 2016-11-29T15:57:41.000Z
Check for iommu_gather_ops structures that are only stored in the tlb
field of an io_pgtable_cfg structure. The tlb field is of type
const struct iommu_gather_ops *, so iommu_gather_ops structures
having this property can be declared as const. Also, replace __initdata
with __initconst.

Acked-by: Julia Lawall &lt;julia.lawall@lip6.fr&gt;
Signed-off-by: Bhumika Goyal &lt;bhumirks@gmail.com&gt;
Signed-off-by: Will Deacon &lt;will.deacon@arm.com&gt;
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
@@ -916,7 +916,7 @@ static void dummy_tlb_sync(void *cookie)
 	WARN_ON(cookie != cfg_cookie);
 }
 
-static struct iommu_gather_ops dummy_tlb_ops __initdata = {
+static const struct iommu_gather_ops dummy_tlb_ops __initconst = {
 	.tlb_flush_all	= dummy_tlb_flush_all,
 	.tlb_add_flush	= dummy_tlb_add_flush,
 	.tlb_sync	= dummy_tlb_sync,

Original file line number	Diff line number	Diff line change
`@@ -916,7 +916,7 @@ static void dummy_tlb_sync(void *cookie)`
`916`	`916`	`WARN_ON(cookie != cfg_cookie);`
`917`	`917`	`}`
`918`	`918`
`919`		`-static struct iommu_gather_ops dummy_tlb_ops __initdata = {`
	`919`	`+static const struct iommu_gather_ops dummy_tlb_ops __initconst = {`
`920`	`920`	`.tlb_flush_all = dummy_tlb_flush_all,`
`921`	`921`	`.tlb_add_flush = dummy_tlb_add_flush,`
`922`	`922`	`.tlb_sync = dummy_tlb_sync,`