ACPI: PMIC: Replace mutex_lock/unlock() with guard()/scoped_guard()

Replace mutex_lock() and unlock() calls with the newer guard() and
scoped_guard() macros to make the code more straightforward.

Signed-off-by: Maxwell Doose <m32285159@gmail.com>
[ rjw: Subject tweak, changelog edits ]
Link: https://patch.msgid.link/20260430013507.46259-1-m32285159@gmail.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/pmic/intel_pmic.c b/drivers/acpi/pmic/intel_pmic.c
index 134e9ca8eaa2355f09ac53e3b56f7f40a4b4d719..9bd46defc5a2781dcde772f87646a417c9b3c85e 100644 (file)
--- a/drivers/acpi/pmic/intel_pmic.c
+++ b/drivers/acpi/pmic/intel_pmic.c
@@ -67,14 +67,12 @@ static acpi_status intel_pmic_power_handler(u32 function,
        if (result == -ENOENT)
                return AE_BAD_PARAMETER;
 
-       mutex_lock(&opregion->lock);
+       guard(mutex)(&opregion->lock);
 
        result = function == ACPI_READ ?
                d->get_power(regmap, reg, bit, value64) :
                d->update_power(regmap, reg, bit, *value64 == 1);
 
-       mutex_unlock(&opregion->lock);
-
        return result ? AE_ERROR : AE_OK;
 }
 
@@ -182,19 +180,16 @@ static acpi_status intel_pmic_thermal_handler(u32 function,
        if (result == -ENOENT)
                return AE_BAD_PARAMETER;
 
-       mutex_lock(&opregion->lock);
-
-       if (pmic_thermal_is_temp(address))
-               result = pmic_thermal_temp(opregion, reg, function, value64);
-       else if (pmic_thermal_is_aux(address))
-               result = pmic_thermal_aux(opregion, reg, function, value64);
-       else if (pmic_thermal_is_pen(address))
-               result = pmic_thermal_pen(opregion, reg, bit,
-                                               function, value64);
-       else
-               result = -EINVAL;
-
-       mutex_unlock(&opregion->lock);
+       scoped_guard(mutex, &opregion->lock) {
+               if (pmic_thermal_is_temp(address))
+                       result = pmic_thermal_temp(opregion, reg, function, value64);
+               else if (pmic_thermal_is_aux(address))
+                       result = pmic_thermal_aux(opregion, reg, function, value64);
+               else if (pmic_thermal_is_pen(address))
+                       result = pmic_thermal_pen(opregion, reg, bit, function, value64);
+               else
+                       result = -EINVAL;
+       }
 
        if (result < 0) {
                if (result == -EINVAL)
@@ -354,13 +349,15 @@ int intel_soc_pmic_exec_mipi_pmic_seq_element(u16 i2c_address, u32 reg_address,
 
        d = intel_pmic_opregion->data;
 
-       mutex_lock(&intel_pmic_opregion->lock);
+       guard(mutex)(&intel_pmic_opregion->lock);
 
        if (d->exec_mipi_pmic_seq_element) {
-               ret = d->exec_mipi_pmic_seq_element(intel_pmic_opregion->regmap,
+               return d->exec_mipi_pmic_seq_element(intel_pmic_opregion->regmap,
                                                    i2c_address, reg_address,
                                                    value, mask);
-       } else if (d->pmic_i2c_address) {
+       }
+
+       if (d->pmic_i2c_address) {
                if (i2c_address == d->pmic_i2c_address) {
                        ret = regmap_update_bits(intel_pmic_opregion->regmap,
                                                 reg_address, mask, value);
@@ -376,8 +373,6 @@ int intel_soc_pmic_exec_mipi_pmic_seq_element(u16 i2c_address, u32 reg_address,
                ret = -EOPNOTSUPP;
        }
 
-       mutex_unlock(&intel_pmic_opregion->lock);
-
        return ret;
 }
 EXPORT_SYMBOL_GPL(intel_soc_pmic_exec_mipi_pmic_seq_element);