From patchwork Mon Jan 2 09:10:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 89464 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp7497825qgi; Mon, 2 Jan 2017 01:11:53 -0800 (PST) X-Received: by 10.84.197.129 with SMTP id n1mr124589510pld.30.1483348313246; Mon, 02 Jan 2017 01:11:53 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a1si65036901pgc.283.2017.01.02.01.11.52; Mon, 02 Jan 2017 01:11:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932421AbdABJLf (ORCPT + 25 others); Mon, 2 Jan 2017 04:11:35 -0500 Received: from mail-pf0-f179.google.com ([209.85.192.179]:33477 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932379AbdABJLc (ORCPT ); Mon, 2 Jan 2017 04:11:32 -0500 Received: by mail-pf0-f179.google.com with SMTP id d2so72589993pfd.0 for ; Mon, 02 Jan 2017 01:11:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=K3jAcq2qMR3CX1dwbH/6/ax33yq8AXxXw0AotUEehbE=; b=SFyom7xX0+LncnF1rrnXXqxWDQV2rxIklxIgRGEDhWR+SIkWqleazp1y5iqaaHdWqA Dp7ZD+BW7mI5G03G15uMib6cH2pgKKJxx0nII4uGpaJXOYnxInCArgOa0uhuhiMgAeoj D5rnGMQcp/O+VykBxxA5XL4MGm0Lijmql3F1I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=K3jAcq2qMR3CX1dwbH/6/ax33yq8AXxXw0AotUEehbE=; b=FZbTSX4DCw/850Pfs532y/pAWJHjpU/DIEvjtB4DMYhodfq38/PNS6Te+aN1V+i4pI AM5uZnpux+/6X5IO6jA4fyC6o1wsJWNEr9VmJSYhF8KPjclPq1xju6x7+YD8plyb61JM o4yE3dX50BqD/9hGDDPUgNLwPSNrDDX5xbcXsPUdUjNMSC4zKtA2OIZvE3t35wUFKM/n AOcsMjEkEJgwpURdhtcSg45BRooACBW1NSQG/VlmTdnDhXOaz1XMMZ6ZNbJ7yty5tTCP xy1o3TY7aEz3nnhJoAGZI97pgAJSrjVlajECYWOYc5QlLWPZBFKFK/KGxC3wV4EXVRff 4XXQ== X-Gm-Message-State: AIkVDXImah43VDda0MYx9qFL5zap7SWmw9whTXdTnRIMy2h8E94+9vr2eUzlrh3g3KqlUyRY X-Received: by 10.84.164.162 with SMTP id w31mr124361521pla.9.1483348286849; Mon, 02 Jan 2017 01:11:26 -0800 (PST) Received: from localhost ([122.172.43.83]) by smtp.gmail.com with ESMTPSA id l11sm130322471pfb.28.2017.01.02.01.11.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jan 2017 01:11:26 -0800 (PST) From: Viresh Kumar To: Rafael Wysocki , Viresh Kumar , Nishanth Menon , Stephen Boyd Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Vincent Guittot , Viresh Kumar Subject: [PATCH V3 04/10] PM / OPP: Error out on failing to add static OPPs for v1 bindings Date: Mon, 2 Jan 2017 14:40:58 +0530 Message-Id: X-Mailer: git-send-email 2.7.1.410.g6faf27b In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The code adding static OPPs for V2 bindings already does so. Make the V1 bindings specific code behave the same. Signed-off-by: Viresh Kumar Reviewed-by: Stephen Boyd --- drivers/base/power/opp/of.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- 2.7.1.410.g6faf27b diff --git a/drivers/base/power/opp/of.c b/drivers/base/power/opp/of.c index f8512ca2bf41..c8fe815774ff 100644 --- a/drivers/base/power/opp/of.c +++ b/drivers/base/power/opp/of.c @@ -433,7 +433,7 @@ static int _of_add_opp_table_v1(struct device *dev) { const struct property *prop; const __be32 *val; - int nr; + int nr, ret; prop = of_find_property(dev->of_node, "operating-points", NULL); if (!prop) @@ -456,9 +456,13 @@ static int _of_add_opp_table_v1(struct device *dev) unsigned long freq = be32_to_cpup(val++) * 1000; unsigned long volt = be32_to_cpup(val++); - if (_opp_add_v1(dev, freq, volt, false)) - dev_warn(dev, "%s: Failed to add OPP %ld\n", - __func__, freq); + ret = _opp_add_v1(dev, freq, volt, false); + if (ret) { + dev_err(dev, "%s: Failed to add OPP %ld (%d)\n", + __func__, freq, ret); + dev_pm_opp_of_remove_table(dev); + return ret; + } nr -= 2; }