aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-01-13 18:39:25 -0500
committerRafael J. Wysocki <rjw@sisk.pl>2012-01-13 18:39:25 -0500
commit0f1d6986bae57b6d11e2c9ce5e66b6c6b0e3684d (patch)
treeabf2a89b7c4c60e2165a347fcbf2dd892c12e8bb /drivers/base/power
parentdae5cbc2440b1d21a15715d0f1fb20f632dd38ee (diff)
PM / Domains: Fix build for CONFIG_PM_SLEEP unset
Some callback functions defined in drivers/base/power/domain.c are only necessary if CONFIG_PM_SLEEP is set and they call some other functions that are only available in that case. For this reason, they should not be compiled at all when CONFIG_PM_SLEEP is not set. Reported-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers/base/power')
-rw-r--r--drivers/base/power/domain.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 92e6a9048065..978bbf7ac6af 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1429,6 +1429,8 @@ static int pm_genpd_default_restore_state(struct device *dev)
1429 return 0; 1429 return 0;
1430} 1430}
1431 1431
1432#ifdef CONFIG_PM_SLEEP
1433
1432/** 1434/**
1433 * pm_genpd_default_suspend - Default "device suspend" for PM domians. 1435 * pm_genpd_default_suspend - Default "device suspend" for PM domians.
1434 * @dev: Device to handle. 1436 * @dev: Device to handle.
@@ -1517,6 +1519,19 @@ static int pm_genpd_default_thaw(struct device *dev)
1517 return cb ? cb(dev) : pm_generic_thaw(dev); 1519 return cb ? cb(dev) : pm_generic_thaw(dev);
1518} 1520}
1519 1521
1522#else /* !CONFIG_PM_SLEEP */
1523
1524#define pm_genpd_default_suspend NULL
1525#define pm_genpd_default_suspend_late NULL
1526#define pm_genpd_default_resume_early NULL
1527#define pm_genpd_default_resume NULL
1528#define pm_genpd_default_freeze NULL
1529#define pm_genpd_default_freeze_late NULL
1530#define pm_genpd_default_thaw_early NULL
1531#define pm_genpd_default_thaw NULL
1532
1533#endif /* !CONFIG_PM_SLEEP */
1534
1520/** 1535/**
1521 * pm_genpd_init - Initialize a generic I/O PM domain object. 1536 * pm_genpd_init - Initialize a generic I/O PM domain object.
1522 * @genpd: PM domain object to initialize. 1537 * @genpd: PM domain object to initialize.