aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2015-03-16 15:20:26 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-16 16:10:28 -0400
commit6893d9b51093cf499ee6217e98c50006ec2727c6 (patch)
tree3b9072435cc7199e0ccbac7887591a1df0ff097d
parent208d51154c8d7f2c3808b4401132233c5ab21572 (diff)
misc: 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/carma/carma-fpga-program.c2
-rw-r--r--drivers/misc/carma/carma-fpga.c2
-rw-r--r--drivers/misc/lis3lv02d/lis3lv02d_i2c.c2
-rw-r--r--drivers/misc/lis3lv02d/lis3lv02d_spi.c2
-rw-r--r--drivers/misc/sram.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c
index 06166ac000e0..fff8c43d9943 100644
--- a/drivers/misc/carma/carma-fpga-program.c
+++ b/drivers/misc/carma/carma-fpga-program.c
@@ -1142,7 +1142,7 @@ out_return:
1142 return ret; 1142 return ret;
1143} 1143}
1144 1144
1145static struct of_device_id fpga_of_match[] = { 1145static const struct of_device_id fpga_of_match[] = {
1146 { .compatible = "carma,fpga-programmer", }, 1146 { .compatible = "carma,fpga-programmer", },
1147 {}, 1147 {},
1148}; 1148};
diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c
index 68cdfe151bdb..5aba3fd789de 100644
--- a/drivers/misc/carma/carma-fpga.c
+++ b/drivers/misc/carma/carma-fpga.c
@@ -1486,7 +1486,7 @@ static int data_of_remove(struct platform_device *op)
1486 return 0; 1486 return 0;
1487} 1487}
1488 1488
1489static struct of_device_id data_of_match[] = { 1489static const struct of_device_id data_of_match[] = {
1490 { .compatible = "carma,carma-fpga", }, 1490 { .compatible = "carma,carma-fpga", },
1491 {}, 1491 {},
1492}; 1492};
diff --git a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
index 63fe096d4462..e3e7f1dc27ba 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
@@ -106,7 +106,7 @@ static union axis_conversion lis3lv02d_axis_map =
106 { .as_array = { LIS3_DEV_X, LIS3_DEV_Y, LIS3_DEV_Z } }; 106 { .as_array = { LIS3_DEV_X, LIS3_DEV_Y, LIS3_DEV_Z } };
107 107
108#ifdef CONFIG_OF 108#ifdef CONFIG_OF
109static struct of_device_id lis3lv02d_i2c_dt_ids[] = { 109static const struct of_device_id lis3lv02d_i2c_dt_ids[] = {
110 { .compatible = "st,lis3lv02d" }, 110 { .compatible = "st,lis3lv02d" },
111 {} 111 {}
112}; 112};
diff --git a/drivers/misc/lis3lv02d/lis3lv02d_spi.c b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
index bd06d0cfac45..b2f6e1651ac9 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d_spi.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
@@ -61,7 +61,7 @@ static union axis_conversion lis3lv02d_axis_normal =
61 { .as_array = { 1, 2, 3 } }; 61 { .as_array = { 1, 2, 3 } };
62 62
63#ifdef CONFIG_OF 63#ifdef CONFIG_OF
64static struct of_device_id lis302dl_spi_dt_ids[] = { 64static const struct of_device_id lis302dl_spi_dt_ids[] = {
65 { .compatible = "st,lis302dl-spi" }, 65 { .compatible = "st,lis302dl-spi" },
66 {} 66 {}
67}; 67};
diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c
index 21181fa243df..1ed37cedff49 100644
--- a/drivers/misc/sram.c
+++ b/drivers/misc/sram.c
@@ -205,7 +205,7 @@ static int sram_remove(struct platform_device *pdev)
205} 205}
206 206
207#ifdef CONFIG_OF 207#ifdef CONFIG_OF
208static struct of_device_id sram_dt_ids[] = { 208static const struct of_device_id sram_dt_ids[] = {
209 { .compatible = "mmio-sram" }, 209 { .compatible = "mmio-sram" },
210 {} 210 {}
211}; 211};