soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts xxx_only flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
---
include/sound/simple_card_utils.h | 2 +-
sound/soc/generic/audio-graph-card2.c | 8 ++++----
sound/soc/generic/simple-card-utils.c | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index ad67957b7b48..42e464090cf3 100644
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -196,7 +196,7 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep,
struct snd_soc_dai_link_component *dlc, int *is_single_link);
int graph_util_parse_link_direction(struct device_node *np,
- bool *is_playback_only, bool *is_capture_only);
+ bool *playback_assertion, bool *capture_assertion);
#ifdef DEBUG
static inline void simple_util_debug_dai(struct simple_util_priv *priv,
diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c
index 0d2ac4c9ba3d..3007b95eeaaa 100644
--- a/sound/soc/generic/audio-graph-card2.c
+++ b/sound/soc/generic/audio-graph-card2.c
@@ -759,7 +759,7 @@ static void graph_link_init(struct simple_util_priv *priv,
struct device_node *ep;
struct device_node *ports;
unsigned int daifmt = 0, daiclk = 0;
- bool playback_only = 0, capture_only = 0;
+ bool playback_assertion = 0, capture_assertion = 0;
unsigned int bit_frame = 0;
if (graph_lnk_is_multi(port)) {
@@ -798,10 +798,10 @@ static void graph_link_init(struct simple_util_priv *priv,
if (is_cpu_node)
daiclk = snd_soc_daifmt_clock_provider_flipped(daiclk);
- graph_util_parse_link_direction(port, &playback_only, &capture_only);
+ graph_util_parse_link_direction(port, &playback_assertion, &capture_assertion);
- dai_link->playback_only = playback_only;
- dai_link->capture_only = capture_only;
+ dai_link->playback_assertion = playback_assertion;
+ dai_link->capture_assertion = capture_assertion;
dai_link->dai_fmt = daifmt | daiclk;
dai_link->init = simple_util_dai_init;
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index b4876b4f259d..48233f410348 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -1127,7 +1127,7 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep,
EXPORT_SYMBOL_GPL(graph_util_parse_dai);
int graph_util_parse_link_direction(struct device_node *np,
- bool *playback_only, bool *capture_only)
+ bool *playback_assertion, bool *capture_assertion)
{
bool is_playback_only = false;
bool is_capture_only = false;
@@ -1138,8 +1138,8 @@ int graph_util_parse_link_direction(struct device_node *np,
if (is_playback_only && is_capture_only)
return -EINVAL;
- *playback_only = is_playback_only;
- *capture_only = is_capture_only;
+ *playback_assertion = is_playback_only;
+ *capture_assertion = is_capture_only;
return 0;
}
--
2.25.1
