From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753484AbdBIP4w (ORCPT ); Thu, 9 Feb 2017 10:56:52 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:63475 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751775AbdBIP4u (ORCPT ); Thu, 9 Feb 2017 10:56:50 -0500 From: Arnd Bergmann To: "Rafael J. Wysocki" , Viresh Kumar Cc: Arnd Bergmann , Dave Gerlach , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] cpufreq: ti: move to new dev_pm_opp_set_supported_hw() API Date: Thu, 9 Feb 2017 16:02:29 +0100 Message-Id: <20170209150240.1094801-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:W/olPQPgWl8ChysMTVi58SpmPIUHnd0EB6hNH+mqD8aC0KWCqCH KglD+jRZe2jo4PMESXVqEvWqWLwmPHLtmfK+1Jt3Svg+z1/gpk2tdTwV3QX4i+x+2Xq2AsW TmBbNCAnkPf1/Ji3RoJxOy1HeXbWzuqCo3Q6TgjHp56BWvpUwUrAi5ErYmCwZHiNVku3sex 9w60vSBEQNSVOYXKIEWvw== X-UI-Out-Filterresults: notjunk:1;V01:K0:4ZDSyDj/PwM=:6aQ3vhsyvh5X+RS1KGg4US 7XfDRM9TOR4bMW5e/iFShPSYHBpqSwDQ6gqaeZ7RYf5E/hM/Vphjrm/JVqr6g4/BKtm88YBqR iMdl2ZG4A74a9yNWSAW/zV7BWYkorR7Bf3651pEUrLLLw57rKEYkZWmfdgx3riLO7JUEWZsgr PUs2hrAnjdkkmPkYB5PK7aXOE1IKx/CGEaWPKDUa0qcbRuKd3yIAJTtpKQo6DHZm8PnXfkqt7 t/OBsAa6bAov4w8tyzWnYI7EZkZj/bP0lI6lTOi+JXRtdEfyqLTclemr6QFcgqoMW8cHWNgly iGVfsltRryv+OLmoqG+qyBDXVrizlNpqFvodcaD9NlL5NGpemayG8F/fBiEcZ1rEL1eLOxa95 hYPUooOCOaGUlwcavy5IRDpviZ4POs8VSjbaP20B/vPQGgW1cWBTppy92UUBoNIcRQZ6lCc94 Ho/ptymTktoTviWDmg/Wiiwl3IeuOeDEgeB9JtWFE1iekqJaD7QSTPI2nWg6ybBfCd3Ht+Tmc UUK/rjtuFNrej03U/0vd3oA0DaAMylDfSeCi4wqAgQaegELxPKnoGSWE1P9ykQb/dljBGdKVw O9aONRQsJ/KpULMw9b9HvV1ZDgYVBR/KxmsSAm0u2XyElUInhSGjPRECyvdLsq996I0B2lDWF cd4KHz1kIdQSMmLYmfcOMP28qYpuZOj1eP2ZDoRcl9tEffAPPv3V+qwdT4k2IOgyJCMU= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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