On 14/05/2020 11.43, Kuninori Morimoto wrote:
> 
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> We have snd_soc_dai/dai_stream/component_active() macro
> This patch uses it.

Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> v1 -> v2
> 	- adjust to latest patch-set
> 
>  sound/soc/ti/davinci-mcasp.c | 2 +-
>  sound/soc/ti/omap-dmic.c     | 4 ++--
>  sound/soc/ti/omap-mcbsp.c    | 4 ++--
>  sound/soc/ti/omap-mcpdm.c    | 8 ++++----
>  4 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
> index 734ffe925c4d..f3a99f016557 100644
> --- a/sound/soc/ti/davinci-mcasp.c
> +++ b/sound/soc/ti/davinci-mcasp.c
> @@ -1577,7 +1577,7 @@ static void davinci_mcasp_shutdown(struct snd_pcm_substream *substream,
>  	if (mcasp->op_mode == DAVINCI_MCASP_DIT_MODE)
>  		return;
>  
> -	if (!cpu_dai->active) {
> +	if (!snd_soc_dai_active(cpu_dai)) {
>  		mcasp->channels = 0;
>  		mcasp->max_format_width = 0;
>  	}
> diff --git a/sound/soc/ti/omap-dmic.c b/sound/soc/ti/omap-dmic.c
> index 913579c43e9d..01abf1be5d78 100644
> --- a/sound/soc/ti/omap-dmic.c
> +++ b/sound/soc/ti/omap-dmic.c
> @@ -95,7 +95,7 @@ static int omap_dmic_dai_startup(struct snd_pcm_substream *substream,
>  
>  	mutex_lock(&dmic->mutex);
>  
> -	if (!dai->active)
> +	if (!snd_soc_dai_active(dai))
>  		dmic->active = 1;
>  	else
>  		ret = -EBUSY;
> @@ -114,7 +114,7 @@ static void omap_dmic_dai_shutdown(struct snd_pcm_substream *substream,
>  
>  	cpu_latency_qos_remove_request(&dmic->pm_qos_req);
>  
> -	if (!dai->active)
> +	if (!snd_soc_dai_active(dai))
>  		dmic->active = 0;
>  
>  	mutex_unlock(&dmic->mutex);
> diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c
> index 0348963f4df7..a9785d4916b7 100644
> --- a/sound/soc/ti/omap-mcbsp.c
> +++ b/sound/soc/ti/omap-mcbsp.c
> @@ -788,7 +788,7 @@ static int omap_mcbsp_dai_startup(struct snd_pcm_substream *substream,
>  	struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
>  	int err = 0;
>  
> -	if (!cpu_dai->active)
> +	if (!snd_soc_dai_active(cpu_dai))
>  		err = omap_mcbsp_request(mcbsp);
>  
>  	/*
> @@ -843,7 +843,7 @@ static void omap_mcbsp_dai_shutdown(struct snd_pcm_substream *substream,
>  
>  	mcbsp->latency[stream1] = 0;
>  
> -	if (!cpu_dai->active) {
> +	if (!snd_soc_dai_active(cpu_dai)) {
>  		omap_mcbsp_free(mcbsp);
>  		mcbsp->configured = 0;
>  	}
> diff --git a/sound/soc/ti/omap-mcpdm.c b/sound/soc/ti/omap-mcpdm.c
> index f2dbadea33bb..d482b62f314a 100644
> --- a/sound/soc/ti/omap-mcpdm.c
> +++ b/sound/soc/ti/omap-mcpdm.c
> @@ -253,7 +253,7 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
>  
>  	mutex_lock(&mcpdm->mutex);
>  
> -	if (!dai->active)
> +	if (!snd_soc_dai_active(dai))
>  		omap_mcpdm_open_streams(mcpdm);
>  
>  	mutex_unlock(&mcpdm->mutex);
> @@ -271,7 +271,7 @@ static void omap_mcpdm_dai_shutdown(struct snd_pcm_substream *substream,
>  
>  	mutex_lock(&mcpdm->mutex);
>  
> -	if (!dai->active) {
> +	if (!snd_soc_dai_active(dai)) {
>  		if (omap_mcpdm_active(mcpdm)) {
>  			omap_mcpdm_stop(mcpdm);
>  			omap_mcpdm_close_streams(mcpdm);
> @@ -462,7 +462,7 @@ static int omap_mcpdm_suspend(struct snd_soc_component *component)
>  {
>  	struct omap_mcpdm *mcpdm = snd_soc_component_get_drvdata(component);
>  
> -	if (component->active) {
> +	if (snd_soc_component_active(component)) {
>  		omap_mcpdm_stop(mcpdm);
>  		omap_mcpdm_close_streams(mcpdm);
>  	}
> @@ -484,7 +484,7 @@ static int omap_mcpdm_resume(struct snd_soc_component *component)
>  		while (mcpdm->pm_active_count--)
>  			pm_runtime_get_sync(mcpdm->dev);
>  
> -		if (component->active) {
> +		if (snd_soc_component_active(component)) {
>  			omap_mcpdm_open_streams(mcpdm);
>  			omap_mcpdm_start(mcpdm);
>  		}
> 

- Péter

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