From patchwork Tue May 29 10:04:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 137136 Delivered-To: patches@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3845370lji; Tue, 29 May 2018 03:04:31 -0700 (PDT) X-Received: by 2002:a2e:3a0f:: with SMTP id h15-v6mr10712299lja.63.1527588271109; Tue, 29 May 2018 03:04:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527588271; cv=none; d=google.com; s=arc-20160816; b=b6YPwp86Gvx2M+ciVdbfR6RB3jibgR7tPBEasG107VNXlqTwNYAqddQgxZnpzaSjwk Tydv8cnPzXyxw822OAwpUrsr+isV47ETSTTmddnmMgOcqa3VPL7GLYAkT4aKeyv64ezH peQFaL+IfgZ5TYJG+8q+eutdhwUSZ0AH/zfp0gNoB0f1xZZYdNEstV1TapyaL0AcTjUQ QxU/VR0SacholHXt8SdwXD0xwMSG551ocDNeW58r4og24+7SfdHI2sKJBU0QrvmL2258 UEyGbQy+whwQ9H7pZAT7YEmYvWibbdMhgADgqnflh8moqLdwyu01yngvbuI9u/hSx6x/ cjLg== 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=6L5ns3gkirNpoUrGXpNhs9C4kPH2lTxjmYVBDc+TIqo=; b=cQDeHVJ4L5Ld5tef2qziY2c8NGKuDK1rRfzF43O2MzeYL+1haAhTixzzPI6P5Yo3Ng L5M/dKFHnWrAmxX5baTqtySNxBwklTbPvKj3whmBY540U/3dysPOJ9Znbo0gdM52bEPH OuX0xS2jxkSBzsnED1Ka99+oSOuq2Hxv0/ZRJfQlprv1z1fFXzKCneFHhKilDbZOJJrz wEMv9Ps1XEthfIkgnMqgBq7OVkFWf3PXFgbQHHWYLApllvAHgGPzDzHTi4iUAj70gzUS Z8lEDIt3ypcS9rfPTrCkXuWs93zW5hTG1EO63lNfUuVFRa9ik5+siUMAva20G+g5S8lK gudQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ODvLSU72; 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 l18-v6sor7314015ljb.52.2018.05.29.03.04.30 for (Google Transport Security); Tue, 29 May 2018 03:04:31 -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=ODvLSU72; 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=6L5ns3gkirNpoUrGXpNhs9C4kPH2lTxjmYVBDc+TIqo=; b=ODvLSU72CdL3WZ0kO0L8V64poZhA5AicJ3BdDrzysJjL3QfT9Qj3HnqOFaty00Wkdh m37WHsR1z54eq0biQOOGLBrYExpz/gTus7m2nu9SIa+63im685PesrPd3IU2ID+CN1a5 f5PQi6GxXjvECLgl6iuTQ6Z1Rm576hF8Kvy68= 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=6L5ns3gkirNpoUrGXpNhs9C4kPH2lTxjmYVBDc+TIqo=; b=E5EKFUgaMzm66UnhBFqULqZuutZwXH+g/uiCrW/vPQfkEfCgKCcWrl2z5t6qaM4v0q pEn00yn8ATJtjjN5Wc8r0iGVwUO8XibgjSLtsga2O+5TpFFguvW6s5/HCPmMlthShjzn Cn2s8hjeumhCu4xmexWBuZ0JpiwM+3oU39xdDyvHIE4l08SKXwhOn2h7lZczqJraqzIa 7yXs0l1X7926rgORzwF+WFS9lG0zoP5IXTn0D2dzgKVz7Meipf3YDDQR7w7YbQI2/OiJ C8NdeCXhTVQeD3iWQfDsc0l7rS6QcPWxXs8MK20jpF1YhgCqMPmzARUyczBiv0LfdviX +Cog== X-Gm-Message-State: ALKqPwdRfYpgsMNUYZAHgs4fHv0DpZrdombvEgV55JM3//MDFBUB5XlT 43+Ul/w2AQUj3ye15P1ghnIna/dG X-Google-Smtp-Source: ADUXVKIRVLeNWQZBxxKOeRoSzbRsA0FXgMtzgFP18JhT/CZbrmv4FIzVa9hxX5iaFYTeDcJ0POaxwg== X-Received: by 2002:a2e:90d4:: with SMTP id o20-v6mr8837526ljg.15.1527588270783; Tue, 29 May 2018 03:04:30 -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 e21-v6sm2561718lfg.74.2018.05.29.03.04.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 May 2018 03:04:30 -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 v2 2/9] PM / Domains: Drop __pm_genpd_add_device() Date: Tue, 29 May 2018 12:04:14 +0200 Message-Id: <20180529100421.31022-3-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180529100421.31022-1-ulf.hansson@linaro.org> References: <20180529100421.31022-1-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.17.0 Reviewed-by: Viresh Kumar diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 71a1cc79fbaa..469edb401811 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 c847e9a3033d..79888fb4a81f 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);