diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 13:01:22 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 13:01:22 +0200 |
| commit | 52388492ea7046888156ed2756fbba390b18c01e (patch) | |
| tree | 3d5935b0f4c1dbd723223f37caf8f227be8861c6 /arch/arm | |
| parent | ceaed1e3942132a0705ef5b4e1d696313d638550 (diff) | |
| parent | 592a55d83599d6b3c90acc7a3795fb3ff1851be7 (diff) | |
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 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/smartreflex-class3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/smartreflex-class3.c b/arch/arm/mach-omap2/smartreflex-class3.c index aee3c8940a30..7a42e1960c3b 100644 --- a/arch/arm/mach-omap2/smartreflex-class3.c +++ b/arch/arm/mach-omap2/smartreflex-class3.c @@ -26,14 +26,14 @@ static int sr_class3_enable(struct omap_sr *sr) } omap_vp_enable(sr->voltdm); - return sr_enable(sr->voltdm, volt); + return sr_enable(sr, volt); } static int sr_class3_disable(struct omap_sr *sr, int is_volt_reset) { - sr_disable_errgen(sr->voltdm); + sr_disable_errgen(sr); omap_vp_disable(sr->voltdm); - sr_disable(sr->voltdm); + sr_disable(sr); if (is_volt_reset) voltdm_reset(sr->voltdm); @@ -42,7 +42,7 @@ static int sr_class3_disable(struct omap_sr *sr, int is_volt_reset) static int sr_class3_configure(struct omap_sr *sr) { - return sr_configure_errgen(sr->voltdm); + return sr_configure_errgen(sr); } /* SR class3 structure */ |