diff options
Diffstat (limited to 'drivers/acpi/sbs.c')
-rw-r--r-- | drivers/acpi/sbs.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index b6241eeb1132..aef7e1cd1e5d 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c | |||
@@ -873,14 +873,9 @@ static void acpi_sbs_callback(void *context) | |||
873 | u8 saved_charger_state = sbs->charger_present; | 873 | u8 saved_charger_state = sbs->charger_present; |
874 | u8 saved_battery_state; | 874 | u8 saved_battery_state; |
875 | acpi_ac_get_present(sbs); | 875 | acpi_ac_get_present(sbs); |
876 | if (sbs->charger_present != saved_charger_state) { | 876 | if (sbs->charger_present != saved_charger_state) |
877 | #ifdef CONFIG_ACPI_PROC_EVENT | ||
878 | acpi_bus_generate_proc_event4(ACPI_AC_CLASS, ACPI_AC_DIR_NAME, | ||
879 | ACPI_SBS_NOTIFY_STATUS, | ||
880 | sbs->charger_present); | ||
881 | #endif | ||
882 | kobject_uevent(&sbs->charger.dev->kobj, KOBJ_CHANGE); | 877 | kobject_uevent(&sbs->charger.dev->kobj, KOBJ_CHANGE); |
883 | } | 878 | |
884 | if (sbs->manager_present) { | 879 | if (sbs->manager_present) { |
885 | for (id = 0; id < MAX_SBS_BAT; ++id) { | 880 | for (id = 0; id < MAX_SBS_BAT; ++id) { |
886 | if (!(sbs->batteries_supported & (1 << id))) | 881 | if (!(sbs->batteries_supported & (1 << id))) |
@@ -890,12 +885,6 @@ static void acpi_sbs_callback(void *context) | |||
890 | acpi_battery_read(bat); | 885 | acpi_battery_read(bat); |
891 | if (saved_battery_state == bat->present) | 886 | if (saved_battery_state == bat->present) |
892 | continue; | 887 | continue; |
893 | #ifdef CONFIG_ACPI_PROC_EVENT | ||
894 | acpi_bus_generate_proc_event4(ACPI_BATTERY_CLASS, | ||
895 | bat->name, | ||
896 | ACPI_SBS_NOTIFY_STATUS, | ||
897 | bat->present); | ||
898 | #endif | ||
899 | kobject_uevent(&bat->bat.dev->kobj, KOBJ_CHANGE); | 888 | kobject_uevent(&bat->bat.dev->kobj, KOBJ_CHANGE); |
900 | } | 889 | } |
901 | } | 890 | } |