From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: linux-sound@vger.kernel.org
Subject: [PATCH 04/14] ASoC: soc-component: move snd_soc_component_fixup_controls()
Date: Tue, 29 Sep 2026 05:29:51 +0000 [thread overview]
Message-ID: <87jyo4eib4.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87pkxweibu.wl-kuninori.morimoto.gx@renesas.com>
snd_soc_component_xxx_controls() are located between _probe()
and _remove() in soc-component.c, and are located in scattered
positions in soc-component.h. Fixup them.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
include/sound/soc-component.h | 2 +-
sound/soc/soc-component.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index d83ba2996653e..7708d84af8853 100644
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -355,6 +355,7 @@ void snd_soc_component_init_regmap(struct snd_soc_component *component,
void snd_soc_component_exit_regmap(struct snd_soc_component *component);
#endif
+int snd_soc_component_fixup_controls(struct snd_soc_component *component);
int snd_soc_component_add_controls(struct snd_soc_component *component,
const struct snd_kcontrol_new *controls, unsigned int num_controls);
@@ -404,7 +405,6 @@ void snd_soc_component_suspend(struct snd_soc_component *component);
void snd_soc_component_resume(struct snd_soc_component *component);
int snd_soc_component_is_suspended(struct snd_soc_component *component);
int snd_soc_component_probe(struct snd_soc_component *component);
-int snd_soc_component_fixup_controls(struct snd_soc_component *component);
void snd_soc_component_remove(struct snd_soc_component *component);
int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
struct device_node *ep);
diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index 709d78ee92fd5..6077d07f873f5 100644
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -340,6 +340,12 @@ int snd_soc_component_probe(struct snd_soc_component *component)
return soc_component_ret(component, ret);
}
+void snd_soc_component_remove(struct snd_soc_component *component)
+{
+ if (component->driver->remove)
+ component->driver->remove(component);
+}
+
/**
* snd_soc_component_add_controls - Add an array of controls to a component.
*
@@ -370,12 +376,6 @@ int snd_soc_component_fixup_controls(struct snd_soc_component *component)
return soc_component_ret(component, ret);
}
-void snd_soc_component_remove(struct snd_soc_component *component)
-{
- if (component->driver->remove)
- component->driver->remove(component);
-}
-
int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
struct device_node *ep)
{
--
2.53.0
next prev parent reply other threads:[~2026-09-29 5:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-29 5:29 [PATCH 00/14] ASoC: soc-component: move snd_soc_component_xxx() to soc-component.c Kuninori Morimoto
2026-09-29 5:29 ` [PATCH 01/14] ASoC: soc-component: tidyup be_hw_params_fixup() define position Kuninori Morimoto
2026-09-29 5:29 ` [PATCH 02/14] ASoC: soc-component: replace bool member to bit field Kuninori Morimoto
2026-09-29 5:29 ` [PATCH 03/14] ASoC: soc-component: move snd_soc_add_component_controls() Kuninori Morimoto
2026-09-29 5:29 ` Kuninori Morimoto [this message]
2026-09-29 5:29 ` [PATCH 05/14] ASoC: soc-component: move soc_component_to_node() to soc-component.c Kuninori Morimoto
2026-09-29 5:29 ` [PATCH 06/14] ASoC: soc-component: move snd_soc_is_matching_component() " Kuninori Morimoto
2026-09-29 5:30 ` [PATCH 07/14] ASoC: soc-component: move soc_{probe/remove}_component() " Kuninori Morimoto
2026-09-29 8:24 ` Alvin Šipraga
2026-09-29 23:36 ` Kuninori Morimoto
2026-09-29 5:30 ` [PATCH 08/14] ASoC: soc-component: move snd_soc_component_to_dapm() " Kuninori Morimoto
2026-09-29 5:30 ` [PATCH 09/14] ASoC: soc-component: move snd_soc_component_cache_sync() " Kuninori Morimoto
2026-09-29 5:30 ` [PATCH 10/14] ASoC: soc-component: move snd_soc_component_active() " Kuninori Morimoto
2026-09-29 5:30 ` [PATCH 11/14] ASoC: soc-component: move component_list " Kuninori Morimoto
2026-09-29 5:30 ` [PATCH 12/14] ASoC: soc-component: move snd_soc_lookup_component() " Kuninori Morimoto
2026-09-29 5:30 ` [PATCH 13/14] ASoC: soc-component: move __snd_soc_of_put_component() " Kuninori Morimoto
2026-09-29 5:30 ` [PATCH 14/14] ASoC: soc-component: rename snd_soc_component_async_complete() Kuninori Morimoto
2026-09-29 8:25 ` [PATCH 00/14] ASoC: soc-component: move snd_soc_component_xxx() to soc-component.c Alvin Šipraga
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=87jyo4eib4.wl-kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=broonie@kernel.org \
--cc=linux-sound@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox