| Message ID | 20170209150240.1094801-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Thu, Feb 9, 2017 at 4:02 PM, Arnd Bergmann <arnd@arndb.de> wrote: > We have a conflict between the interface change in one patch, and the > newly added driver using the old interface: > > drivers/cpufreq/ti-cpufreq.c: In function 'ti_cpufreq_init': > drivers/cpufreq/ti-cpufreq.c:250:6: error: assignment makes integer from pointer without a cast [-Werror=int-conversion] > > This adapts the driver accordingly. > > Fixes: fa30184d192e ("PM / OPP: Return opp_table from dev_pm_opp_set_*() routines") > Fixes: 36cae4bca3bc ("cpufreq: ti: Add cpufreq driver to determine available OPPs at runtime") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/cpufreq/ti-cpufreq.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/cpufreq/ti-cpufreq.c b/drivers/cpufreq/ti-cpufreq.c > index a2a4e84c6166..d1ae3e608f59 100644 > --- a/drivers/cpufreq/ti-cpufreq.c > +++ b/drivers/cpufreq/ti-cpufreq.c > @@ -247,8 +247,8 @@ static int ti_cpufreq_init(void) > > of_node_put(opp_data->opp_node); > > - ret = dev_pm_opp_set_supported_hw(opp_data->cpu_dev, version, > - VERSION_COUNT); > + ret = PTR_ERR_OR_ZERO(dev_pm_opp_set_supported_hw(opp_data->cpu_dev, > + version, VERSION_COUNT)); > if (ret) { > dev_err(opp_data->cpu_dev, > "Failed to set supported hardware\n"); > -- Thanks for the fix, but I fixed this up manually in the original patch in the meantime. Thanks, Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/cpufreq/ti-cpufreq.c b/drivers/cpufreq/ti-cpufreq.c index a2a4e84c6166..d1ae3e608f59 100644 --- a/drivers/cpufreq/ti-cpufreq.c +++ b/drivers/cpufreq/ti-cpufreq.c @@ -247,8 +247,8 @@ static int ti_cpufreq_init(void) of_node_put(opp_data->opp_node); - ret = dev_pm_opp_set_supported_hw(opp_data->cpu_dev, version, - VERSION_COUNT); + ret = PTR_ERR_OR_ZERO(dev_pm_opp_set_supported_hw(opp_data->cpu_dev, + version, VERSION_COUNT)); if (ret) { dev_err(opp_data->cpu_dev, "Failed to set supported hardware\n");
We have a conflict between the interface change in one patch, and the newly added driver using the old interface: drivers/cpufreq/ti-cpufreq.c: In function 'ti_cpufreq_init': drivers/cpufreq/ti-cpufreq.c:250:6: error: assignment makes integer from pointer without a cast [-Werror=int-conversion] This adapts the driver accordingly. Fixes: fa30184d192e ("PM / OPP: Return opp_table from dev_pm_opp_set_*() routines") Fixes: 36cae4bca3bc ("cpufreq: ti: Add cpufreq driver to determine available OPPs at runtime") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/cpufreq/ti-cpufreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)