diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 18:21:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 18:21:02 -0400 |
commit | 3ed1c478eff8db80e234d5446cb378b503135888 (patch) | |
tree | e1c8e0f488ca49c49b5a31fe59add4254381dd4b /drivers/base | |
parent | 151173e8ce9b95bbbbd7eedb9035cfaffbdb7cb2 (diff) | |
parent | 371deb9500831ad1afbf9ea00e373f650deaed2f (diff) |
Merge tag 'pm+acpi-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management and ACPI updates from Rafael J Wysocki:
- ARM big.LITTLE cpufreq driver from Viresh Kumar.
- exynos5440 cpufreq driver from Amit Daniel Kachhap.
- cpufreq core cleanup and code consolidation from Viresh Kumar and
Stratos Karafotis.
- cpufreq scalability improvement from Nathan Zimmer.
- AMD "frequency sensitivity feedback" powersave bias for the ondemand
cpufreq governor from Jacob Shin.
- cpuidle code consolidation and cleanups from Daniel Lezcano.
- ARM OMAP cpuidle fixes from Santosh Shilimkar and Daniel Lezcano.
- ACPICA fixes and other improvements from Bob Moore, Jung-uk Kim, Lv
Zheng, Yinghai Lu, Tang Chen, Colin Ian King, and Linn Crosetto.
- ACPI core updates related to hotplug from Toshi Kani, Paul Bolle,
Yasuaki Ishimatsu, and Rafael J Wysocki.
- Intel Lynxpoint LPSS (Low-Power Subsystem) support improvements from
Rafael J Wysocki and Andy Shevchenko.
* tag 'pm+acpi-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (192 commits)
cpufreq: Revert incorrect commit 5800043
cpufreq: MAINTAINERS: Add co-maintainer
cpuidle: add maintainer entry
ACPI / thermal: do not always return THERMAL_TREND_RAISING for active trip points
ARM: s3c64xx: cpuidle: use init/exit common routine
cpufreq: pxa2xx: initialize variables
ACPI: video: correct acpi_video_bus_add error processing
SH: cpuidle: use init/exit common routine
ARM: S5pv210: compiling issue, ARM_S5PV210_CPUFREQ needs CONFIG_CPU_FREQ_TABLE=y
ACPI: Fix wrong parameter passed to memblock_reserve
cpuidle: fix comment format
pnp: use %*phC to dump small buffers
isapnp: remove debug leftovers
ARM: imx: cpuidle: use init/exit common routine
ARM: davinci: cpuidle: use init/exit common routine
ARM: kirkwood: cpuidle: use init/exit common routine
ARM: calxeda: cpuidle: use init/exit common routine
ARM: tegra: cpuidle: use init/exit common routine for tegra3
ARM: tegra: cpuidle: use init/exit common routine for tegra2
ARM: OMAP4: cpuidle: use init/exit common routine
...
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/power/domain.c | 6 | ||||
-rw-r--r-- | drivers/base/power/generic_ops.c | 2 | ||||
-rw-r--r-- | drivers/base/power/main.c | 2 | ||||
-rw-r--r-- | drivers/base/power/opp.c | 1 | ||||
-rw-r--r-- | drivers/base/power/runtime.c | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 9a6b05a35603..7072404c8b6d 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c | |||
@@ -920,7 +920,7 @@ static int pm_genpd_prepare(struct device *dev) | |||
920 | pm_wakeup_event(dev, 0); | 920 | pm_wakeup_event(dev, 0); |
921 | 921 | ||
922 | if (pm_wakeup_pending()) { | 922 | if (pm_wakeup_pending()) { |
923 | pm_runtime_put_sync(dev); | 923 | pm_runtime_put(dev); |
924 | return -EBUSY; | 924 | return -EBUSY; |
925 | } | 925 | } |
926 | 926 | ||
@@ -961,7 +961,7 @@ static int pm_genpd_prepare(struct device *dev) | |||
961 | pm_runtime_enable(dev); | 961 | pm_runtime_enable(dev); |
962 | } | 962 | } |
963 | 963 | ||
964 | pm_runtime_put_sync(dev); | 964 | pm_runtime_put(dev); |
965 | return ret; | 965 | return ret; |
966 | } | 966 | } |
967 | 967 | ||
@@ -1327,7 +1327,7 @@ static void pm_genpd_complete(struct device *dev) | |||
1327 | pm_generic_complete(dev); | 1327 | pm_generic_complete(dev); |
1328 | pm_runtime_set_active(dev); | 1328 | pm_runtime_set_active(dev); |
1329 | pm_runtime_enable(dev); | 1329 | pm_runtime_enable(dev); |
1330 | pm_runtime_idle(dev); | 1330 | pm_request_idle(dev); |
1331 | } | 1331 | } |
1332 | } | 1332 | } |
1333 | 1333 | ||
diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c index d03d290f31c2..bfd898b8988e 100644 --- a/drivers/base/power/generic_ops.c +++ b/drivers/base/power/generic_ops.c | |||
@@ -324,6 +324,6 @@ void pm_generic_complete(struct device *dev) | |||
324 | * Let runtime PM try to suspend devices that haven't been in use before | 324 | * Let runtime PM try to suspend devices that haven't been in use before |
325 | * going into the system-wide sleep state we're resuming from. | 325 | * going into the system-wide sleep state we're resuming from. |
326 | */ | 326 | */ |
327 | pm_runtime_idle(dev); | 327 | pm_request_idle(dev); |
328 | } | 328 | } |
329 | #endif /* CONFIG_PM_SLEEP */ | 329 | #endif /* CONFIG_PM_SLEEP */ |
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 15beb500a4e4..5a9b6569dd74 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
@@ -756,7 +756,7 @@ static void device_complete(struct device *dev, pm_message_t state) | |||
756 | 756 | ||
757 | device_unlock(dev); | 757 | device_unlock(dev); |
758 | 758 | ||
759 | pm_runtime_put_sync(dev); | 759 | pm_runtime_put(dev); |
760 | } | 760 | } |
761 | 761 | ||
762 | /** | 762 | /** |
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index 32ee0fc7ea54..f0077cb8e249 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c | |||
@@ -55,6 +55,7 @@ | |||
55 | * @rate: Frequency in hertz | 55 | * @rate: Frequency in hertz |
56 | * @u_volt: Nominal voltage in microvolts corresponding to this OPP | 56 | * @u_volt: Nominal voltage in microvolts corresponding to this OPP |
57 | * @dev_opp: points back to the device_opp struct this opp belongs to | 57 | * @dev_opp: points back to the device_opp struct this opp belongs to |
58 | * @head: RCU callback head used for deferred freeing | ||
58 | * | 59 | * |
59 | * This structure stores the OPP information for a given device. | 60 | * This structure stores the OPP information for a given device. |
60 | */ | 61 | */ |
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 1244930e3d7a..ef13ad08afb2 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c | |||
@@ -1400,5 +1400,5 @@ void pm_runtime_remove(struct device *dev) | |||
1400 | if (dev->power.runtime_status == RPM_ACTIVE) | 1400 | if (dev->power.runtime_status == RPM_ACTIVE) |
1401 | pm_runtime_set_suspended(dev); | 1401 | pm_runtime_set_suspended(dev); |
1402 | if (dev->power.irq_safe && dev->parent) | 1402 | if (dev->power.irq_safe && dev->parent) |
1403 | pm_runtime_put_sync(dev->parent); | 1403 | pm_runtime_put(dev->parent); |
1404 | } | 1404 | } |