diff options
author | Fabian Frederick <fabf@skynet.be> | 2015-03-16 15:54:41 -0400 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2015-03-20 12:50:07 -0400 |
commit | 1afaa05515212b136d96a48b2ba2251f40437d87 (patch) | |
tree | 75fa98d58e6a2c42b37d800b0d0955f7894c6784 | |
parent | 18b44b2b950a0746abe7466021e842c6d7e96443 (diff) |
EDAC: Constify of_device_id array
of_device_id is always used as const. See driver.of_match_table and open
firmware functions.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Doug Thompson <dougthompson@xmission.com>
Cc: Robert Richter <rric@kernel.org>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Johannes Thumshirn <johannes.thumshirn@men.de>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
Cc: linux-edac@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1426535685-25996-10-git-send-email-fabf@skynet.be
Signed-off-by: Borislav Petkov <bp@suse.de>
-rw-r--r-- | drivers/edac/highbank_mc_edac.c | 2 | ||||
-rw-r--r-- | drivers/edac/mpc85xx_edac.c | 4 | ||||
-rw-r--r-- | drivers/edac/ppc4xx_edac.c | 2 | ||||
-rw-r--r-- | drivers/edac/synopsys_edac.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/edac/highbank_mc_edac.c b/drivers/edac/highbank_mc_edac.c index 475484718fb2..11260cc3360e 100644 --- a/drivers/edac/highbank_mc_edac.c +++ b/drivers/edac/highbank_mc_edac.c | |||
@@ -146,7 +146,7 @@ static struct hb_mc_settings mw_settings = { | |||
146 | .int_offset = MW_DDR_ECC_INT_BASE, | 146 | .int_offset = MW_DDR_ECC_INT_BASE, |
147 | }; | 147 | }; |
148 | 148 | ||
149 | static struct of_device_id hb_ddr_ctrl_of_match[] = { | 149 | static const struct of_device_id hb_ddr_ctrl_of_match[] = { |
150 | { .compatible = "calxeda,hb-ddr-ctrl", .data = &hb_settings }, | 150 | { .compatible = "calxeda,hb-ddr-ctrl", .data = &hb_settings }, |
151 | { .compatible = "calxeda,ecx-2000-ddr-ctrl", .data = &mw_settings }, | 151 | { .compatible = "calxeda,ecx-2000-ddr-ctrl", .data = &mw_settings }, |
152 | {}, | 152 | {}, |
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 7be979c76081..68bf234bdfe6 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c | |||
@@ -670,7 +670,7 @@ static int mpc85xx_l2_err_remove(struct platform_device *op) | |||
670 | return 0; | 670 | return 0; |
671 | } | 671 | } |
672 | 672 | ||
673 | static struct of_device_id mpc85xx_l2_err_of_match[] = { | 673 | static const struct of_device_id mpc85xx_l2_err_of_match[] = { |
674 | /* deprecate the fsl,85.. forms in the future, 2.6.30? */ | 674 | /* deprecate the fsl,85.. forms in the future, 2.6.30? */ |
675 | { .compatible = "fsl,8540-l2-cache-controller", }, | 675 | { .compatible = "fsl,8540-l2-cache-controller", }, |
676 | { .compatible = "fsl,8541-l2-cache-controller", }, | 676 | { .compatible = "fsl,8541-l2-cache-controller", }, |
@@ -1160,7 +1160,7 @@ static int mpc85xx_mc_err_remove(struct platform_device *op) | |||
1160 | return 0; | 1160 | return 0; |
1161 | } | 1161 | } |
1162 | 1162 | ||
1163 | static struct of_device_id mpc85xx_mc_err_of_match[] = { | 1163 | static const struct of_device_id mpc85xx_mc_err_of_match[] = { |
1164 | /* deprecate the fsl,85.. forms in the future, 2.6.30? */ | 1164 | /* deprecate the fsl,85.. forms in the future, 2.6.30? */ |
1165 | { .compatible = "fsl,8540-memory-controller", }, | 1165 | { .compatible = "fsl,8540-memory-controller", }, |
1166 | { .compatible = "fsl,8541-memory-controller", }, | 1166 | { .compatible = "fsl,8541-memory-controller", }, |
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c index 1b64fd060821..3515b381c131 100644 --- a/drivers/edac/ppc4xx_edac.c +++ b/drivers/edac/ppc4xx_edac.c | |||
@@ -193,7 +193,7 @@ static int ppc4xx_edac_remove(struct platform_device *device); | |||
193 | * Device tree node type and compatible tuples this driver can match | 193 | * Device tree node type and compatible tuples this driver can match |
194 | * on. | 194 | * on. |
195 | */ | 195 | */ |
196 | static struct of_device_id ppc4xx_edac_match[] = { | 196 | static const struct of_device_id ppc4xx_edac_match[] = { |
197 | { | 197 | { |
198 | .compatible = "ibm,sdram-4xx-ddr2" | 198 | .compatible = "ibm,sdram-4xx-ddr2" |
199 | }, | 199 | }, |
diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c index 1c9691535e13..fc153aea2f6c 100644 --- a/drivers/edac/synopsys_edac.c +++ b/drivers/edac/synopsys_edac.c | |||
@@ -512,7 +512,7 @@ static int synps_edac_mc_remove(struct platform_device *pdev) | |||
512 | return 0; | 512 | return 0; |
513 | } | 513 | } |
514 | 514 | ||
515 | static struct of_device_id synps_edac_match[] = { | 515 | static const struct of_device_id synps_edac_match[] = { |
516 | { .compatible = "xlnx,zynq-ddrc-a05", }, | 516 | { .compatible = "xlnx,zynq-ddrc-a05", }, |
517 | { /* end of table */ } | 517 | { /* end of table */ } |
518 | }; | 518 | }; |