Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/2344462.iZASKD2KPV@rafael.j.wysocki
This commit is contained in:
Rafael J. Wysocki 2025-10-15 15:52:41 +02:00
parent dcb6fa37fd
commit 86bfd21a0b
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/acpi/battery.c
View File

@ -91,7 +91,6 @@ enum {
}; };
struct acpi_battery { struct acpi_battery {
struct mutex lock;
struct mutex update_lock; struct mutex update_lock;
struct power_supply *bat; struct power_supply *bat;
struct power_supply_desc bat_desc; 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 }; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
acpi_status status = AE_ERROR; acpi_status status = AE_ERROR;
mutex_lock(&battery->lock);
status = acpi_evaluate_object(battery->device->handle, status = acpi_evaluate_object(battery->device->handle,
use_bix ? "_BIX":"_BIF", use_bix ? "_BIX":"_BIF",
NULL, &buffer); NULL, &buffer);
mutex_unlock(&battery->lock);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
acpi_handle_info(battery->device->handle, 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))) msecs_to_jiffies(cache_time)))
return 0; return 0;
mutex_lock(&battery->lock);
status = acpi_evaluate_object(battery->device->handle, "_BST", status = acpi_evaluate_object(battery->device->handle, "_BST",
NULL, &buffer); NULL, &buffer);
mutex_unlock(&battery->lock);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
acpi_handle_info(battery->device->handle, acpi_handle_info(battery->device->handle,
"_BST evaluation failed: %s", "_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)) !test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags))
return -ENODEV; return -ENODEV;
mutex_lock(&battery->lock);
status = acpi_execute_simple_method(battery->device->handle, "_BTP", status = acpi_execute_simple_method(battery->device->handle, "_BTP",
battery->alarm); battery->alarm);
mutex_unlock(&battery->lock);
if (ACPI_FAILURE(status)) if (ACPI_FAILURE(status))
return -ENODEV; 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_name(device), ACPI_BATTERY_DEVICE_NAME);
strscpy(acpi_device_class(device), ACPI_BATTERY_CLASS); strscpy(acpi_device_class(device), ACPI_BATTERY_CLASS);
device->driver_data = battery; 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); result = devm_mutex_init(&device->dev, &battery->update_lock);
if (result) if (result)