From patchwork Wed Sep 21 13:38:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 9343619 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 5FAD360B16 for ; Wed, 21 Sep 2016 13:39:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 536362A654 for ; Wed, 21 Sep 2016 13:39:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 47C2D2A65B; Wed, 21 Sep 2016 13:39:16 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 07F3A2A661 for ; Wed, 21 Sep 2016 13:39:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934110AbcIUNjG (ORCPT ); Wed, 21 Sep 2016 09:39:06 -0400 Received: from mail-lf0-f50.google.com ([209.85.215.50]:36202 "EHLO mail-lf0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934107AbcIUNjC (ORCPT ); Wed, 21 Sep 2016 09:39:02 -0400 Received: by mail-lf0-f50.google.com with SMTP id g62so41153855lfe.3 for ; Wed, 21 Sep 2016 06:39:01 -0700 (PDT) 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; bh=+kiq0v1miAK1B2zrsPbEPk/bdrb7XYMCMuX4FPPSWo8=; b=FXcbH+SmJacniuSPPK5FXY145yRcfz/nIjNk0BOwPcjEZDGNYtGEO8mKDASS4f6OIs UXNPFbruAqSE7ofm/uaefLPA+V1vNg6Zw3to9fYIfs/MXox9YxKOAdcDrFiBLPDSXNeM NsXcfWnaCG/6EcGjpZP9HVAxEsQj9Uq+Ya4eE= 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; bh=+kiq0v1miAK1B2zrsPbEPk/bdrb7XYMCMuX4FPPSWo8=; b=L2Q0+GWQgocOQVxhMVq3vwQ2mL92J02fCJfrtYy9tQ3B+sY8ZhOkb6ZOsyO/quyHGC 6r6rirfYxx4qhJfhOLi16wvwUmrg5fZUrS5xcI22qzeByRwVElRJ51e9IrtC/pDx6W7e WeKUdi9p530f12Wkgo+ZA/sZptBD3gUjZH34INrw5mYh2cTufgqXgMcvsK2zStaEmBan zIXRLcdw9EgXzuUqfVnBzANKtdwU4oGkZmQIqayp61VHf79fcBfrWT72a4U1xqWe0rTn 4QrmqK2lmdAcLD2vAWqRfTIkGQ8aFJtFhK24kNxhcNJMDkz+lOe+8a8U5Om45JkFuOt0 S6pA== X-Gm-Message-State: AE9vXwPMhOEVQGfDByUWIAtvHzPIyz27WEI8bOuAFbjYah2AuLUIF4auzc1HXB2IIQHhg+uT X-Received: by 10.46.69.69 with SMTP id s66mr6924561lja.26.1474465140765; Wed, 21 Sep 2016 06:39:00 -0700 (PDT) Received: from uffe-Latitude-E6430s.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id s125sm6710569lja.14.2016.09.21.06.38.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Sep 2016 06:38:59 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Kevin Hilman , Ulf Hansson , linux-pm@vger.kernel.org Cc: Len Brown , Pavel Machek , Geert Uytterhoeven , Lina Iyer , Jon Hunter Subject: [PATCH 1/4] PM / Domains: Simplify detaching a device from its genpd Date: Wed, 21 Sep 2016 15:38:50 +0200 Message-Id: <1474465133-14865-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1474465133-14865-1-git-send-email-ulf.hansson@linaro.org> References: <1474465133-14865-1-git-send-email-ulf.hansson@linaro.org> 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 There's no need to validate the PM domain by using genpd_lookup_dev() when removing the device via genpd's genpd_dev_pm_detach() function. That's because this function can't be called, unless there is a valid PM domain for the device. To simplify the behaviour, let's move code from pm_genpd_remove_device() into a new internal function, genpd_remove_device(), which is called from pm_genpd_remove_device() and genpd_dev_pm_detach(). Signed-off-by: Ulf Hansson Reviewed-by: Lina Iyer --- drivers/base/power/domain.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 83ae3d7..63f0f8b 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1121,13 +1121,8 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, } EXPORT_SYMBOL_GPL(__pm_genpd_add_device); -/** - * pm_genpd_remove_device - Remove a device from an I/O PM domain. - * @genpd: PM domain to remove the device from. - * @dev: Device to be removed. - */ -int pm_genpd_remove_device(struct generic_pm_domain *genpd, - struct device *dev) +static int genpd_remove_device(struct generic_pm_domain *genpd, + struct device *dev) { struct generic_pm_domain_data *gpd_data; struct pm_domain_data *pdd; @@ -1135,10 +1130,6 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd, dev_dbg(dev, "%s()\n", __func__); - if (!genpd || genpd != genpd_lookup_dev(dev)) - return -EINVAL; - - /* The above validation also means we have existing domain_data. */ pdd = dev->power.subsys_data->domain_data; gpd_data = to_gpd_data(pdd); dev_pm_qos_remove_notifier(dev, &gpd_data->nb); @@ -1170,6 +1161,20 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd, return ret; } + +/** + * pm_genpd_remove_device - Remove a device from an I/O PM domain. + * @genpd: PM domain to remove the device from. + * @dev: Device to be removed. + */ +int pm_genpd_remove_device(struct generic_pm_domain *genpd, + struct device *dev) +{ + if (!genpd || genpd != genpd_lookup_dev(dev)) + return -EINVAL; + + return genpd_remove_device(genpd, dev); +} EXPORT_SYMBOL_GPL(pm_genpd_remove_device); static int genpd_add_subdomain(struct generic_pm_domain *genpd, @@ -1797,14 +1802,14 @@ static void genpd_dev_pm_detach(struct device *dev, bool power_off) unsigned int i; int ret = 0; - pd = genpd_lookup_dev(dev); - if (!pd) + pd = dev_to_genpd(dev); + if (IS_ERR(pd)) return; dev_dbg(dev, "removing from PM domain %s\n", pd->name); for (i = 1; i < GENPD_RETRY_MAX_MS; i <<= 1) { - ret = pm_genpd_remove_device(pd, dev); + ret = genpd_remove_device(pd, dev); if (ret != -EAGAIN) break;