ASoC: codecs: peb2466: use new GPIO line value setter callbacks

struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Acked-by: Herve Codina <herve.codina@bootlin.com>
Link: https://patch.msgid.link/20250408-gpiochip-set-rv-sound-v1-9-dd54b6ca1ef9@linaro.org
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/peb2466.c b/sound/soc/codecs/peb2466.c
index a989cfe058f02b5834f841384e2de0ecf34b2a1f..b8905c03445e986d79c2413c22d87da0015e0425 100644 (file)
--- a/sound/soc/codecs/peb2466.c
+++ b/sound/soc/codecs/peb2466.c
@@ -1726,7 +1726,8 @@ end:
        return ret;
 }
 
-static void peb2466_chip_gpio_set(struct gpio_chip *c, unsigned int offset, int val)
+static int peb2466_chip_gpio_set(struct gpio_chip *c, unsigned int offset,
+                                int val)
 {
        struct peb2466 *peb2466 = gpiochip_get_data(c);
        unsigned int xr_reg;
@@ -1740,14 +1741,14 @@ static void peb2466_chip_gpio_set(struct gpio_chip *c, unsigned int offset, int
                 */
                dev_warn(&peb2466->spi->dev, "cannot set gpio %d (read-only)\n",
                         offset);
-               return;
+               return -EINVAL;
        }
 
        ret = peb2466_chip_gpio_offset_to_data_regmask(offset, &xr_reg, &mask);
        if (ret) {
                dev_err(&peb2466->spi->dev, "cannot set gpio %d (%d)\n",
                        offset, ret);
-               return;
+               return ret;
        }
 
        ret = peb2466_chip_gpio_update_bits(peb2466, xr_reg, mask, val ? mask : 0);
@@ -1755,6 +1756,8 @@ static void peb2466_chip_gpio_set(struct gpio_chip *c, unsigned int offset, int
                dev_err(&peb2466->spi->dev, "set gpio %d (0x%x, 0x%x) failed (%d)\n",
                        offset, xr_reg, mask, ret);
        }
+
+       return ret;
 }
 
 static int peb2466_chip_gpio_get(struct gpio_chip *c, unsigned int offset)
@@ -1879,7 +1882,9 @@ static int peb2466_chip_direction_output(struct gpio_chip *c, unsigned int offse
                return -EINVAL;
        }
 
-       peb2466_chip_gpio_set(c, offset, val);
+       ret = peb2466_chip_gpio_set(c, offset, val);
+       if (ret)
+               return ret;
 
        if (offset < 16) {
                /* SOx_{0,1} */
@@ -1940,7 +1945,7 @@ static int peb2466_gpio_init(struct peb2466 *peb2466)
        peb2466->gpio.gpio_chip.direction_input = peb2466_chip_direction_input;
        peb2466->gpio.gpio_chip.direction_output = peb2466_chip_direction_output;
        peb2466->gpio.gpio_chip.get = peb2466_chip_gpio_get;
-       peb2466->gpio.gpio_chip.set = peb2466_chip_gpio_set;
+       peb2466->gpio.gpio_chip.set_rv = peb2466_chip_gpio_set;
        peb2466->gpio.gpio_chip.can_sleep = true;
 
        return devm_gpiochip_add_data(&peb2466->spi->dev, &peb2466->gpio.gpio_chip,