diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-08-21 19:41:37 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-08-21 19:41:37 +0400 |
| commit | 03664de47d69b580359d2dac84feb3b9e57f7f7d (patch) | |
| tree | a09a24dd01841cc4b7e9a087eb661219cadfea84 | |
| parent | ac20a0e853ca73bb821a85d8492d965e07513ccd (diff) | |
| download | linux-topics-tracking-workaround-ubuntu-sauce-llct-20121009.0.tar.gz | |
Revert 8c16bb8 "UBUNTU: SAUCE: acpi battery -- move first lookup asynchronous"tracking-workaround-ubuntu-sauce-llct-20121012.0tracking-workaround-ubuntu-sauce-llct-20121009.0tracking-workaround-ubuntu-sauce-llct-20121008.0tracking-workaround-ubuntu-sauce-llct-20121006.0tracking-workaround-ubuntu-sauce-llct-20121004.0tracking-workaround-ubuntu-sauce-llct-20120924.0tracking-workaround-ubuntu-sauce-llct-20120917.0tracking-workaround-ubuntu-sauce-llct-20120911.0tracking-workaround-ubuntu-sauce-llct-20120910.0tracking-workaround-ubuntu-sauce-llct-20120907.1tracking-workaround-ubuntu-sauce-llct-20120907.0tracking-workaround-ubuntu-sauce-llct-20120903.0tracking-workaround-ubuntu-sauce-llct-20120822.0tracking-workaround-ubuntu-sauce-llct-20120821.0tracking-workaround-ubuntu-sauce-linux-linaro-core-3.6-20121220.0tracking-workaround-ubuntu-sauce-linux-linaro-core-3.6-20121123.0tracking-workaround-ubuntu-sauce-linux-linaro-core-3.6-20121107.0
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
| -rw-r--r-- | drivers/acpi/battery.c | 39 |
1 files changed, 13 insertions, 26 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 724c6b65087..ff2c876ec41 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -985,18 +985,6 @@ static int battery_notify(struct notifier_block *nb, return 0; } -static LIST_HEAD(acpi_battery_domain); - -static void acpi_battery_update_async(struct acpi_device *device, async_cookie_t cookie) -{ - struct acpi_battery *battery = acpi_driver_data(device); - - acpi_battery_update(battery); - printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n", - ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device), - device->status.battery_present ? "present" : "absent"); -} - static int acpi_battery_add(struct acpi_device *device) { int result = 0; @@ -1016,16 +1004,13 @@ static int acpi_battery_add(struct acpi_device *device) if (ACPI_SUCCESS(acpi_get_handle(battery->device->handle, "_BIX", &handle))) set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags); - - /* Mark the battery for update at first access. */ - battery->update_time = 0; + result = acpi_battery_update(battery); + if (result) + goto fail; #ifdef CONFIG_ACPI_PROCFS_POWER result = acpi_battery_add_fs(device); #endif - if (!result) { - async_schedule_domain(acpi_battery_update_async, device, &acpi_battery_domain); - - } else { + if (result) { #ifdef CONFIG_ACPI_PROCFS_POWER acpi_battery_remove_fs(device); #endif @@ -1055,10 +1040,6 @@ static int acpi_battery_remove(struct acpi_device *device, int type) if (!device || !acpi_driver_data(device)) return -EINVAL; - - /* Ensure all async updates are complete before freeing the battery. */ - async_synchronize_full_domain(&acpi_battery_domain); - battery = acpi_driver_data(device); unregister_pm_notifier(&battery->pm_nb); #ifdef CONFIG_ACPI_PROCFS_POWER @@ -1103,21 +1084,27 @@ static struct acpi_driver acpi_battery_driver = { .drv.pm = &acpi_battery_pm, }; -static int __init acpi_battery_init(void) +static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie) { if (acpi_disabled) return; #ifdef CONFIG_ACPI_PROCFS_POWER acpi_battery_dir = acpi_lock_battery_dir(); if (!acpi_battery_dir) - return -1; + return; #endif if (acpi_bus_register_driver(&acpi_battery_driver) < 0) { #ifdef CONFIG_ACPI_PROCFS_POWER acpi_unlock_battery_dir(acpi_battery_dir); #endif - return -1; + return; } + return; +} + +static int __init acpi_battery_init(void) +{ + async_schedule(acpi_battery_init_async, NULL); return 0; } |