From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751622AbdFIKWI (ORCPT ); Fri, 9 Jun 2017 06:22:08 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:53779 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751527AbdFIKWG (ORCPT ); Fri, 9 Jun 2017 06:22:06 -0400 From: Arnd Bergmann To: Kevin Hilman Cc: Arnd Bergmann , Bartosz Golaszewski , Mauro Carvalho Chehab , "Lad, Prabhakar" , Axel Haslam , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: davinci: don't mark vpif_input structures as 'const' Date: Fri, 9 Jun 2017 12:20:27 +0200 Message-Id: <20170609102131.2836298-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:c6Y0LrTRXc/NWOFL3G7wvBmURtgmRbZSidWaZ/4BMq1x/rR33W9 a3DxHflw4OCtZo1zPOenp5AoL0f4I6lOSpGJNOamUXwP68dFVD7IfKSbrWJWruCz9wXyjXv T1tPm9KoGkLs88FWHCOU12MX7CsD6nALkJWQ5p+KOlph4c6zSa+eDgtAcQJtqLSvYdDieWS KHSm49UFpVadPGUS7YcqA== X-UI-Out-Filterresults: notjunk:1;V01:K0:ncE+n0RA9sg=:K6pCmk9RZTHHUwUwO8Mn3A Gt83xQPCixqfjqSaPpnATZgIfajceHrXy1jbdtGbtpkHlXwYnGFnLq2AmrbD2ISumEDbH8141 5QMbPScvhQcMvoZNfQRGIP0olAK2pboHBYOiogtWzPURU9H9FcANsZOkJYCzNoYjIzfj6tsCz fEBm7sXYB3uHhjbJKk8xenzPwTVYZOPiz8UyI/tFL0dCmvv8gp5ES2lcwCdCE0b0BeFIQbYAg oCNfQE2uWwv8KFy9MHUWJmFylXFHTJNlLlSkDepag5cPCKr60VwdHek5NVE4qva7zzEc3vFwK 4400JwJlP9dYHIDKFGMy+BjnMrFHc8o1ZreyAyYKcBFGC155h48yrZiqgzGeEJRzoIcbwCQNN fLo3pl1Kbv9G/I7gr3lvZglkIjOqd90VCzNwoPY1Gow865MYVO14NonAFo9hinfrWFR0fA6X9 jy89Fz5lQnUZedsMCukeIe4VQDRhTa6QPVCYg5PT5bsG67GVhlRFK9kmT8IedMUmKvsi9UzbF n0ofUHhRrEjNZPkLP/8cic8cD/kWGqTu5Bx33/NW8nOjNl/dS9bPuYPopDqM9N3W6qDjkzlIM a0xQlsfG1FXu52wuCnXLq2wN5UvgPqLgObSpYuWFn0KPJL7KVFnvrrbw3FJ3pn8vqgJiJ9VY9 Brd6bSNEr8XFpNE7B4HsBoqKoIZRWLAvowbZM7w9U+7GRzoUuuMGsENblOtyIu5hyjqY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A change to the platform data definitions caused a warning in the board code: arch/arm/mach-davinci/board-dm646x-evm.c:680:13: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] arch/arm/mach-davinci/board-dm646x-evm.c:690:13: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-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: 4a5f8ae50b66 ("[media] davinci: vpif_capture: get subdevs from DT when available") Signed-off-by: Arnd Bergmann --- arch/arm/mach-davinci/board-da850-evm.c | 4 ++-- arch/arm/mach-davinci/board-dm646x-evm.c | 4 ++-- arch/arm/mach-davinci/pdata-quirks.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index b5625d009288..e568c8c6f69c 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -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, diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index ca69d0b96a4f..1d76e7480a42 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -641,7 +641,7 @@ static struct vpif_subdev_info vpif_capture_sdev_info[] = { }, }; -static const struct vpif_input dm6467_ch0_inputs[] = { +static struct vpif_input dm6467_ch0_inputs[] = { { .input = { .index = 0, @@ -656,7 +656,7 @@ static const struct vpif_input dm6467_ch0_inputs[] = { }, }; -static const struct vpif_input dm6467_ch1_inputs[] = { +static struct vpif_input dm6467_ch1_inputs[] = { { .input = { .index = 0, diff --git a/arch/arm/mach-davinci/pdata-quirks.c b/arch/arm/mach-davinci/pdata-quirks.c index 329f5402ad1d..4858b1cdf31b 100644 --- a/arch/arm/mach-davinci/pdata-quirks.c +++ b/arch/arm/mach-davinci/pdata-quirks.c @@ -33,7 +33,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, @@ -48,7 +48,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, -- 2.9.0