Unverified Commit c849a7cf authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Mark Brown
Browse files

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: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Acked-by: default avatarHerve Codina <herve.codina@bootlin.com>
Link: https://patch.msgid.link/20250408-gpiochip-set-rv-sound-v1-9-dd54b6ca1ef9@linaro.org


Reviewed-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b0cf20b4

sound/soc/codecs/peb2466.c

+10 −5
Original line number Diff line number Diff line
@@ -1726,7 +1726,8 @@ static int peb2466_chip_gpio_update_bits(struct peb2466 *peb2466, unsigned int x 
	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,