tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
gpio: regmap: use value returning setters
struct gpio_chip now has additional variants of the set(_multiple)
driver callbacks that return an integer to indicate success or failure.
Convert the driver to using them.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Michael Walle <mwalle@kernel.org>
Acked-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20250220-gpio-set-retval-v2-7-bc4cfd38dae3@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
+21
-11
+21
-11
drivers/gpio/gpio-regmap.c
+21
-11
drivers/gpio/gpio-regmap.c
···
83
83
return !!(val & mask);
84
84
}
85
85
86
-
static void gpio_regmap_set(struct gpio_chip *chip, unsigned int offset,
87
-
int val)
86
+
static int gpio_regmap_set(struct gpio_chip *chip, unsigned int offset,
87
+
int val)
88
88
{
89
89
struct gpio_regmap *gpio = gpiochip_get_data(chip);
90
90
unsigned int base = gpio_regmap_addr(gpio->reg_set_base);
91
91
unsigned int reg, mask;
92
+
int ret;
92
93
93
-
gpio->reg_mask_xlate(gpio, base, offset, ®, &mask);
94
+
ret = gpio->reg_mask_xlate(gpio, base, offset, ®, &mask);
95
+
if (ret)
96
+
return ret;
97
+
94
98
if (val)
95
-
regmap_update_bits(gpio->regmap, reg, mask, mask);
99
+
ret = regmap_update_bits(gpio->regmap, reg, mask, mask);
96
100
else
97
-
regmap_update_bits(gpio->regmap, reg, mask, 0);
101
+
ret = regmap_update_bits(gpio->regmap, reg, mask, 0);
102
+
103
+
return ret;
98
104
}
99
105
100
-
static void gpio_regmap_set_with_clear(struct gpio_chip *chip,
101
-
unsigned int offset, int val)
106
+
static int gpio_regmap_set_with_clear(struct gpio_chip *chip,
107
+
unsigned int offset, int val)
102
108
{
103
109
struct gpio_regmap *gpio = gpiochip_get_data(chip);
104
110
unsigned int base, reg, mask;
111
+
int ret;
105
112
106
113
if (val)
107
114
base = gpio_regmap_addr(gpio->reg_set_base);
108
115
else
109
116
base = gpio_regmap_addr(gpio->reg_clr_base);
110
117
111
-
gpio->reg_mask_xlate(gpio, base, offset, ®, &mask);
112
-
regmap_write(gpio->regmap, reg, mask);
118
+
ret = gpio->reg_mask_xlate(gpio, base, offset, ®, &mask);
119
+
if (ret)
120
+
return ret;
121
+
122
+
return regmap_write(gpio->regmap, reg, mask);
113
123
}
114
124
115
125
static int gpio_regmap_get_direction(struct gpio_chip *chip,
···
260
250
chip->free = gpiochip_generic_free;
261
251
chip->get = gpio_regmap_get;
262
252
if (gpio->reg_set_base && gpio->reg_clr_base)
263
-
chip->set = gpio_regmap_set_with_clear;
253
+
chip->set_rv = gpio_regmap_set_with_clear;
264
254
else if (gpio->reg_set_base)
265
-
chip->set = gpio_regmap_set;
255
+
chip->set_rv = gpio_regmap_set;
266
256
267
257
chip->get_direction = gpio_regmap_get_direction;
268
258
if (gpio->reg_dir_in_base || gpio->reg_dir_out_base) {