Merge tag 'acpi-4.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fixes from Rafael Wysocki:
 "These revert one recent commit that added incorrect battery quirks for
  some Asus systems and fix an off-by-one error in the watchdog driver
  based on the ACPI WDAT table.

  Specifics:

   - Revert the recent change adding battery quirks for Asus GL502VSK
     and UX305LA as these quirks turn out to be inadequate and possibly
     premature (Daniel Drake).

   - Fix an off-by-one error in the resource allocation part of the
     watchdog driver based on the ACPI WDAT table (Takashi Iwai)"

* tag 'acpi-4.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / watchdog: Fix off-by-one error at resource assignment
  Revert "ACPI / battery: Add quirk for Asus GL502VSK and UX305LA"

3 files changed, 6 insertions, 48 deletions

diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c
index 11b113f8e367..ebb626ffb5fa 100644
--- a/drivers/acpi/acpi_watchdog.c
+++ b/drivers/acpi/acpi_watchdog.c
@@ -74,10 +74,10 @@ void __init acpi_watchdog_init(void)
                 res.start = gas->address;
                 if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
                         res.flags = IORESOURCE_MEM;
-                        res.end = res.start + ALIGN(gas->access_width, 4);
+                        res.end = res.start + ALIGN(gas->access_width, 4) - 1;
                 } else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
                         res.flags = IORESOURCE_IO;
-                        res.end = res.start + gas->access_width;
+                        res.end = res.start + gas->access_width - 1;
                 } else {
                         pr_warn("Unsupported address space: %u\n",
                                 gas->space_id);
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 7128488a3a72..f2eb6c37ea0a 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -70,7 +70,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_full_discharging;
 static unsigned int cache_time = 1000;
 module_param(cache_time, uint, 0644);
 MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
@@ -215,12 +214,9 @@ static int acpi_battery_get_property(struct power_supply *psy,
                 return -ENODEV;
         switch (psp) {
         case POWER_SUPPLY_PROP_STATUS:
-                if (battery->state & ACPI_BATTERY_STATE_DISCHARGING) {
-                        if (battery_full_discharging && battery->rate_now == 0)
-                                val->intval = POWER_SUPPLY_STATUS_FULL;
-                        else
-                                val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
-                } else if (battery->state & ACPI_BATTERY_STATE_CHARGING)
+                if (battery->state & ACPI_BATTERY_STATE_DISCHARGING)
+                        val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+                else if (battery->state & ACPI_BATTERY_STATE_CHARGING)
                         val->intval = POWER_SUPPLY_STATUS_CHARGING;
                 else if (acpi_battery_is_charged(battery))
                         val->intval = POWER_SUPPLY_STATUS_FULL;
@@ -1170,12 +1166,6 @@ battery_notification_delay_quirk(const struct dmi_system_id *d)
         return 0;
 }
 
-static int __init battery_full_discharging_quirk(const struct dmi_system_id *d)
-{
-        battery_full_discharging = 1;
-        return 0;
-}
-
 static const struct dmi_system_id bat_dmi_table[] __initconst = {
         {
                 .callback = battery_bix_broken_package_quirk,
@@ -1193,38 +1183,6 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
                 },
         },
-        {
-                .callback = battery_full_discharging_quirk,
-                .ident = "ASUS GL502VSK",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "GL502VSK"),
-                },
-        },
-        {
-                .callback = battery_full_discharging_quirk,
-                .ident = "ASUS UX305LA",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "UX305LA"),
-                },
-        },
-        {
-                .callback = battery_full_discharging_quirk,
-                .ident = "ASUS UX360UA",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "UX360UA"),
-                },
-        },
-        {
-                .callback = battery_full_discharging_quirk,
-                .ident = "ASUS UX410UAK",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "UX410UAK"),
-                },
-        },
         {},
 };
 
diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c
index 6d1fbda0f461..0da9943d405f 100644
--- a/drivers/watchdog/wdat_wdt.c
+++ b/drivers/watchdog/wdat_wdt.c
@@ -392,7 +392,7 @@ static int wdat_wdt_probe(struct platform_device *pdev)
 
                 memset(&r, 0, sizeof(r));
                 r.start = gas->address;
-                r.end = r.start + gas->access_width;
+                r.end = r.start + gas->access_width - 1;
                 if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
                         r.flags = IORESOURCE_MEM;
                 } else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO) {