[alsa-devel] [PATCH 2/2] ASoC: soc-io: Fix snd_soc_component_update_bits_legacy

[Peter Ujfalusi]

On 03/12/2018 04:24 PM, Peter Ujfalusi wrote:
> 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: e2c330b9b5665 ("ASoC: Move IO abstraction to the component level")

Not this one, but:
d0ff8ba57d965 ("ASoC: add Component level .read/.write")

Sorry.

> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi at ti.com>
> ---
>  sound/soc/soc-io.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
> index 2bc1c4c17896..d36a192fbece 100644
> --- a/sound/soc/soc-io.c
> +++ b/sound/soc/soc-io.c
> @@ -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);
>  
> 


-- 
Péter

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki