Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755305AbcJTHLs (ORCPT ); Thu, 20 Oct 2016 03:11:48 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:48029 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751792AbcJTHLr (ORCPT ); Thu, 20 Oct 2016 03:11:47 -0400 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com u9K7B8Bs012432 X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-pm@vger.kernel.org Cc: Masahiro Yamada , Stephen Boyd , linux-kernel@vger.kernel.org, Nishanth Menon , Len Brown , Greg Kroah-Hartman , "Rafael J. Wysocki" , Pavel Machek , Viresh Kumar Subject: [PATCH v3] PM / OPP: fix debug/error messages in dev_pm_opp_of_get_sharing_cpus() Date: Thu, 20 Oct 2016 16:12:49 +0900 Message-Id: <1476947569-23552-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1429 Lines: 46 These log messages are wrong because _of_get_opp_desc_node() returns an operating-points-v2 node. Commit a6eed752f5fb ("PM / OPP: passing NULL to PTR_ERR()") fixed static checker warnings, and reworded the messages at the same time (but the latter was not mentioned in the git-log). Restore the correct messages. Signed-off-by: Masahiro Yamada --- Changes in v3: - Revive __func__ Changes in v2: - Reword git-log slightly comments -> log messages drivers/base/power/opp/of.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/base/power/opp/of.c b/drivers/base/power/opp/of.c index 6480137..5b3755e 100644 --- a/drivers/base/power/opp/of.c +++ b/drivers/base/power/opp/of.c @@ -562,7 +562,7 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, /* Get OPP descriptor node */ np = _of_get_opp_desc_node(cpu_dev); if (!np) { - dev_dbg(cpu_dev, "%s: Couldn't find cpu_dev node.\n", __func__); + dev_dbg(cpu_dev, "%s: Couldn't find opp node.\n", __func__); return -ENOENT; } @@ -587,7 +587,7 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, /* Get OPP descriptor node */ tmp_np = _of_get_opp_desc_node(tcpu_dev); if (!tmp_np) { - dev_err(tcpu_dev, "%s: Couldn't find tcpu_dev node.\n", + dev_err(tcpu_dev, "%s: Couldn't find opp node.\n", __func__); ret = -ENOENT; goto put_cpu_node; -- 1.9.1