diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-01-06 23:38:04 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 11:05:23 +0100 |
| commit | 36237fa0a711c309a38d7a7a9aed727e0eb76449 (patch) | |
| tree | 8c1d3db8c562491001c5ba821ea59a4412635cf8 /drivers/acpi/power.c | |
| parent | Merge branch 'kconfig-text' into release (diff) | |
| download | linux-36237fa0a711c309a38d7a7a9aed727e0eb76449.tar.xz linux-36237fa0a711c309a38d7a7a9aed727e0eb76449.zip | |
ACPI / PM: Rename acpi_power_off_device()
Rename acpi_power_off_device() to acpi_power_off() in analogy with
acpi_power_on().
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/power.c')
| -rw-r--r-- | drivers/acpi/power.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 0003f1009885..ac02af419b32 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -219,7 +219,7 @@ static int acpi_power_on(acpi_handle handle) return result; } -static int acpi_power_off_device(acpi_handle handle) +static int acpi_power_off(acpi_handle handle) { int result = 0; acpi_status status = AE_OK; @@ -268,7 +268,7 @@ static void __acpi_power_off_list(struct acpi_handle_list *list, int num_res) int i; for (i = num_res - 1; i >= 0 ; i--) - acpi_power_off_device(list->handles[i]); + acpi_power_off(list->handles[i]); } static void acpi_power_off_list(struct acpi_handle_list *list) @@ -430,8 +430,7 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev) /* Close power resource */ for (i = 0; i < dev->wakeup.resources.count; i++) { - int ret = acpi_power_off_device( - dev->wakeup.resources.handles[i]); + int ret = acpi_power_off(dev->wakeup.resources.handles[i]); if (ret) { printk(KERN_ERR PREFIX "Transition power state\n"); dev->wakeup.flags.valid = 0; |