| Message ID | 20170602231210.19553-2-khilman@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Kevin, On Saturday 03 June 2017 04:42 AM, Kevin Hilman wrote: > After VPIF was converted to enable getting subdevs from DT, the > pdata is no longer const, so remove these to avoid compiler warnings. > > Signed-off-by: Kevin Hilman <khilman@baylibre.com> I think this should be squashed into patch 2/4 of "davinci: vpif_capture: raw camera support" series where the warning is introduced. That does mix the platform and driver parts in one patch, but I think its better that way so that no patch introduces a warning. The patch does not clash with anything queued in davinci tree, so I think it should be fine. Also, there is a warning introduced in arch/arm/mach-davinci/board-dm646x-evm.c that should be fixed as well. Thanks, Sekhar
Sekhar Nori <nsekhar@ti.com> writes: > Hi Kevin, > > On Saturday 03 June 2017 04:42 AM, Kevin Hilman wrote: >> After VPIF was converted to enable getting subdevs from DT, the >> pdata is no longer const, so remove these to avoid compiler warnings. >> >> Signed-off-by: Kevin Hilman <khilman@baylibre.com> > > I think this should be squashed into patch 2/4 of "davinci: > vpif_capture: raw camera support" series where the warning is > introduced. That does mix the platform and driver parts in one patch, > but I think its better that way so that no patch introduces a warning. Well, media maintainers have already taken that patch, and probably won't want to take this as a separate patch now. So, IMO, as long as this goes in the same merge window, a couple warnings in -next while things are settling will be OK. > The patch does not clash with anything queued in davinci tree, so I > think it should be fine. > > Also, there is a warning introduced in > arch/arm/mach-davinci/board-dm646x-evm.c that should be fixed as well. I'll fix that and resend the series (this time with DT maintainers in copy for PATCH 2/2. Kevin
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,
After VPIF was converted to enable getting subdevs from DT, the pdata is no longer const, so remove these to avoid compiler warnings. Signed-off-by: Kevin Hilman <khilman@baylibre.com> --- arch/arm/mach-davinci/pdata-quirks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)