Revert "ACPI: battery: Add the ThinkPad "Not Charging" quirk"

Revert commit 91eea70e5e5c (ACPI: battery: Add the ThinkPad "Not
Charging" quirk) as it is reported to cause user space to misbehave.

That appears to be due to bugs in user space, so this commit will go
in again after the bugs have been fixed and the fixes have been
delivered to users.

Link: https://marc.info/?l=linux-acpi&m=152089585129589&w=2
Reported-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 96ed134bacf8470fa12229d2a57c026d1a91bced..c88d41b0478918b67a1eeceb7d8689ab45b0247d 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -74,7 +74,6 @@ static async_cookie_t async_cookie;
 static bool battery_driver_registered;
 static int battery_bix_broken_package;
 static int battery_notification_delay_ms;
-static int battery_quirk_notcharging;
 static int battery_full_discharging;
 static unsigned int cache_time = 1000;
 module_param(cache_time, uint, 0644);
@@ -240,8 +239,6 @@ static int acpi_battery_get_property(struct power_supply *psy,
                        val->intval = POWER_SUPPLY_STATUS_CHARGING;
                else if (acpi_battery_is_charged(battery))
                        val->intval = POWER_SUPPLY_STATUS_FULL;
-               else if (battery_quirk_notcharging)
-                       val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
                else
                        val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
                break;
@@ -728,7 +725,7 @@ EXPORT_SYMBOL_GPL(battery_hook_register);
  * This function gets called right after the battery sysfs
  * attributes have been added, so that the drivers that
  * define custom sysfs attributes can add their own.
- */
+*/
 static void battery_hook_add_battery(struct acpi_battery *battery)
 {
        struct acpi_battery_hook *hook_node;
@@ -1345,12 +1342,6 @@ static int __init battery_full_discharging_quirk(const struct dmi_system_id *d)
        return 0;
 }
 
-static int __init battery_quirk_not_charging(const struct dmi_system_id *d)
-{
-       battery_quirk_notcharging = 1;
-       return 0;
-}
-
 static const struct dmi_system_id bat_dmi_table[] __initconst = {
        {
                .callback = battery_bix_broken_package_quirk,
@@ -1400,19 +1391,6 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "UX410UAK"),
                },
        },
-       {
-               /*
-                * On Lenovo ThinkPads the BIOS specification defines
-                * a state when the bits for charging and discharging
-                * are both set to 0. That state is "Not Charging".
-                */
-               .callback = battery_quirk_not_charging,
-               .ident = "Lenovo ThinkPad",
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
-               },
-       },
        {},
 };