From: ulf.hansson@linaro.org (Ulf Hansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/15] PM / Domains: Remove system PM callbacks from gpd_dev_ops
Date: Wed, 3 Sep 2014 12:52:19 +0200 [thread overview]
Message-ID: <1409741551-16437-4-git-send-email-ulf.hansson@linaro.org> (raw)
In-Reply-To: <1409741551-16437-1-git-send-email-ulf.hansson@linaro.org>
There no users of these callbacks, let's simplify the generic power
domain by removing them.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
drivers/base/power/domain.c | 64 ++++++---------------------------------------
include/linux/pm_domain.h | 8 ------
2 files changed, 8 insertions(+), 64 deletions(-)
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index aa5b14c..e777609 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -770,46 +770,6 @@ static bool genpd_dev_active_wakeup(struct generic_pm_domain *genpd,
return GENPD_DEV_CALLBACK(genpd, bool, active_wakeup, dev);
}
-static int genpd_suspend_dev(struct generic_pm_domain *genpd, struct device *dev)
-{
- return GENPD_DEV_CALLBACK(genpd, int, suspend, dev);
-}
-
-static int genpd_suspend_late(struct generic_pm_domain *genpd, struct device *dev)
-{
- return GENPD_DEV_CALLBACK(genpd, int, suspend_late, dev);
-}
-
-static int genpd_resume_early(struct generic_pm_domain *genpd, struct device *dev)
-{
- return GENPD_DEV_CALLBACK(genpd, int, resume_early, dev);
-}
-
-static int genpd_resume_dev(struct generic_pm_domain *genpd, struct device *dev)
-{
- return GENPD_DEV_CALLBACK(genpd, int, resume, dev);
-}
-
-static int genpd_freeze_dev(struct generic_pm_domain *genpd, struct device *dev)
-{
- return GENPD_DEV_CALLBACK(genpd, int, freeze, dev);
-}
-
-static int genpd_freeze_late(struct generic_pm_domain *genpd, struct device *dev)
-{
- return GENPD_DEV_CALLBACK(genpd, int, freeze_late, dev);
-}
-
-static int genpd_thaw_early(struct generic_pm_domain *genpd, struct device *dev)
-{
- return GENPD_DEV_CALLBACK(genpd, int, thaw_early, dev);
-}
-
-static int genpd_thaw_dev(struct generic_pm_domain *genpd, struct device *dev)
-{
- return GENPD_DEV_CALLBACK(genpd, int, thaw, dev);
-}
-
/**
* pm_genpd_sync_poweroff - Synchronously power off a PM domain and its masters.
* @genpd: PM domain to power off, if possible.
@@ -991,7 +951,7 @@ static int pm_genpd_suspend(struct device *dev)
if (IS_ERR(genpd))
return -EINVAL;
- return genpd->suspend_power_off ? 0 : genpd_suspend_dev(genpd, dev);
+ return genpd->suspend_power_off ? 0 : pm_generic_suspend(dev);
}
/**
@@ -1012,7 +972,7 @@ static int pm_genpd_suspend_late(struct device *dev)
if (IS_ERR(genpd))
return -EINVAL;
- return genpd->suspend_power_off ? 0 : genpd_suspend_late(genpd, dev);
+ return genpd->suspend_power_off ? 0 : pm_generic_suspend_late(dev);
}
/**
@@ -1099,7 +1059,7 @@ static int pm_genpd_resume_early(struct device *dev)
if (IS_ERR(genpd))
return -EINVAL;
- return genpd->suspend_power_off ? 0 : genpd_resume_early(genpd, dev);
+ return genpd->suspend_power_off ? 0 : pm_generic_resume_early(dev);
}
/**
@@ -1120,7 +1080,7 @@ static int pm_genpd_resume(struct device *dev)
if (IS_ERR(genpd))
return -EINVAL;
- return genpd->suspend_power_off ? 0 : genpd_resume_dev(genpd, dev);
+ return genpd->suspend_power_off ? 0 : pm_generic_resume(dev);
}
/**
@@ -1141,7 +1101,7 @@ static int pm_genpd_freeze(struct device *dev)
if (IS_ERR(genpd))
return -EINVAL;
- return genpd->suspend_power_off ? 0 : genpd_freeze_dev(genpd, dev);
+ return genpd->suspend_power_off ? 0 : pm_generic_freeze(dev);
}
/**
@@ -1163,7 +1123,7 @@ static int pm_genpd_freeze_late(struct device *dev)
if (IS_ERR(genpd))
return -EINVAL;
- return genpd->suspend_power_off ? 0 : genpd_freeze_late(genpd, dev);
+ return genpd->suspend_power_off ? 0 : pm_generic_freeze_late(dev);
}
/**
@@ -1227,7 +1187,7 @@ static int pm_genpd_thaw_early(struct device *dev)
if (IS_ERR(genpd))
return -EINVAL;
- return genpd->suspend_power_off ? 0 : genpd_thaw_early(genpd, dev);
+ return genpd->suspend_power_off ? 0 : pm_generic_thaw_early(dev);
}
/**
@@ -1248,7 +1208,7 @@ static int pm_genpd_thaw(struct device *dev)
if (IS_ERR(genpd))
return -EINVAL;
- return genpd->suspend_power_off ? 0 : genpd_thaw_dev(genpd, dev);
+ return genpd->suspend_power_off ? 0 : pm_generic_thaw(dev);
}
/**
@@ -1956,14 +1916,6 @@ void pm_genpd_init(struct generic_pm_domain *genpd,
genpd->domain.ops.complete = pm_genpd_complete;
genpd->dev_ops.save_state = pm_genpd_default_save_state;
genpd->dev_ops.restore_state = pm_genpd_default_restore_state;
- genpd->dev_ops.suspend = pm_generic_suspend;
- genpd->dev_ops.suspend_late = pm_generic_suspend_late;
- genpd->dev_ops.resume_early = pm_generic_resume_early;
- genpd->dev_ops.resume = pm_generic_resume;
- genpd->dev_ops.freeze = pm_generic_freeze;
- genpd->dev_ops.freeze_late = pm_generic_freeze_late;
- genpd->dev_ops.thaw_early = pm_generic_thaw_early;
- genpd->dev_ops.thaw = pm_generic_thaw;
mutex_lock(&gpd_list_lock);
list_add(&genpd->gpd_list_node, &gpd_list);
mutex_unlock(&gpd_list_lock);
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index a54bbbe..fd5efc8 100644
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -35,14 +35,6 @@ struct gpd_dev_ops {
int (*stop)(struct device *dev);
int (*save_state)(struct device *dev);
int (*restore_state)(struct device *dev);
- int (*suspend)(struct device *dev);
- int (*suspend_late)(struct device *dev);
- int (*resume_early)(struct device *dev);
- int (*resume)(struct device *dev);
- int (*freeze)(struct device *dev);
- int (*freeze_late)(struct device *dev);
- int (*thaw_early)(struct device *dev);
- int (*thaw)(struct device *dev);
bool (*active_wakeup)(struct device *dev);
};
--
1.9.1
next prev parent reply other threads:[~2014-09-03 10:52 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-03 10:52 [PATCH 00/15] PM / Domains: Cleanups and remove superfluous APIs Ulf Hansson
2014-09-03 10:52 ` [PATCH 01/15] PM / Domains: Remove the pm_genpd_add|remove_callbacks APIs Ulf Hansson
2014-09-03 10:52 ` [PATCH 02/15] PM / Domains: Ignore callbacks for subsys generic_pm_domain_data Ulf Hansson
2014-09-03 10:52 ` Ulf Hansson [this message]
2014-09-03 10:52 ` [PATCH 04/15] ARM: shmobile: Drop dev_irq_safe from r8a7779 genpd config Ulf Hansson
2014-09-03 10:52 ` [PATCH 05/15] ARM: shmobile: Drop dev_irq_safe from R-mobile " Ulf Hansson
2014-09-03 10:52 ` [PATCH 06/15] PM / Domains: Remove dev_irq_safe from " Ulf Hansson
2014-09-03 10:52 ` [PATCH 07/15] PM / Domains: Remove redundant check for CONFIG_PM Ulf Hansson
2014-09-03 10:52 ` [PATCH 08/15] PM / Domains: Remove pm_genpd_syscore_switch() API Ulf Hansson
2014-09-03 10:52 ` [PATCH 09/15] PM / Domains: Remove genpd_queue_power_off_work() API Ulf Hansson
2014-09-03 10:52 ` [PATCH 10/15] PM / Domains: Add late_initcall to disable unused PM domains Ulf Hansson
2014-09-03 10:52 ` [PATCH 11/15] ARM: exynos: Leave disabling of unused PM domains to genpd Ulf Hansson
2014-09-03 10:52 ` [PATCH 12/15] ARM: s3c64xx: " Ulf Hansson
2014-09-03 10:52 ` [PATCH 13/15] drivers: sh: " Ulf Hansson
2014-09-04 0:33 ` Simon Horman
2014-09-05 8:23 ` Ulf Hansson
2014-09-03 10:52 ` [PATCH 14/15] PM / Domains: Remove default_stop_ok() API Ulf Hansson
2014-09-03 13:15 ` Geert Uytterhoeven
2014-09-04 19:49 ` Rafael J. Wysocki
2014-09-05 8:16 ` Ulf Hansson
2014-09-03 10:52 ` [PATCH 15/15] PM / Domains: Keep declaration of dev_power_governors together Ulf Hansson
2014-09-03 11:10 ` [PATCH 00/15] PM / Domains: Cleanups and remove superfluous APIs Arnd Bergmann
2014-09-04 8:40 ` Geert Uytterhoeven
2014-09-05 15:35 ` Kevin Hilman
2014-09-08 23:07 ` Rafael J. Wysocki
2014-09-09 15:05 ` Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409741551-16437-4-git-send-email-ulf.hansson@linaro.org \
--to=ulf.hansson@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).