Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0f1d6986bae57b6d11e2c9ce5e66b6c6b0e3684d

Authored by Rafael J. Wysocki
1 parent dae5cbc244
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 15 additions and 0 deletions Side-by-side Diff

drivers/base/power/domain.c
Diff comments   View file @ 0f1d698
... ... @@ -1429,6 +1429,8 @@
1429 1429 return 0;
1430 1430 }
1431 1431  
  1432 +#ifdef CONFIG_PM_SLEEP
  1433 +
1432 1434 /**
1433 1435 * pm_genpd_default_suspend - Default "device suspend" for PM domians.
1434 1436 * @dev: Device to handle.
... ... @@ -1516,6 +1518,19 @@
1516 1518  
1517 1519 return cb ? cb(dev) : pm_generic_thaw(dev);
1518 1520 }
  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 */
1519 1534  
1520 1535 /**
1521 1536 * pm_genpd_init - Initialize a generic I/O PM domain object.