* [PATCH] cpufreq: ti: move to new dev_pm_opp_set_supported_hw() API
@ 2017-02-09 15:02 Arnd Bergmann
2017-02-09 22:00 ` Rafael J. Wysocki
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2017-02-09 15:02 UTC (permalink / raw)
To: Rafael J. Wysocki, Viresh Kumar
Cc: Arnd Bergmann, Dave Gerlach, linux-pm, linux-kernel
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");
--
2.9.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] cpufreq: ti: move to new dev_pm_opp_set_supported_hw() API
2017-02-09 15:02 [PATCH] cpufreq: ti: move to new dev_pm_opp_set_supported_hw() API Arnd Bergmann
@ 2017-02-09 22:00 ` Rafael J. Wysocki
0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2017-02-09 22:00 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Rafael J. Wysocki, Viresh Kumar, Dave Gerlach, Linux PM,
Linux Kernel Mailing List
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-09 22:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-09 15:02 [PATCH] cpufreq: ti: move to new dev_pm_opp_set_supported_hw() API Arnd Bergmann
2017-02-09 22:00 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).