From patchwork Thu Oct 20 07:12:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 9386039 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DF42B60487 for ; Thu, 20 Oct 2016 07:11:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C31B829AF1 for ; Thu, 20 Oct 2016 07:11:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B4D5329B23; Thu, 20 Oct 2016 07:11:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D59729B17 for ; Thu, 20 Oct 2016 07:11:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752796AbcJTHLr (ORCPT ); Thu, 20 Oct 2016 03:11:47 -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 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id u9K7B8Bs012432; Thu, 20 Oct 2016 16:11:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com u9K7B8Bs012432 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1476947469; bh=4kw/nSYQQsgF+/U/edmSr5Oxh7PHG63C5KUccfmPAVg=; h=From:To:Cc:Subject:Date:From; b=lKH0UoUBvvg8fd9jr4M63rAGriNFreXD9jkm5jrdEtTEnIGJcW4jt5bZlUKWvjToE UTsXp4b08rYgUacBrXpRhg+mmriwaUreeboW6fReBPOX0zOomcJOKtUKPP2esVGr3J 4VIK6B2LAScjBF6xzL955iv7E69TujgoWG72c8j4hz+1pvVKwPSDIZL2o42pszAZtF +wHXVCG2SmuyaKvHmijicSeAdpRr3TjunEyVr/Fwp/sA/6NxcxhYCr/klVfkTiFNS4 Va2n4rff9weHV/IQGsQs4ybqkbHOo3E09X3SpsBvupke81nYa1M89cpnZ1pRgHYyg0 zl/4GqurAmP9Q== 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-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Viresh Kumar Reviewed-by: Stephen Boyd --- 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;