Commit 8b974017 authored Jun 09, 2017 by Arnd Bergmann

ARM: davinci: don't mark vpif_input structures as 'const'

A change to the platform data definitions caused a warning in the board code:

arch/arm/mach-davinci/board-da850-evm.c:1221:13: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
arch/arm/mach-davinci/board-da850-evm.c:1231:13: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]

This is a bit unfortunate, since we generally like structure definitions to
be const, but as this is legacy code, the easiest way out is still to
remove the 'const' annotation here.

Fixes: 4a5f8ae5 ("[media] davinci: vpif_capture: get subdevs from DT when available")
Fixes: 231ce279 ("ARM: davinci: fix const warnings")
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parent fe89168c

arch/arm/mach-davinci/board-da850-evm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1166,7 +1166,7 @@ static struct tvp514x_platform_data tvp5146_pdata = {

		#define TVP514X_STD_ALL (V4L2_STD_NTSC \| V4L2_STD_PAL)

		static const struct vpif_input da850_ch0_inputs[] = {
		static struct vpif_input da850_ch0_inputs[] = {
		{
		.input = {
		.index = 0,
		@@ -1181,7 +1181,7 @@ static const struct vpif_input da850_ch0_inputs[] = {
		},
		};

		static const struct vpif_input da850_ch1_inputs[] = {
		static struct vpif_input da850_ch1_inputs[] = {
		{
		.input = {
		.index = 0,