From patchwork Wed Dec 7 10:37:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 87024 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp247650qgi; Wed, 7 Dec 2016 02:50:25 -0800 (PST) X-Received: by 10.84.210.167 with SMTP id a36mr147487931pli.125.1481107825142; Wed, 07 Dec 2016 02:50:25 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v26si23540398pge.21.2016.12.07.02.50.24; Wed, 07 Dec 2016 02:50:25 -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 S932429AbcLGKuW (ORCPT + 25 others); Wed, 7 Dec 2016 05:50:22 -0500 Received: from mail-pg0-f49.google.com ([74.125.83.49]:33498 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932313AbcLGKuU (ORCPT ); Wed, 7 Dec 2016 05:50:20 -0500 Received: by mail-pg0-f49.google.com with SMTP id 3so160922896pgd.0 for ; Wed, 07 Dec 2016 02:50:20 -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=YAjFhng+GtWYjq280Bpxmg9vUPsy2AnRPya1lO3R5Kk=; b=RebNR2a/NojinzselGhbIKkb71TP60nzj0S7l02QrWK096Ea7Ob9W2MqGBiSyX6sdy 0mgaf9vIg7s17D1+3+huI5Y0/bDY/C2Of2Mr3humGpp3LWT0pDkJPtbnpz+nwZhlEQ3e q2p8NYOARaa8PpgV4V09BZWAIAbSiRf5kUHcA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=YAjFhng+GtWYjq280Bpxmg9vUPsy2AnRPya1lO3R5Kk=; b=R1gnqP7OwmEbs2n+q4aiVBdkoYzupg8Je/gVYCsUN/GXNnwkzoxmTX9+UJYNrJNfR+ LQABQHeA7cpFHXS4BfF8eSTu6DIbZ3sOi5lT6v0T9GxqP0+5XfsplrsWoQ+OPIybkllH iVLK4RIjOzgKVoff+ay9a5z4zCBowzwUd89XfOctkUjLq8B4zrLLuQPsCBT88NMh/R0R oG13T7pqoV+RS84HcRK84VmkYNx3hvGKlMrM+FtezPbkA/1Kibt3mf3N72ebBjKyTjxx 8qT2v0TXB1CSNcrQn1XuaOd8vSz3OQKY3+T1NjwT/8GK/Jf51v7V+66j6ZhNsJu6xYxO tCBg== X-Gm-Message-State: AKaTC00NvbXcIVdUrgkvHbvLqF8HLFtOWdGL2DFomlpkJQoHLGovv9eeudvxF24Kzibiut5x X-Received: by 10.98.32.151 with SMTP id m23mr69224681pfj.127.1481107283726; Wed, 07 Dec 2016 02:41:23 -0800 (PST) Received: from localhost ([122.172.43.83]) by smtp.gmail.com with ESMTPSA id c128sm41518857pfc.39.2016.12.07.02.41.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Dec 2016 02:41:23 -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 04/12] PM / OPP: Take reference of the OPP table while adding/removing OPPs Date: Wed, 7 Dec 2016 16:07:42 +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 Take reference of the OPP table while adding and removing OPPs, that helps us remove special checks in _remove_opp_table(). Signed-off-by: Viresh Kumar --- drivers/base/power/opp/core.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.7.1.410.g6faf27b diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c index 472f93755945..aacca85ebd20 100644 --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c @@ -971,9 +971,6 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_put_opp_table); */ static void _remove_opp_table(struct opp_table *opp_table) { - if (!list_empty(&opp_table->opp_list)) - return; - dev_pm_opp_put_opp_table_unlocked(opp_table); } @@ -1018,8 +1015,7 @@ static void _opp_remove(struct opp_table *opp_table, struct dev_pm_opp *opp) call_srcu(&opp_table->srcu_head.srcu, &opp->rcu_head, _kfree_opp_rcu); mutex_unlock(&opp_table->lock); - - _remove_opp_table(opp_table); + dev_pm_opp_put_opp_table(opp_table); } /** @@ -1171,6 +1167,9 @@ int _opp_add(struct device *dev, struct dev_pm_opp *new_opp, new_opp->opp_table = opp_table; + /* Get a reference to the OPP table */ + _get_opp_table_kref(opp_table); + ret = opp_debug_create_one(new_opp, opp_table); if (ret) dev_err(dev, "%s: Failed to register opp to debugfs (%d)\n",