mirror of
https://github.com/torvalds/linux.git
synced 2026-05-23 06:31:58 +02:00
ASoC: codecs: idt821034: 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-8-dd54b6ca1ef9@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
346d363230
commit
b0cf20b433
|
|
@ -957,7 +957,8 @@ static const struct snd_soc_component_driver idt821034_component_driver = {
|
|||
#define IDT821034_GPIO_OFFSET_TO_SLIC_CHANNEL(_offset) (((_offset) / 5) % 4)
|
||||
#define IDT821034_GPIO_OFFSET_TO_SLIC_MASK(_offset) BIT((_offset) % 5)
|
||||
|
||||
static void idt821034_chip_gpio_set(struct gpio_chip *c, unsigned int offset, int val)
|
||||
static int idt821034_chip_gpio_set(struct gpio_chip *c, unsigned int offset,
|
||||
int val)
|
||||
{
|
||||
u8 ch = IDT821034_GPIO_OFFSET_TO_SLIC_CHANNEL(offset);
|
||||
u8 mask = IDT821034_GPIO_OFFSET_TO_SLIC_MASK(offset);
|
||||
|
|
@ -973,12 +974,14 @@ static void idt821034_chip_gpio_set(struct gpio_chip *c, unsigned int offset, in
|
|||
else
|
||||
slic_raw &= ~mask;
|
||||
ret = idt821034_write_slic_raw(idt821034, ch, slic_raw);
|
||||
if (ret) {
|
||||
dev_err(&idt821034->spi->dev, "set gpio %d (%u, 0x%x) failed (%d)\n",
|
||||
offset, ch, mask, ret);
|
||||
}
|
||||
|
||||
mutex_unlock(&idt821034->mutex);
|
||||
|
||||
if (ret)
|
||||
dev_err(&idt821034->spi->dev, "set gpio %d (%u, 0x%x) failed (%d)\n",
|
||||
offset, ch, mask, ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int idt821034_chip_gpio_get(struct gpio_chip *c, unsigned int offset)
|
||||
|
|
@ -1054,7 +1057,9 @@ static int idt821034_chip_direction_output(struct gpio_chip *c, unsigned int off
|
|||
u8 slic_conf;
|
||||
int ret;
|
||||
|
||||
idt821034_chip_gpio_set(c, offset, val);
|
||||
ret = idt821034_chip_gpio_set(c, offset, val);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
mutex_lock(&idt821034->mutex);
|
||||
|
||||
|
|
@ -1112,7 +1117,7 @@ static int idt821034_gpio_init(struct idt821034 *idt821034)
|
|||
idt821034->gpio_chip.direction_input = idt821034_chip_direction_input;
|
||||
idt821034->gpio_chip.direction_output = idt821034_chip_direction_output;
|
||||
idt821034->gpio_chip.get = idt821034_chip_gpio_get;
|
||||
idt821034->gpio_chip.set = idt821034_chip_gpio_set;
|
||||
idt821034->gpio_chip.set_rv = idt821034_chip_gpio_set;
|
||||
idt821034->gpio_chip.can_sleep = true;
|
||||
|
||||
return devm_gpiochip_add_data(&idt821034->spi->dev, &idt821034->gpio_chip,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user