OSDN Git Service

ARM: davinci: mark spi_board_info arrays as const
authorArnd Bergmann <arnd@arndb.de>
Tue, 20 Feb 2018 16:24:52 +0000 (17:24 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 22 Feb 2018 16:43:16 +0000 (17:43 +0100)
commiteec51afc9d2612c65523627cfd81456c6995a79a
treec9fc34fe08d6f2e41172df64d99330bb00fb4449
parent01a6e1267e741a91c6cdb4604cd2f898166e03f0
ARM: davinci: mark spi_board_info arrays as const

Building with LTO revealed that three spi_board_info arrays are marked
__initconst, but not const:

arch/arm/mach-davinci/board-dm365-evm.c: In function 'dm365_evm_init':
arch/arm/mach-davinci/board-dm365-evm.c:729:30: error: 'dm365_evm_spi_info' causes a section type conflict with 'dm646x_edma_device'
 static struct spi_board_info dm365_evm_spi_info[] __initconst = {
                              ^
arch/arm/mach-davinci/dm646x.c:603:42: note: 'dm646x_edma_device' was declared here
 static const struct platform_device_info dm646x_edma_device __initconst = {

This marks them const as well, as was originally intended.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-davinci/board-dm355-evm.c
arch/arm/mach-davinci/board-dm355-leopard.c
arch/arm/mach-davinci/board-dm365-evm.c