All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>
Subject: [PATCH 10/10] ASoC: audio-graph-card: tidyup define position
Date: Thu, 22 Nov 2018 00:57:40 +0000	[thread overview]
Message-ID: <87muq2lyxy.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <871s7endnu.wl-kuninori.morimoto.gx@renesas.com>


From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

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>
---
 sound/soc/generic/audio-graph-card.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 101c7da..1b158cc 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;
-- 
2.7.4

  parent reply	other threads:[~2018-11-22  0:57 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-22  0:54 [PATCH 00/10] ASoC: merge audio-graph-scu into audio-graph - step2 Kuninori Morimoto
2018-11-22  0:55 ` [PATCH 01/10] ASoC: soc-core: add snd_soc_of_parse_node_prefix() Kuninori Morimoto
2018-11-23 13:53   ` Mark Brown
2018-11-26  0:07     ` Kuninori Morimoto
2018-11-23 14:13   ` Applied "ASoC: soc-core: add snd_soc_of_parse_node_prefix()" to the asoc tree Mark Brown
2018-11-22  0:55 ` [PATCH 02/10] ASoC: simple-scu-card: tidyup "prefix" parsing on Doc Kuninori Morimoto
2018-11-23 14:12   ` Applied "ASoC: simple-scu-card: tidyup "prefix" parsing on Doc" to the asoc tree Mark Brown
2018-11-22  0:55 ` [PATCH 03/10] ASoC: simple-scu-card: tidyup "prefix" parsing Kuninori Morimoto
2018-11-23 14:12   ` Applied "ASoC: simple-scu-card: tidyup "prefix" parsing" to the asoc tree Mark Brown
2018-11-22  0:55 ` [PATCH 04/10] ASoC: audio-graph-scu-card: tidyup "prefix" parsing on Doc Kuninori Morimoto
2018-11-23 14:12   ` Applied "ASoC: audio-graph-scu-card: tidyup "prefix" parsing on Doc" to the asoc tree Mark Brown
2018-11-22  0:56 ` [PATCH 05/10] ASoC: audio-graph-scu-card: tidyup "prefix" parsing Kuninori Morimoto
2018-11-23 14:12   ` Applied "ASoC: audio-graph-scu-card: tidyup "prefix" parsing" to the asoc tree Mark Brown
2018-11-22  0:56 ` [PATCH 06/10] ASoC: audio-graph-scu-card: tidyup "convert-rate/channels" parsing on Doc Kuninori Morimoto
2018-11-23 14:12   ` Applied "ASoC: audio-graph-scu-card: tidyup "convert-rate/channels" parsing on Doc" to the asoc tree Mark Brown
2018-11-22  0:56 ` [PATCH 07/10] ASoC: audio-graph-scu-card: tidyup "convert-rate/channels" parsing Kuninori Morimoto
2018-11-23 14:11   ` Applied "ASoC: audio-graph-scu-card: tidyup "convert-rate/channels" parsing" to the asoc tree Mark Brown
2018-11-22  0:57 ` [PATCH 08/10] ASoC: audio-graph-scu-card: tidyup asoc_simple_card_parse_daifmt() timing Kuninori Morimoto
2018-11-23 14:11   ` Applied "ASoC: audio-graph-scu-card: tidyup asoc_simple_card_parse_daifmt() timing" to the asoc tree Mark Brown
2018-11-22  0:57 ` [PATCH 09/10] ASoC: audio-graph-card: tidyup typo SND_AUDIO_GRAPH_CARD Kuninori Morimoto
2018-11-23 14:11   ` Applied "ASoC: audio-graph-card: tidyup typo SND_AUDIO_GRAPH_CARD" to the asoc tree Mark Brown
2018-11-22  0:57 ` Kuninori Morimoto [this message]
2018-11-23 14:11   ` Applied "ASoC: audio-graph-card: tidyup define position" " Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87muq2lyxy.wl-kuninori.morimoto.gx@renesas.com \
    --to=kuninori.morimoto.gx@renesas.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.