On Monday, January 25, 2016 10:05:23 PM Viresh Kumar wrote: > On 25-01-16, 16:44, Arnd Bergmann wrote: > > There are two definitions of pxa_cpufreq_change_voltage, with slightly > > different prototypes after one of them had its argument marked 'const'. > > Now the other one (for !CONFIG_REGULATOR) produces a harmless warning: > > > > drivers/cpufreq/pxa2xx-cpufreq.c: In function 'pxa_set_target': > > drivers/cpufreq/pxa2xx-cpufreq.c:291:36: warning: passing argument 1 of > > 'pxa_cpufreq_change_voltage' discards 'const' qualifier from pointer target > > type [-Wdiscarded-qualifiers] > > ret = pxa_cpufreq_change_voltage(&pxa_freq_settings[idx]); > > ^ > > drivers/cpufreq/pxa2xx-cpufreq.c:205:12: note: expected 'struct pxa_freqs > > *' but argument is of type 'const struct pxa_freqs *' > > static int pxa_cpufreq_change_voltage(struct pxa_freqs *pxa_freq) > > ^ > > > > This changes the prototype in the same way as the other, which > > avoids the warning. > > > > Signed-off-by: Arnd Bergmann <[email protected]> > > Fixes: 03c229906311 ("cpufreq: pxa: make pxa_freqs arrays const") > > --- > > drivers/cpufreq/pxa2xx-cpufreq.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/cpufreq/pxa2xx-cpufreq.c > > b/drivers/cpufreq/pxa2xx-cpufreq.c > > index efe3b215fd34..46fee1539cc8 100644 > > --- a/drivers/cpufreq/pxa2xx-cpufreq.c > > +++ b/drivers/cpufreq/pxa2xx-cpufreq.c > > @@ -202,7 +202,7 @@ static void __init pxa_cpufreq_init_voltages(void) > > } > > } > > #else > > -static int pxa_cpufreq_change_voltage(struct pxa_freqs *pxa_freq) > > +static int pxa_cpufreq_change_voltage(const struct pxa_freqs *pxa_freq) > > { > > return 0; > > } > > Acked-by: Viresh Kumar <[email protected]>
Applied, thanks! Rafael
