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

gpio: mmio: use lock guards 

Shrink the code by a couple lines and improve lock management by using
lock guards from cleanup.h.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20251027-gpio-mmio-refactor-v1-1-b0de7cd5a4b9@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
pull/1354/merge
Bartosz Golaszewski 2025-10-27 14:48:02 +01:00
parent 3cde660945
commit 7e061b462b
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/gpio/gpio-mmio.c
View File

@ -41,6 +41,7 @@ o ` ~~~~\___/~~~~ ` controller in FPGA is ,.`
*/ */
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/cleanup.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
@ -229,9 +230,8 @@ static int bgpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
{ {
struct gpio_generic_chip *chip = to_gpio_generic_chip(gc); struct gpio_generic_chip *chip = to_gpio_generic_chip(gc);
unsigned long mask = bgpio_line2mask(gc, gpio); unsigned long mask = bgpio_line2mask(gc, gpio);
unsigned long flags;
raw_spin_lock_irqsave(&chip->lock, flags); guard(raw_spinlock)(&chip->lock);
if (val) if (val)
chip->sdata |= mask; chip->sdata |= mask;
@ -240,8 +240,6 @@ static int bgpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
chip->write_reg(chip->reg_dat, chip->sdata); chip->write_reg(chip->reg_dat, chip->sdata);
raw_spin_unlock_irqrestore(&chip->lock, flags);
return 0; return 0;
} }
@ -262,9 +260,9 @@ static int bgpio_set_with_clear(struct gpio_chip *gc, unsigned int gpio,
static int bgpio_set_set(struct gpio_chip *gc, unsigned int gpio, int val) static int bgpio_set_set(struct gpio_chip *gc, unsigned int gpio, int val)
{ {
struct gpio_generic_chip *chip = to_gpio_generic_chip(gc); struct gpio_generic_chip *chip = to_gpio_generic_chip(gc);
unsigned long mask = bgpio_line2mask(gc, gpio), flags; unsigned long mask = bgpio_line2mask(gc, gpio);
raw_spin_lock_irqsave(&chip->lock, flags); guard(raw_spinlock)(&chip->lock);
if (val) if (val)
chip->sdata |= mask; chip->sdata |= mask;
@ -273,8 +271,6 @@ static int bgpio_set_set(struct gpio_chip *gc, unsigned int gpio, int val)
chip->write_reg(chip->reg_set, chip->sdata); chip->write_reg(chip->reg_set, chip->sdata);
raw_spin_unlock_irqrestore(&chip->lock, flags);
return 0; return 0;
} }
@ -303,9 +299,9 @@ static void bgpio_set_multiple_single_reg(struct gpio_chip *gc,
void __iomem *reg) void __iomem *reg)
{ {
struct gpio_generic_chip *chip = to_gpio_generic_chip(gc); struct gpio_generic_chip *chip = to_gpio_generic_chip(gc);
unsigned long flags, set_mask, clear_mask; unsigned long set_mask, clear_mask;
raw_spin_lock_irqsave(&chip->lock, flags); guard(raw_spinlock)(&chip->lock);
bgpio_multiple_get_masks(gc, mask, bits, &set_mask, &clear_mask); bgpio_multiple_get_masks(gc, mask, bits, &set_mask, &clear_mask);
@ -313,8 +309,6 @@ static void bgpio_set_multiple_single_reg(struct gpio_chip *gc,
chip->sdata &= ~clear_mask; chip->sdata &= ~clear_mask;
chip->write_reg(reg, chip->sdata); chip->write_reg(reg, chip->sdata);
raw_spin_unlock_irqrestore(&chip->lock, flags);
} }
static int bgpio_set_multiple(struct gpio_chip *gc, unsigned long *mask, static int bgpio_set_multiple(struct gpio_chip *gc, unsigned long *mask,
@ -394,18 +388,15 @@ static int bgpio_simple_dir_out(struct gpio_chip *gc, unsigned int gpio,
static int bgpio_dir_in(struct gpio_chip *gc, unsigned int gpio) static int bgpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
{ {
struct gpio_generic_chip *chip = to_gpio_generic_chip(gc); struct gpio_generic_chip *chip = to_gpio_generic_chip(gc);
unsigned long flags;
raw_spin_lock_irqsave(&chip->lock, flags);
scoped_guard(raw_spinlock, &chip->lock) {
chip->sdir &= ~bgpio_line2mask(gc, gpio); chip->sdir &= ~bgpio_line2mask(gc, gpio);
if (chip->reg_dir_in) if (chip->reg_dir_in)
chip->write_reg(chip->reg_dir_in, ~chip->sdir); chip->write_reg(chip->reg_dir_in, ~chip->sdir);
if (chip->reg_dir_out) if (chip->reg_dir_out)
chip->write_reg(chip->reg_dir_out, chip->sdir); chip->write_reg(chip->reg_dir_out, chip->sdir);
}
raw_spin_unlock_irqrestore(&chip->lock, flags);
return bgpio_dir_return(gc, gpio, false); return bgpio_dir_return(gc, gpio, false);
} }
@ -437,9 +428,8 @@ static int bgpio_get_dir(struct gpio_chip *gc, unsigned int gpio)
static void bgpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) static void bgpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
{ {
struct gpio_generic_chip *chip = to_gpio_generic_chip(gc); struct gpio_generic_chip *chip = to_gpio_generic_chip(gc);
unsigned long flags;
raw_spin_lock_irqsave(&chip->lock, flags); guard(raw_spinlock)(&chip->lock);
chip->sdir |= bgpio_line2mask(gc, gpio); chip->sdir |= bgpio_line2mask(gc, gpio);
@ -447,8 +437,6 @@ static void bgpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
chip->write_reg(chip->reg_dir_in, ~chip->sdir); chip->write_reg(chip->reg_dir_in, ~chip->sdir);
if (chip->reg_dir_out) if (chip->reg_dir_out)
chip->write_reg(chip->reg_dir_out, chip->sdir); chip->write_reg(chip->reg_dir_out, chip->sdir);
raw_spin_unlock_irqrestore(&chip->lock, flags);
} }
static int bgpio_dir_out_dir_first(struct gpio_chip *gc, unsigned int gpio, static int bgpio_dir_out_dir_first(struct gpio_chip *gc, unsigned int gpio,