Commit 846d0a17 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: intel: use snd_soc_xxx_active()

We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87tv0i58it.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1d9fb19d
...@@ -392,7 +392,7 @@ static int sst_enable_ssp(struct snd_pcm_substream *substream, ...@@ -392,7 +392,7 @@ static int sst_enable_ssp(struct snd_pcm_substream *substream,
{ {
int ret = 0; int ret = 0;
if (!dai->active) { if (!snd_soc_dai_active(dai)) {
ret = sst_handle_vb_timer(dai, true); ret = sst_handle_vb_timer(dai, true);
sst_fill_ssp_defaults(dai); sst_fill_ssp_defaults(dai);
} }
...@@ -405,7 +405,7 @@ static int sst_be_hw_params(struct snd_pcm_substream *substream, ...@@ -405,7 +405,7 @@ static int sst_be_hw_params(struct snd_pcm_substream *substream,
{ {
int ret = 0; int ret = 0;
if (dai->active == 1) if (snd_soc_dai_active(dai) == 1)
ret = send_ssp_cmd(dai, dai->name, 1); ret = send_ssp_cmd(dai, dai->name, 1);
return ret; return ret;
} }
...@@ -414,7 +414,7 @@ static int sst_set_format(struct snd_soc_dai *dai, unsigned int fmt) ...@@ -414,7 +414,7 @@ static int sst_set_format(struct snd_soc_dai *dai, unsigned int fmt)
{ {
int ret = 0; int ret = 0;
if (!dai->active) if (!snd_soc_dai_active(dai))
return 0; return 0;
ret = sst_fill_ssp_config(dai, fmt); ret = sst_fill_ssp_config(dai, fmt);
...@@ -429,7 +429,7 @@ static int sst_platform_set_ssp_slot(struct snd_soc_dai *dai, ...@@ -429,7 +429,7 @@ static int sst_platform_set_ssp_slot(struct snd_soc_dai *dai,
int slots, int slot_width) { int slots, int slot_width) {
int ret = 0; int ret = 0;
if (!dai->active) if (!snd_soc_dai_active(dai))
return ret; return ret;
ret = sst_fill_ssp_slot(dai, tx_mask, rx_mask, slots, slot_width); ret = sst_fill_ssp_slot(dai, tx_mask, rx_mask, slots, slot_width);
...@@ -442,7 +442,7 @@ static int sst_platform_set_ssp_slot(struct snd_soc_dai *dai, ...@@ -442,7 +442,7 @@ static int sst_platform_set_ssp_slot(struct snd_soc_dai *dai,
static void sst_disable_ssp(struct snd_pcm_substream *substream, static void sst_disable_ssp(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
if (!dai->active) { if (!snd_soc_dai_active(dai)) {
send_ssp_cmd(dai, dai->name, 0); send_ssp_cmd(dai, dai->name, 0);
sst_handle_vb_timer(dai, false); sst_handle_vb_timer(dai, false);
} }
...@@ -743,7 +743,7 @@ static int sst_soc_prepare(struct device *dev) ...@@ -743,7 +743,7 @@ static int sst_soc_prepare(struct device *dev)
for_each_card_rtds(drv->soc_card, rtd) { for_each_card_rtds(drv->soc_card, rtd) {
struct snd_soc_dai *dai = asoc_rtd_to_cpu(rtd, 0); struct snd_soc_dai *dai = asoc_rtd_to_cpu(rtd, 0);
if (dai->active) { if (snd_soc_dai_active(dai)) {
send_ssp_cmd(dai, dai->name, 0); send_ssp_cmd(dai, dai->name, 0);
sst_handle_vb_timer(dai, false); sst_handle_vb_timer(dai, false);
} }
...@@ -764,7 +764,7 @@ static void sst_soc_complete(struct device *dev) ...@@ -764,7 +764,7 @@ static void sst_soc_complete(struct device *dev)
for_each_card_rtds(drv->soc_card, rtd) { for_each_card_rtds(drv->soc_card, rtd) {
struct snd_soc_dai *dai = asoc_rtd_to_cpu(rtd, 0); struct snd_soc_dai *dai = asoc_rtd_to_cpu(rtd, 0);
if (dai->active) { if (snd_soc_dai_active(dai)) {
sst_handle_vb_timer(dai, true); sst_handle_vb_timer(dai, true);
send_ssp_cmd(dai, dai->name, 1); send_ssp_cmd(dai, dai->name, 1);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment