diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-16 01:30:46 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-16 01:30:46 +0200 |
| commit | 592a55d83599d6b3c90acc7a3795fb3ff1851be7 (patch) | |
| tree | 575537b6b0c8571219b38754b9a76305a3c3952a /arch/arm/mach-omap2 | |
| parent | 7d132055814ef17a6c7b69f342244c410a5e000f (diff) | |
| parent | efca406b940e93e6af38c597eecd5fb79b39b7ea (diff) | |
| download | op-kernel-dev-592a55d83599d6b3c90acc7a3795fb3ff1851be7.zip op-kernel-dev-592a55d83599d6b3c90acc7a3795fb3ff1851be7.tar.gz | |
Merge tag 'omap-pm-v3.11/avs' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into pm-omap
Pull PM / AVS: SmartReflex: misc. cleanups for 3.11 from Kevin Hilman.
Diffstat (limited to 'arch/arm/mach-omap2')
| -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 aee3c89..7a42e19 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 */ |
