Commit 86bfd21a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: battery: Drop redundant locking 



All of the evaluations of objects in the ACPI namespace are carried out
under the namespace lock and interpreter lock in ACPICA, so it is not
necessary to put any additional locks around them for synchronization.

However, the ACPI battery driver does just that, so remove the
redundant locking around ACPI object evaluation from it.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/2344462.iZASKD2KPV@rafael.j.wysocki
parent dcb6fa37

drivers/acpi/battery.c

+0 −12
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ enum { 
};



struct acpi_battery {

	struct mutex lock;

	struct mutex update_lock;

	struct power_supply *bat;

	struct power_supply_desc bat_desc;
@@ -535,11 +534,9 @@ static int acpi_battery_get_info(struct acpi_battery *battery) 
		struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

		acpi_status status = AE_ERROR;



		mutex_lock(&battery->lock);

		status = acpi_evaluate_object(battery->device->handle,

					      use_bix ? "_BIX":"_BIF",

					      NULL, &buffer);

		mutex_unlock(&battery->lock);



		if (ACPI_FAILURE(status)) {

			acpi_handle_info(battery->device->handle,
@@ -576,11 +573,8 @@ static int acpi_battery_get_state(struct acpi_battery *battery) 
			msecs_to_jiffies(cache_time)))

		return 0;



	mutex_lock(&battery->lock);

	status = acpi_evaluate_object(battery->device->handle, "_BST",

				      NULL, &buffer);

	mutex_unlock(&battery->lock);



	if (ACPI_FAILURE(status)) {

		acpi_handle_info(battery->device->handle,

				 "_BST evaluation failed: %s",
@@ -628,11 +622,8 @@ static int acpi_battery_set_alarm(struct acpi_battery *battery) 
	    !test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags))

		return -ENODEV;



	mutex_lock(&battery->lock);

	status = acpi_execute_simple_method(battery->device->handle, "_BTP",

					    battery->alarm);

	mutex_unlock(&battery->lock);



	if (ACPI_FAILURE(status))

		return -ENODEV;
@@ -1235,9 +1226,6 @@ static int acpi_battery_add(struct acpi_device *device) 
	strscpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);

	strscpy(acpi_device_class(device), ACPI_BATTERY_CLASS);

	device->driver_data = battery;

	result = devm_mutex_init(&device->dev, &battery->lock);

	if (result)

		return result;



	result = devm_mutex_init(&device->dev, &battery->update_lock);

	if (result)