From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751444AbdG0KN5 (ORCPT ); Thu, 27 Jul 2017 06:13:57 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:60094 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750836AbdG0KN4 (ORCPT ); Thu, 27 Jul 2017 06:13:56 -0400 From: Arnd Bergmann To: Sekhar Nori , Kevin Hilman Cc: Arnd Bergmann , Bartosz Golaszewski , Axel Haslam , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND] ARM: davinci: don't mark vpif_input structures as 'const' Date: Thu, 27 Jul 2017 12:12:59 +0200 Message-Id: <20170727101320.609258-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:LmXbDr+SJx71YyVQ1n7Iy5B8NC/019FMUf8k4adY3fre4tOYxHB KWWgbNmcP6iMiAd93qC3eSkJHgg14XSDUxoBYyfwdM3qW/lzS7Agrz92Bw9973FCoU+n+YY nmJD3xqe1HfXiBKgrq9KbnEHmDW0qeRsfZ5PPIBUq243UjvXiszLIUZcVIlPyyAElKGKwzC uUgbfPZpyRvk5zexfT9IA== X-UI-Out-Filterresults: notjunk:1;V01:K0:jgfQFgq2+V0=:+tIv0a9lbmY+rhyrIQqYfa lw+QOb6pfVV6AHrYkhlTwCpBZYKLGxWHKKfcyBCL/oTQVLrGzx+J55/eBgxe471pNYYEr0EY3 iTivyoshCAxz7SVqsINHW8F2IQQjVsUDOH8u0Z2oXAZ6luK8sXQMoIinlqS+zs7d9d3n39HF/ hrFoZPN6GygEPkUvJkW7edK3FL4FN3vpXu1ZoYmz0ziIB/Ji9fVJFHL8T2N3GMAZZLp1O92Kl anNVxXR5XPyhyHiIMQBDUrZ5pkkukvE9vUAo6n3MF+y6tb6RkcA7hHWwuhkvtIuHyoOkxKapX QB+EiRFxjGQFQry44Aw+bF+SwbnpG0Zxby2GECLWHNy5CVN3t062w2D+Qe5q9ZLCskjFlU93W JL9EmPjbP358/lj10uzKIPhaP61/2nu9LhUjTnsaFvokEoQ54JFRbl8yDMisUHp82wYjbSbLs nTlNznvR3Z8fdQzpWr7Vw0IplCT/gL/YBQfKv0G36nhbIoVwiHv9uXuFAZk1S1Rhlp/JnPR3l T9IHAKG3jR5V92tpRfneN8g/2Lqvf2cqi0sBNbmQSh9Kg6crgVSKH4eQK8Knx7mHnhs43hxpk ZoYzSL4HUuYF2/+XiTIMA8iKC0o1N4T/6ihiLhvzRrYLJ1QClITZ38PTJZdpxP3qd2i9X5+6G WzKoBKBh83dEW4i3IrePxChTlGlCuuAEiAzXOjJ+Gj/H0DaOI+mZF4pFUU4i7zynd6bIlWfpx GoUChcCP0qgFuUG0Sb4tFf9hTvw8KgmyQeN2vg== 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") Fixes: 231ce279e6e3 ("ARM: davinci: fix const warnings") Signed-off-by: Arnd Bergmann --- I originally sent my fix on Jun 9, but Kevin had already applied an identical fix for two of the three affected files. This fixes the third one that his patch missed. I have a couple of other patches that I'm planning to apply directly to the fixes branch now, and would do the same for this one unless there are objections. --- arch/arm/mach-davinci/board-da850-evm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 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, -- 2.9.0