diff options
author | Fabian Frederick <fabf@skynet.be> | 2015-03-17 14:40:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-17 15:00:23 -0400 |
commit | 486e957033623656298a07c39a8bf2fd81db285b (patch) | |
tree | f1c176dcdf6af8607dfc72e5960567bc047bf3f6 | |
parent | d8a7dadbdfde042c07599e8ac90c7718aef76da7 (diff) |
can: 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: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/can/cc770/cc770_platform.c | 2 | ||||
-rw-r--r-- | drivers/net/can/grcan.c | 2 | ||||
-rw-r--r-- | drivers/net/can/mscan/mpc5xxx_can.c | 2 | ||||
-rw-r--r-- | drivers/net/can/sja1000/sja1000_platform.c | 2 | ||||
-rw-r--r-- | drivers/net/can/xilinx_can.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/can/cc770/cc770_platform.c b/drivers/net/can/cc770/cc770_platform.c index b1e8851d3cc4..866e5e12fdd2 100644 --- a/drivers/net/can/cc770/cc770_platform.c +++ b/drivers/net/can/cc770/cc770_platform.c | |||
@@ -254,7 +254,7 @@ static int cc770_platform_remove(struct platform_device *pdev) | |||
254 | return 0; | 254 | return 0; |
255 | } | 255 | } |
256 | 256 | ||
257 | static struct of_device_id cc770_platform_table[] = { | 257 | static const struct of_device_id cc770_platform_table[] = { |
258 | {.compatible = "bosch,cc770"}, /* CC770 from Bosch */ | 258 | {.compatible = "bosch,cc770"}, /* CC770 from Bosch */ |
259 | {.compatible = "intc,82527"}, /* AN82527 from Intel CP */ | 259 | {.compatible = "intc,82527"}, /* AN82527 from Intel CP */ |
260 | {}, | 260 | {}, |
diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c index fed1bbd0b0d2..e3d7e22a4fa0 100644 --- a/drivers/net/can/grcan.c +++ b/drivers/net/can/grcan.c | |||
@@ -1725,7 +1725,7 @@ static int grcan_remove(struct platform_device *ofdev) | |||
1725 | return 0; | 1725 | return 0; |
1726 | } | 1726 | } |
1727 | 1727 | ||
1728 | static struct of_device_id grcan_match[] = { | 1728 | static const struct of_device_id grcan_match[] = { |
1729 | {.name = "GAISLER_GRCAN"}, | 1729 | {.name = "GAISLER_GRCAN"}, |
1730 | {.name = "01_03d"}, | 1730 | {.name = "01_03d"}, |
1731 | {.name = "GAISLER_GRHCAN"}, | 1731 | {.name = "GAISLER_GRHCAN"}, |
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c index ad024e60ba8c..c7427bdd3a4b 100644 --- a/drivers/net/can/mscan/mpc5xxx_can.c +++ b/drivers/net/can/mscan/mpc5xxx_can.c | |||
@@ -43,7 +43,7 @@ struct mpc5xxx_can_data { | |||
43 | }; | 43 | }; |
44 | 44 | ||
45 | #ifdef CONFIG_PPC_MPC52xx | 45 | #ifdef CONFIG_PPC_MPC52xx |
46 | static struct of_device_id mpc52xx_cdm_ids[] = { | 46 | static const struct of_device_id mpc52xx_cdm_ids[] = { |
47 | { .compatible = "fsl,mpc5200-cdm", }, | 47 | { .compatible = "fsl,mpc5200-cdm", }, |
48 | {} | 48 | {} |
49 | }; | 49 | }; |
diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c index 93115250eaf5..0552ed46a206 100644 --- a/drivers/net/can/sja1000/sja1000_platform.c +++ b/drivers/net/can/sja1000/sja1000_platform.c | |||
@@ -242,7 +242,7 @@ static int sp_remove(struct platform_device *pdev) | |||
242 | return 0; | 242 | return 0; |
243 | } | 243 | } |
244 | 244 | ||
245 | static struct of_device_id sp_of_table[] = { | 245 | static const struct of_device_id sp_of_table[] = { |
246 | {.compatible = "nxp,sja1000"}, | 246 | {.compatible = "nxp,sja1000"}, |
247 | {}, | 247 | {}, |
248 | }; | 248 | }; |
diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c index 6c6764312285..6bddfe062b51 100644 --- a/drivers/net/can/xilinx_can.c +++ b/drivers/net/can/xilinx_can.c | |||
@@ -1185,7 +1185,7 @@ static int xcan_remove(struct platform_device *pdev) | |||
1185 | } | 1185 | } |
1186 | 1186 | ||
1187 | /* Match table for OF platform binding */ | 1187 | /* Match table for OF platform binding */ |
1188 | static struct of_device_id xcan_of_match[] = { | 1188 | static const struct of_device_id xcan_of_match[] = { |
1189 | { .compatible = "xlnx,zynq-can-1.0", }, | 1189 | { .compatible = "xlnx,zynq-can-1.0", }, |
1190 | { .compatible = "xlnx,axi-can-1.00.a", }, | 1190 | { .compatible = "xlnx,axi-can-1.00.a", }, |
1191 | { /* end of list */ }, | 1191 | { /* end of list */ }, |