diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2012-03-30 16:13:53 -0400 |
---|---|---|
committer | Sekhar Nori <nsekhar@ti.com> | 2012-04-18 16:20:30 -0400 |
commit | d65566e50b35165c5d89cd6ea5049662ae6da43b (patch) | |
tree | 3dcd5f4c2450748d176d89a0d280f8aad3779803 /arch/arm/mach-davinci | |
parent | 4a6e6a5eb3f8309273b389ca74538f65af203f6c (diff) |
ARM: davinci: mark spi_board_info arguments as const
spi_board_info is not modified in any of the spi registeration
functions and passed along as-is to the generic SPI layer.
Mark spi_board_info arguments as const to signal this.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
[nsekhar@ti.com: extended for dm365 and dm355]
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r-- | arch/arm/mach-davinci/davinci.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-davinci/devices-da8xx.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/dm355.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/dm365.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/da8xx.h | 3 |
5 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h index 3e519dad5bb9..8db0fc6809dd 100644 --- a/arch/arm/mach-davinci/davinci.h +++ b/arch/arm/mach-davinci/davinci.h | |||
@@ -72,7 +72,7 @@ void davinci_map_sysmod(void); | |||
72 | /* DM355 function declarations */ | 72 | /* DM355 function declarations */ |
73 | void __init dm355_init(void); | 73 | void __init dm355_init(void); |
74 | void dm355_init_spi0(unsigned chipselect_mask, | 74 | void dm355_init_spi0(unsigned chipselect_mask, |
75 | struct spi_board_info *info, unsigned len); | 75 | const struct spi_board_info *info, unsigned len); |
76 | void __init dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata); | 76 | void __init dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata); |
77 | void dm355_set_vpfe_config(struct vpfe_config *cfg); | 77 | void dm355_set_vpfe_config(struct vpfe_config *cfg); |
78 | 78 | ||
@@ -83,7 +83,7 @@ void __init dm365_init_vc(struct snd_platform_data *pdata); | |||
83 | void __init dm365_init_ks(struct davinci_ks_platform_data *pdata); | 83 | void __init dm365_init_ks(struct davinci_ks_platform_data *pdata); |
84 | void __init dm365_init_rtc(void); | 84 | void __init dm365_init_rtc(void); |
85 | void dm365_init_spi0(unsigned chipselect_mask, | 85 | void dm365_init_spi0(unsigned chipselect_mask, |
86 | struct spi_board_info *info, unsigned len); | 86 | const struct spi_board_info *info, unsigned len); |
87 | void dm365_set_vpfe_config(struct vpfe_config *cfg); | 87 | void dm365_set_vpfe_config(struct vpfe_config *cfg); |
88 | 88 | ||
89 | /* DM644x function declarations */ | 89 | /* DM644x function declarations */ |
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 42dbf3dc11ab..d1624a315c9a 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c | |||
@@ -831,7 +831,7 @@ static struct platform_device da8xx_spi_device[] = { | |||
831 | }, | 831 | }, |
832 | }; | 832 | }; |
833 | 833 | ||
834 | int __init da8xx_register_spi(int instance, struct spi_board_info *info, | 834 | int __init da8xx_register_spi(int instance, const struct spi_board_info *info, |
835 | unsigned len) | 835 | unsigned len) |
836 | { | 836 | { |
837 | int ret; | 837 | int ret; |
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index fd3d09aa6cde..678cd99b7336 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c | |||
@@ -424,7 +424,7 @@ static struct platform_device dm355_spi0_device = { | |||
424 | }; | 424 | }; |
425 | 425 | ||
426 | void __init dm355_init_spi0(unsigned chipselect_mask, | 426 | void __init dm355_init_spi0(unsigned chipselect_mask, |
427 | struct spi_board_info *info, unsigned len) | 427 | const struct spi_board_info *info, unsigned len) |
428 | { | 428 | { |
429 | /* for now, assume we need MISO */ | 429 | /* for now, assume we need MISO */ |
430 | davinci_cfg_reg(DM355_SPI0_SDI); | 430 | davinci_cfg_reg(DM355_SPI0_SDI); |
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 1a2e953082b3..a50d49de1883 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c | |||
@@ -676,7 +676,7 @@ static struct platform_device dm365_spi0_device = { | |||
676 | }; | 676 | }; |
677 | 677 | ||
678 | void __init dm365_init_spi0(unsigned chipselect_mask, | 678 | void __init dm365_init_spi0(unsigned chipselect_mask, |
679 | struct spi_board_info *info, unsigned len) | 679 | const struct spi_board_info *info, unsigned len) |
680 | { | 680 | { |
681 | davinci_cfg_reg(DM365_SPI0_SCLK); | 681 | davinci_cfg_reg(DM365_SPI0_SCLK); |
682 | davinci_cfg_reg(DM365_SPI0_SDI); | 682 | davinci_cfg_reg(DM365_SPI0_SDI); |
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h index ee3461d7ec1b..a2f1f274f189 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/arch/arm/mach-davinci/include/mach/da8xx.h | |||
@@ -76,7 +76,8 @@ void __init da850_init(void); | |||
76 | int da830_register_edma(struct edma_rsv_info *rsv); | 76 | int da830_register_edma(struct edma_rsv_info *rsv); |
77 | int da850_register_edma(struct edma_rsv_info *rsv[2]); | 77 | int da850_register_edma(struct edma_rsv_info *rsv[2]); |
78 | int da8xx_register_i2c(int instance, struct davinci_i2c_platform_data *pdata); | 78 | int da8xx_register_i2c(int instance, struct davinci_i2c_platform_data *pdata); |
79 | int da8xx_register_spi(int instance, struct spi_board_info *info, unsigned len); | 79 | int da8xx_register_spi(int instance, |
80 | const struct spi_board_info *info, unsigned len); | ||
80 | int da8xx_register_watchdog(void); | 81 | int da8xx_register_watchdog(void); |
81 | int da8xx_register_usb20(unsigned mA, unsigned potpgt); | 82 | int da8xx_register_usb20(unsigned mA, unsigned potpgt); |
82 | int da8xx_register_usb11(struct da8xx_ohci_root_hub *pdata); | 83 | int da8xx_register_usb11(struct da8xx_ohci_root_hub *pdata); |