diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2018-11-22 00:57:40 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-11-23 14:01:56 +0000 |
| commit | 64ef0817b9679b525f86773e929777be96f5c728 (patch) | |
| tree | 906d3a7eb0427ae14efb7bb7455cee9b622b3b4f /sound | |
| parent | c3830f1a00f0c7b224aa64e99adbdc14e86d78d5 (diff) | |
| download | linux-64ef0817b9679b525f86773e929777be96f5c728.tar.gz linux-64ef0817b9679b525f86773e929777be96f5c728.tar.bz2 linux-64ef0817b9679b525f86773e929777be96f5c728.zip | |
ASoC: audio-graph-card: tidyup define position
commit f986907c9225 ("ASoC: audio-graph-card: add widgets and routing for
external amplifier support") added new function
asoc_graph_card_outdrv_event(), but the inserted position breaks
define area. This patch tidyup it
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/generic/audio-graph-card.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 101c7da2df7c..1b158cc2df88 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -36,6 +36,11 @@ struct graph_card_data { struct gpio_desc *pa_gpio; }; +#define graph_priv_to_card(priv) (&(priv)->snd_card) +#define graph_priv_to_props(priv, i) ((priv)->dai_props + (i)) +#define graph_priv_to_dev(priv) (graph_priv_to_card(priv)->dev) +#define graph_priv_to_link(priv, i) (graph_priv_to_card(priv)->dai_link + (i)) + static int asoc_graph_card_outdrv_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) @@ -63,11 +68,6 @@ static const struct snd_soc_dapm_widget asoc_graph_card_dapm_widgets[] = { SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), }; -#define graph_priv_to_card(priv) (&(priv)->snd_card) -#define graph_priv_to_props(priv, i) ((priv)->dai_props + (i)) -#define graph_priv_to_dev(priv) (graph_priv_to_card(priv)->dev) -#define graph_priv_to_link(priv, i) (graph_priv_to_card(priv)->dai_link + (i)) - static int asoc_graph_card_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; |