Commit 82f2d305 authored Jul 14, 2018 by Lucas Rangit Magasweran Committed by Rafael J. Wysocki Jul 24, 2018

ACPI: battery: remove redundant old_present check on insertion



On removal battery_present changes from 1 to 0 after calling
acpi_battery_get_status() and battery->update_time is set to 0
before returning.

On insertion battery_present changes from 0 to 1 after calling
acpi_battery_get_status() and acpi_battery_get_info() is called
because battery->update_time is 0.

The old_present condition is therefore redundant.

This was added in the commit below when there was a path without
sysfs that would skip getting the newly inserted battery info.

commit 50b17851 ("Newly inserted battery might differ from one
just removed, so update of battery info fields is required.")

Signed-off-by: Lucas Rangit Magasweran <lucas.magasweran@ieee.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 9d3cce1e

drivers/acpi/battery.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -918,10 +918,11 @@ static void acpi_battery_quirks(struct acpi_battery *battery)

		static int acpi_battery_update(struct acpi_battery *battery, bool resume)
		{
		int result, old_present = acpi_battery_present(battery);
		result = acpi_battery_get_status(battery);
		int result = acpi_battery_get_status(battery);

		if (result)
		return result;

		if (!acpi_battery_present(battery)) {
		sysfs_remove_battery(battery);
		battery->update_time = 0;
		@@ -931,8 +932,7 @@ static int acpi_battery_update(struct acpi_battery *battery, bool resume)
		if (resume)
		return 0;

		if (!battery->update_time \|\|
		old_present != acpi_battery_present(battery)) {
		if (!battery->update_time) {
		result = acpi_battery_get_info(battery);
		if (result)
		return result;

Admin message