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>,
	"Sridharan, Ranjani" <ranjani.sridharan@intel.com>
Subject: [PATCH resend 02/11] ASoC: soc-core: merge snd_soc_initialize_card_lists()
Date: 20 Aug 2019 14:04:54 +0900	[thread overview]
Message-ID: <877e781ldq.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87a7c41lf1.wl-kuninori.morimoto.gx@renesas.com>

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

snd_soc_initialize_card_lists() is doing card related
INIT_LIST_HEAD(), but, it is already doing at
snd_soc_register_card(). We don't need to do it separately.
This patch merges these.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
---
v2 -> v3

	- add Ranjani's Reviewed-by

 include/sound/soc.h  | 10 ----------
 sound/soc/soc-core.c | 13 ++++++++-----
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 5c841c2..f264c65 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1220,16 +1220,6 @@ static inline void *snd_soc_card_get_drvdata(struct snd_soc_card *card)
 	return card->drvdata;
 }
 
-static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
-{
-	INIT_LIST_HEAD(&card->widgets);
-	INIT_LIST_HEAD(&card->paths);
-	INIT_LIST_HEAD(&card->dapm_list);
-	INIT_LIST_HEAD(&card->aux_comp_list);
-	INIT_LIST_HEAD(&card->component_dev_list);
-	INIT_LIST_HEAD(&card->list);
-}
-
 static inline bool snd_soc_volsw_is_stereo(struct soc_mixer_control *mc)
 {
 	if (mc->reg == mc->rreg && mc->shift == mc->rshift)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b3d02e7..0293383 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2369,15 +2369,18 @@ int snd_soc_register_card(struct snd_soc_card *card)
 
 	dev_set_drvdata(card->dev, card);
 
-	snd_soc_initialize_card_lists(card);
-
+	INIT_LIST_HEAD(&card->widgets);
+	INIT_LIST_HEAD(&card->paths);
+	INIT_LIST_HEAD(&card->dapm_list);
+	INIT_LIST_HEAD(&card->aux_comp_list);
+	INIT_LIST_HEAD(&card->component_dev_list);
+	INIT_LIST_HEAD(&card->list);
 	INIT_LIST_HEAD(&card->dai_link_list);
-
 	INIT_LIST_HEAD(&card->rtd_list);
-	card->num_rtd = 0;
-
 	INIT_LIST_HEAD(&card->dapm_dirty);
 	INIT_LIST_HEAD(&card->dobj_list);
+
+	card->num_rtd = 0;
 	card->instantiated = 0;
 	mutex_init(&card->mutex);
 	mutex_init(&card->dapm_mutex);
-- 
2.7.4

  parent reply	other threads:[~2019-08-20  5:04 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-20  5:04 [PATCH resend 00/11] ASoC: soc-core cleanup repost Kuninori Morimoto
2019-08-20  5:04 ` [PATCH resend 01/11] ASoC: soc-core: use device_register() Kuninori Morimoto
2019-08-22 18:32   ` Applied "ASoC: soc-core: use device_register()" to the asoc tree Mark Brown
2019-08-20  5:04 ` Kuninori Morimoto [this message]
2019-08-21 12:15   ` Applied "ASoC: soc-core: merge snd_soc_initialize_card_lists()" " Mark Brown
2019-08-20  5:04 ` [PATCH resend 03/11] ASoC: soc-core: remove unneeded dai_link check from snd_soc_remove_dai_link() Kuninori Morimoto
2019-08-21 12:15   ` Applied "ASoC: soc-core: remove unneeded dai_link check from snd_soc_remove_dai_link()" to the asoc tree Mark Brown
2019-08-20  5:05 ` [PATCH resend 04/11] ASoC: soc-core: add NOTE to snd_soc_rtdcom_lookup() Kuninori Morimoto
2019-08-22 18:32   ` Applied "ASoC: soc-core: add NOTE to snd_soc_rtdcom_lookup()" to the asoc tree Mark Brown
2019-08-20  5:05 ` [PATCH resend 05/11] ASoC: soc-core: don't alloc memory carelessly when creating debugfs Kuninori Morimoto
2019-08-22 17:18   ` Mark Brown
2019-08-20  5:05 ` [PATCH resend 06/11] ASoC: soc-core: soc_cleanup_card_resources() become void Kuninori Morimoto
2019-08-22 18:32   ` Applied "ASoC: soc-core: soc_cleanup_card_resources() become void" to the asoc tree Mark Brown
2019-08-20  5:05 ` [PATCH resend 07/11] ASoC: soc-core: initialize component list Kuninori Morimoto
2019-08-22 18:32   ` Applied "ASoC: soc-core: initialize component list" to the asoc tree Mark Brown
2019-08-20  5:05 ` [PATCH resend 08/11] ASoC: soc-core: initialize list at one place Kuninori Morimoto
2019-08-22 18:32   ` Applied "ASoC: soc-core: initialize list at one place" to the asoc tree Mark Brown
2019-08-20  5:05 ` [PATCH resend 08/11] ASoC: soc-core: initialize list at one place Kuninori Morimoto
2019-08-20  5:05 ` [PATCH resend 09/11] ASoC: soc-dai: use bit field for bus_control Kuninori Morimoto
2019-08-22 18:32   ` Applied "ASoC: soc-dai: use bit field for bus_control" to the asoc tree Mark Brown
2019-08-20  5:05 ` [PATCH resend 10/11] ASoC: soc-topology: use for_each_component_dais() at remove_dai() Kuninori Morimoto
2019-08-22 18:32   ` Applied "ASoC: soc-topology: use for_each_component_dais() at remove_dai()" to the asoc tree Mark Brown
2019-08-20  5:05 ` [PATCH resend 10/11] ASoC: soc-topology: use for_each_component_dais() at remove_dai() Kuninori Morimoto
2019-08-20  5:05 ` [PATCH resend 11/11] ASoC: soc-core: add soc_unbind_aux_dev() Kuninori Morimoto

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=877e781ldq.wl-kuninori.morimoto.gx@renesas.com \
    --to=kuninori.morimoto.gx@renesas.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=ranjani.sridharan@intel.com \
    /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.