diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 15:01:22 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 15:01:22 +0400 |
| commit | 52388492ea7046888156ed2756fbba390b18c01e (patch) | |
| tree | 3d5935b0f4c1dbd723223f37caf8f227be8861c6 /include/linux | |
| parent | ceaed1e3942132a0705ef5b4e1d696313d638550 (diff) | |
| parent | 592a55d83599d6b3c90acc7a3795fb3ff1851be7 (diff) | |
| download | linux-52388492ea7046888156ed2756fbba390b18c01e.tar.xz | |
Merge branch 'pm-omap'
* pm-omap:
PM / AVS: SmartReflex: use devm_* API to initialize SmartReflex
PM / AVS: SmartReflex: use omap_sr * for enable/disable interface
PM / AVS: SmartReflex: use omap_sr * for minmax interfaces
PM / AVS: SmartReflex: use omap_sr * for errgen interfaces
PM / AVS: SmartReflex: fix driver name
PM / AVS: SmartReflex: disable runtime PM on driver remove
PM / AVS: SmartReflex: disable errgen before vpbound disable
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/power/smartreflex.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h index c0f44c2b006d..d8b187c3925d 100644 --- a/include/linux/power/smartreflex.h +++ b/include/linux/power/smartreflex.h @@ -299,11 +299,11 @@ void omap_sr_disable_reset_volt(struct voltagedomain *voltdm); void omap_sr_register_pmic(struct omap_sr_pmic_data *pmic_data); /* Smartreflex driver hooks to be called from Smartreflex class driver */ -int sr_enable(struct voltagedomain *voltdm, unsigned long volt); -void sr_disable(struct voltagedomain *voltdm); -int sr_configure_errgen(struct voltagedomain *voltdm); -int sr_disable_errgen(struct voltagedomain *voltdm); -int sr_configure_minmax(struct voltagedomain *voltdm); +int sr_enable(struct omap_sr *sr, unsigned long volt); +void sr_disable(struct omap_sr *sr); +int sr_configure_errgen(struct omap_sr *sr); +int sr_disable_errgen(struct omap_sr *sr); +int sr_configure_minmax(struct omap_sr *sr); /* API to register the smartreflex class driver with the smartreflex driver */ int sr_register_class(struct omap_sr_class_data *class_data); |