]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ASoC: soc-ac97: use new GPIO line value setter callbacks
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Tue, 8 Apr 2025 07:38:19 +0000 (09:38 +0200)
committerMark Brown <broonie@kernel.org>
Sun, 13 Apr 2025 19:23:14 +0000 (20:23 +0100)
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>
Link: https://patch.msgid.link/20250408-gpiochip-set-rv-sound-v1-1-dd54b6ca1ef9@linaro.org
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-ac97.c

index 079e4ff5a14e90574f3f19a0721741e72190db6c..29790807d7858c97ff85c717954dd52a757bdc4c 100644 (file)
@@ -87,8 +87,8 @@ static int snd_soc_ac97_gpio_get(struct gpio_chip *chip, unsigned int offset)
        return !!(ret & (1 << offset));
 }
 
-static void snd_soc_ac97_gpio_set(struct gpio_chip *chip, unsigned int offset,
-                                 int value)
+static int snd_soc_ac97_gpio_set(struct gpio_chip *chip, unsigned int offset,
+                                int value)
 {
        struct snd_ac97_gpio_priv *gpio_priv = gpiochip_get_data(chip);
        struct snd_soc_component *component = gpio_to_component(chip);
@@ -98,15 +98,22 @@ static void snd_soc_ac97_gpio_set(struct gpio_chip *chip, unsigned int offset,
        snd_soc_component_write(component, AC97_GPIO_STATUS,
                                gpio_priv->gpios_set);
        dev_dbg(component->dev, "set gpio %d to %d\n", offset, !!value);
+
+       return 0;
 }
 
 static int snd_soc_ac97_gpio_direction_out(struct gpio_chip *chip,
                                     unsigned offset, int value)
 {
        struct snd_soc_component *component = gpio_to_component(chip);
+       int ret;
 
        dev_dbg(component->dev, "set gpio %d to output\n", offset);
-       snd_soc_ac97_gpio_set(chip, offset, value);
+
+       ret = snd_soc_ac97_gpio_set(chip, offset, value);
+       if (ret)
+               return ret;
+
        return snd_soc_component_update_bits(component, AC97_GPIO_CFG,
                                             1 << offset, 0);
 }
@@ -118,7 +125,7 @@ static const struct gpio_chip snd_soc_ac97_gpio_chip = {
        .direction_input        = snd_soc_ac97_gpio_direction_in,
        .get                    = snd_soc_ac97_gpio_get,
        .direction_output       = snd_soc_ac97_gpio_direction_out,
-       .set                    = snd_soc_ac97_gpio_set,
+       .set_rv                 = snd_soc_ac97_gpio_set,
        .can_sleep              = 1,
 };