diff options
| author | Patrick Rudolph <patrick.rudolph@9elements.com> | 2024-06-26 10:45:22 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2024-07-03 13:14:28 +0200 |
| commit | 710894c9d37f993bb521ed1ccda625642c04193e (patch) | |
| tree | 901e75e0d7f767cdf444e46afc5767cb2bdb49ad | |
| parent | 0608235a2f43126f19305093559b935738e969e8 (diff) | |
pinctrl: cy8c95x0: Use cleanup.h
Use the guard mutex from cleanup.h to make the code more readable.
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Link: https://lore.kernel.org/20240626084525.787298-1-patrick.rudolph@9elements.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | drivers/pinctrl/pinctrl-cy8c95x0.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/pinctrl/pinctrl-cy8c95x0.c b/drivers/pinctrl/pinctrl-cy8c95x0.c index 4efb8b5cc2d3..781949e0e09e 100644 --- a/drivers/pinctrl/pinctrl-cy8c95x0.c +++ b/drivers/pinctrl/pinctrl-cy8c95x0.c @@ -9,6 +9,7 @@ #include <linux/acpi.h> #include <linux/bitmap.h> +#include <linux/cleanup.h> #include <linux/dmi.h> #include <linux/gpio/driver.h> #include <linux/gpio/consumer.h> @@ -480,8 +481,6 @@ static inline int cy8c95x0_regmap_update_bits_base(struct cy8c95x0_pinctrl *chip if (reg == CY8C95X0_PORTSEL) return -EINVAL; - mutex_lock(&chip->i2c_lock); - /* Registers behind the PORTSEL mux have their own range in regmap */ if (cy8c95x0_muxed_register(reg)) { off = CY8C95X0_MUX_REGMAP_TO_OFFSET(reg, port); @@ -492,10 +491,11 @@ static inline int cy8c95x0_regmap_update_bits_base(struct cy8c95x0_pinctrl *chip else off = reg; } + guard(mutex)(&chip->i2c_lock); ret = regmap_update_bits_base(chip->regmap, off, mask, val, change, async, force); if (ret < 0) - goto out; + return ret; /* Update the cache when a WC bit is written */ if (cy8c95x0_wc_register(reg) && (mask & val)) { @@ -516,8 +516,6 @@ static inline int cy8c95x0_regmap_update_bits_base(struct cy8c95x0_pinctrl *chip regcache_cache_only(chip->regmap, false); } } -out: - mutex_unlock(&chip->i2c_lock); return ret; } @@ -591,8 +589,6 @@ static int cy8c95x0_regmap_read(struct cy8c95x0_pinctrl *chip, unsigned int reg, { int off, ret; - mutex_lock(&chip->i2c_lock); - /* Registers behind the PORTSEL mux have their own range in regmap */ if (cy8c95x0_muxed_register(reg)) { off = CY8C95X0_MUX_REGMAP_TO_OFFSET(reg, port); @@ -603,11 +599,10 @@ static int cy8c95x0_regmap_read(struct cy8c95x0_pinctrl *chip, unsigned int reg, else off = reg; } + guard(mutex)(&chip->i2c_lock); ret = regmap_read(chip->regmap, off, read_val); - mutex_unlock(&chip->i2c_lock); - return ret; } |