From patchwork Fri May 18 10:31:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 136280 Delivered-To: patches@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1056549lji; Fri, 18 May 2018 03:31:50 -0700 (PDT) X-Received: by 2002:a19:27c2:: with SMTP id n185-v6mr20059999lfn.25.1526639510051; Fri, 18 May 2018 03:31:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526639510; cv=none; d=google.com; s=arc-20160816; b=gn2z2Dfyuio3aj9A7+4XGuUbKAgyI3aXLZ6/zj0A7LUEkEddz+ju1WLE4LzcHxEPPE XBkDNlPEZwtQVq+n2+g7mAbEjce4bwNRcyq0nKs0Yhvm2rsbVVj6Q5MXKrnE88ZK8gD/ DoUZAGnLISaEUHFB25U5hpdVU0CEkYjagdsdTMUTnO7nPeTqTKUCreRo9iZIkMliG/0p /iDLbKtcyeneUJvDuLalCzT1o3ZWMiZokgX40qgiL1I/9EtXpIuTlmNux6izZd44q5iR HIKgmicXDl5CyKFLtw6HUQMw5w/ydq1Ih2/zE1OYYhpCwVYh1aoYBfgkZ/2q5E2v8Zdv 2eyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=tR0PqVnyqpAIqwNNOSqwkpFdimOYd4PJO2b808P7gkQ=; b=sWJF0iDEdaedT2BctLfgevS7oeE5As+iJUzKgseUDU+g04UwejwuJEBvGyEflAFSXF lp0mxEmM+TwEMreoFJnYZ7C1v0ZGq6coQbyyLuVVfgPUrn5mQfu7ORZ6Or9P6+nTTZr5 snj5og2AqGkiD2RM9r74F7JRbW0tdNfeQpYp42zP5PnbjPXe5fPhIJgQAi385+13CUTL /hXLUPEXgIVfw0rqmejsB1dd72g30YG6bw6I5yw/WOSeItF2pA5Tr956YFluVbGCr3b+ A7lUTY8ntthPtt1Jx94fFbn78fcOVal1HgtVWmaxH+0VQSUGrSWka7jgTcJWbl8JmcBh MX9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LCBFqQ9u; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id k3-v6sor1660459ljg.14.2018.05.18.03.31.50 for (Google Transport Security); Fri, 18 May 2018 03:31:50 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LCBFqQ9u; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=tR0PqVnyqpAIqwNNOSqwkpFdimOYd4PJO2b808P7gkQ=; b=LCBFqQ9uL7zZ7tojJ9j4HjEgPfSroxwirJNmmwZ/8UXKLxJvGImZuUZe3VZdYwaizx Zp+V+zgQR66pIvvKmXtUriWDzs1UC5/QjaVJjpeFWYt3UNd+HneZ7N01piHHflW4q76y cXjctC1TLCyKFXbraEN902WQHHbM2AFJ/DibU= 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; bh=tR0PqVnyqpAIqwNNOSqwkpFdimOYd4PJO2b808P7gkQ=; b=L32+yIQ+YYlgb1oSvLKzKPlGDmwBtu8QNmq8QUHDUNnFgNVVDz8CDdH2Hx4v2uYPMA /s4bRCYHjnGMs9v2SA1o8OMs0cg9UQy0nyJUFMfxLUhcm0M/PIypCiRwcO8+cvJsVQKd NPUl+dRfaQFmmQBrUeAzZyf9JsZaAE99UWxdDMvr9Sx4jY+Dc0ZRhOHJbRlik2v6aJ04 nlHmRIGaQk6mDNf7j3rvsZVioBB1FaYgxThimpOT6RpD5SGkpCA3r7fmHxcQ+P8PyGyj onS1hd9BthVjVyqZ+W/PV+zYk4TjeEXvfWQz87e+M5OGK7uRQk9t168DpxiEDJv8yMfR h9fQ== X-Gm-Message-State: ALKqPwfZ8ulzA108oLKT/ZT6Ycj5h/4vzEtXPQ4fnaPG/xrD2lb48f7x Vb/6CTqHY93Nr+XPbjm2e22jbYUW X-Google-Smtp-Source: AB8JxZrBvFRNg3Bh/JNsQLtIhPmiYn7cpO3FRnyTqs5tj2c5eZHv2zm6Qe64JwBRGHy380U6qOwofw== X-Received: by 2002:a2e:97d6:: with SMTP id m22-v6mr5601140ljj.102.1526639509845; Fri, 18 May 2018 03:31:49 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id u14-v6sm393447lfk.55.2018.05.18.03.31.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 May 2018 03:31:49 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , linux-pm@vger.kernel.org Cc: Ulf Hansson , Greg Kroah-Hartman , Jon Hunter , Geert Uytterhoeven , Todor Tomov , Rajendra Nayak , Viresh Kumar , Vincent Guittot , Kevin Hilman , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org Subject: [PATCH 2/9] PM / Domains: Drop __pm_genpd_add_device() Date: Fri, 18 May 2018 12:31:23 +0200 Message-Id: <1526639490-12167-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526639490-12167-1-git-send-email-ulf.hansson@linaro.org> References: <1526639490-12167-1-git-send-email-ulf.hansson@linaro.org> There are still a few non-DT existing users of genpd, however neither of them uses __pm_genpd_add_device(), hence let's drop it. Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 10 ++++------ include/linux/pm_domain.h | 14 +++----------- 2 files changed, 7 insertions(+), 17 deletions(-) -- 2.7.4 diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index da6c886..d58aee3 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1414,23 +1414,21 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, } /** - * __pm_genpd_add_device - Add a device to an I/O PM domain. + * pm_genpd_add_device - Add a device to an I/O PM domain. * @genpd: PM domain to add the device to. * @dev: Device to be added. - * @td: Set of PM QoS timing parameters to attach to the device. */ -int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, - struct gpd_timing_data *td) +int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev) { int ret; mutex_lock(&gpd_list_lock); - ret = genpd_add_device(genpd, dev, td); + ret = genpd_add_device(genpd, dev, NULL); mutex_unlock(&gpd_list_lock); return ret; } -EXPORT_SYMBOL_GPL(__pm_genpd_add_device); +EXPORT_SYMBOL_GPL(pm_genpd_add_device); static int genpd_remove_device(struct generic_pm_domain *genpd, struct device *dev) diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index c847e9a..79888fb 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -143,8 +143,7 @@ static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev) return to_gpd_data(dev->power.subsys_data->domain_data); } -int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, - struct gpd_timing_data *td); +int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev); int pm_genpd_remove_device(struct generic_pm_domain *genpd, struct device *dev); int pm_genpd_add_subdomain(struct generic_pm_domain *genpd, struct generic_pm_domain *new_subdomain); @@ -163,9 +162,8 @@ static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev) { return ERR_PTR(-ENOSYS); } -static inline int __pm_genpd_add_device(struct generic_pm_domain *genpd, - struct device *dev, - struct gpd_timing_data *td) +static inline int pm_genpd_add_device(struct generic_pm_domain *genpd, + struct device *dev) { return -ENOSYS; } @@ -204,12 +202,6 @@ static inline int dev_pm_genpd_set_performance_state(struct device *dev, #define pm_domain_always_on_gov (*(struct dev_power_governor *)(NULL)) #endif -static inline int pm_genpd_add_device(struct generic_pm_domain *genpd, - struct device *dev) -{ - return __pm_genpd_add_device(genpd, dev, NULL); -} - #ifdef CONFIG_PM_GENERIC_DOMAINS_SLEEP void pm_genpd_syscore_poweroff(struct device *dev); void pm_genpd_syscore_poweron(struct device *dev);