ASoC: soc-io: Fix snd_soc_component_update_bits_legacy
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Mon, 12 Mar 2018 14:24:23 +0000 (16:24 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 12 Mar 2018 16:58:02 +0000 (09:58 -0700)
After the codec to component conversion codecs with custom read/write
function will no longer able to use update_bits as their io callbacks are
registered at component->driver level and not in component level.

To not complicate the code further, lets just use the
snd_soc_component_read/snd_soc_component_write function and let them sort
out the correct io function to call.

Fixes: d0ff8ba57d965 ("ASoC: add Component level .read/.write")
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-io.c

index 2bc1c4c17896d6c946baf584656f4fdca2bc25e8..d36a192fbece4f8be1124fcb256355149eeef94e 100644 (file)
@@ -88,19 +88,16 @@ static int snd_soc_component_update_bits_legacy(
        unsigned int old, new;
        int ret;
 
-       if (!component->read || !component->write)
-               return -EIO;
-
        mutex_lock(&component->io_mutex);
 
-       ret = component->read(component, reg, &old);
+       ret = snd_soc_component_read(component, reg, &old);
        if (ret < 0)
                goto out_unlock;
 
        new = (old & ~mask) | (val & mask);
        *change = old != new;
        if (*change)
-               ret = component->write(component, reg, new);
+               ret = snd_soc_component_write(component, reg, new);
 out_unlock:
        mutex_unlock(&component->io_mutex);