ASoC: soc-component: move snd_soc_component_stream_event()
Current soc-dapm / soc-core are using a long way round to call .stream_event. if (driver->stream_event) dapm->stream_event = ...; ... if (dapm->stream_event) ret = dapm->stream_event(...); We can directly call it via driver->stream_event. One note here is that both Card and Component have dapm, but, Card's dapm doesn't have dapm->component. We need to check it. This patch moves snd_soc_component_stream_event() to soc-component.c and updates parameters. dapm->stream_event is no longer needed Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://lore.kernel.org/r/87v9vp4d0r.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
9d415fbf77
commit
8e2a990d76
@ -283,6 +283,8 @@ int snd_soc_component_set_jack(struct snd_soc_component *component,
|
|||||||
|
|
||||||
void snd_soc_component_seq_notifier(struct snd_soc_component *component,
|
void snd_soc_component_seq_notifier(struct snd_soc_component *component,
|
||||||
enum snd_soc_dapm_type type, int subseq);
|
enum snd_soc_dapm_type type, int subseq);
|
||||||
|
int snd_soc_component_stream_event(struct snd_soc_component *component,
|
||||||
|
int event);
|
||||||
|
|
||||||
#ifdef CONFIG_REGMAP
|
#ifdef CONFIG_REGMAP
|
||||||
void snd_soc_component_init_regmap(struct snd_soc_component *component,
|
void snd_soc_component_init_regmap(struct snd_soc_component *component,
|
||||||
|
@ -670,7 +670,6 @@ struct snd_soc_dapm_context {
|
|||||||
enum snd_soc_bias_level target_bias_level;
|
enum snd_soc_bias_level target_bias_level;
|
||||||
struct list_head list;
|
struct list_head list;
|
||||||
|
|
||||||
int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);
|
|
||||||
int (*set_bias_level)(struct snd_soc_dapm_context *dapm,
|
int (*set_bias_level)(struct snd_soc_dapm_context *dapm,
|
||||||
enum snd_soc_bias_level level);
|
enum snd_soc_bias_level level);
|
||||||
|
|
||||||
|
@ -59,6 +59,15 @@ void snd_soc_component_seq_notifier(struct snd_soc_component *component,
|
|||||||
component->driver->seq_notifier(component, type, subseq);
|
component->driver->seq_notifier(component, type, subseq);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int snd_soc_component_stream_event(struct snd_soc_component *component,
|
||||||
|
int event)
|
||||||
|
{
|
||||||
|
if (component->driver->stream_event)
|
||||||
|
return component->driver->stream_event(component, event);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int snd_soc_component_enable_pin(struct snd_soc_component *component,
|
int snd_soc_component_enable_pin(struct snd_soc_component *component,
|
||||||
const char *pin)
|
const char *pin)
|
||||||
{
|
{
|
||||||
|
@ -2646,14 +2646,6 @@ int snd_soc_register_dai(struct snd_soc_component *component,
|
|||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(snd_soc_register_dai);
|
EXPORT_SYMBOL_GPL(snd_soc_register_dai);
|
||||||
|
|
||||||
static int snd_soc_component_stream_event(struct snd_soc_dapm_context *dapm,
|
|
||||||
int event)
|
|
||||||
{
|
|
||||||
struct snd_soc_component *component = dapm->component;
|
|
||||||
|
|
||||||
return component->driver->stream_event(component, event);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int snd_soc_component_set_bias_level(struct snd_soc_dapm_context *dapm,
|
static int snd_soc_component_set_bias_level(struct snd_soc_dapm_context *dapm,
|
||||||
enum snd_soc_bias_level level)
|
enum snd_soc_bias_level level)
|
||||||
{
|
{
|
||||||
@ -2682,8 +2674,6 @@ static int snd_soc_component_initialize(struct snd_soc_component *component,
|
|||||||
dapm->bias_level = SND_SOC_BIAS_OFF;
|
dapm->bias_level = SND_SOC_BIAS_OFF;
|
||||||
dapm->idle_bias_off = !driver->idle_bias_on;
|
dapm->idle_bias_off = !driver->idle_bias_on;
|
||||||
dapm->suspend_bias_off = driver->suspend_bias_off;
|
dapm->suspend_bias_off = driver->suspend_bias_off;
|
||||||
if (driver->stream_event)
|
|
||||||
dapm->stream_event = snd_soc_component_stream_event;
|
|
||||||
if (driver->set_bias_level)
|
if (driver->set_bias_level)
|
||||||
dapm->set_bias_level = snd_soc_component_set_bias_level;
|
dapm->set_bias_level = snd_soc_component_set_bias_level;
|
||||||
|
|
||||||
|
@ -1913,6 +1913,7 @@ static int dapm_power_widgets(struct snd_soc_card *card, int event)
|
|||||||
LIST_HEAD(down_list);
|
LIST_HEAD(down_list);
|
||||||
ASYNC_DOMAIN_EXCLUSIVE(async_domain);
|
ASYNC_DOMAIN_EXCLUSIVE(async_domain);
|
||||||
enum snd_soc_bias_level bias;
|
enum snd_soc_bias_level bias;
|
||||||
|
int ret;
|
||||||
|
|
||||||
lockdep_assert_held(&card->dapm_mutex);
|
lockdep_assert_held(&card->dapm_mutex);
|
||||||
|
|
||||||
@ -2029,8 +2030,12 @@ static int dapm_power_widgets(struct snd_soc_card *card, int event)
|
|||||||
|
|
||||||
/* do we need to notify any clients that DAPM event is complete */
|
/* do we need to notify any clients that DAPM event is complete */
|
||||||
list_for_each_entry(d, &card->dapm_list, list) {
|
list_for_each_entry(d, &card->dapm_list, list) {
|
||||||
if (d->stream_event)
|
if (!d->component)
|
||||||
d->stream_event(d, event);
|
continue;
|
||||||
|
|
||||||
|
ret = snd_soc_component_stream_event(d->component, event);
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
pop_dbg(card->dev, card->pop_time,
|
pop_dbg(card->dev, card->pop_time,
|
||||||
|
Loading…
Reference in New Issue
Block a user