| From: Fabian Frederick <fabf@skynet.be> |
| Date: Tue, 17 Mar 2015 19:40:24 +0100 |
| Subject: can: constify of_device_id array |
| |
| commit 486e957033623656298a07c39a8bf2fd81db285b upstream. |
| |
| 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> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/net/can/cc770/cc770_platform.c | 2 +- |
| drivers/net/can/grcan.c | 2 +- |
| drivers/net/can/mscan/mpc5xxx_can.c | 2 +- |
| drivers/net/can/sja1000/sja1000_platform.c | 2 +- |
| drivers/net/can/xilinx_can.c | 2 +- |
| 5 files changed, 5 insertions(+), 5 deletions(-) |
| |
| --- 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 |
| return 0; |
| } |
| |
| -static struct of_device_id cc770_platform_table[] = { |
| +static const struct of_device_id cc770_platform_table[] = { |
| {.compatible = "bosch,cc770"}, /* CC770 from Bosch */ |
| {.compatible = "intc,82527"}, /* AN82527 from Intel CP */ |
| {}, |
| --- a/drivers/net/can/grcan.c |
| +++ b/drivers/net/can/grcan.c |
| @@ -1725,7 +1725,7 @@ static int grcan_remove(struct platform_ |
| return 0; |
| } |
| |
| -static struct of_device_id grcan_match[] = { |
| +static const struct of_device_id grcan_match[] = { |
| {.name = "GAISLER_GRCAN"}, |
| {.name = "01_03d"}, |
| {.name = "GAISLER_GRHCAN"}, |
| --- a/drivers/net/can/mscan/mpc5xxx_can.c |
| +++ b/drivers/net/can/mscan/mpc5xxx_can.c |
| @@ -43,7 +43,7 @@ struct mpc5xxx_can_data { |
| }; |
| |
| #ifdef CONFIG_PPC_MPC52xx |
| -static struct of_device_id mpc52xx_cdm_ids[] = { |
| +static const struct of_device_id mpc52xx_cdm_ids[] = { |
| { .compatible = "fsl,mpc5200-cdm", }, |
| {} |
| }; |
| --- 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_dev |
| return 0; |
| } |
| |
| -static struct of_device_id sp_of_table[] = { |
| +static const struct of_device_id sp_of_table[] = { |
| {.compatible = "nxp,sja1000"}, |
| {}, |
| }; |
| --- a/drivers/net/can/xilinx_can.c |
| +++ b/drivers/net/can/xilinx_can.c |
| @@ -1184,7 +1184,7 @@ static int xcan_remove(struct platform_d |
| } |
| |
| /* Match table for OF platform binding */ |
| -static struct of_device_id xcan_of_match[] = { |
| +static const struct of_device_id xcan_of_match[] = { |
| { .compatible = "xlnx,zynq-can-1.0", }, |
| { .compatible = "xlnx,axi-can-1.00.a", }, |
| { /* end of list */ }, |