]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
ASoC: soc-dapm: use dapm->component instead of container_of()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 4 Sep 2025 05:21:17 +0000 (05:21 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 18 Sep 2025 21:24:11 +0000 (22:24 +0100)
commit96e311b561a2d393a786a2aeb50cd5e02d06afb3
treecbab7c8f97664e36c09affc2bc1e2d5151c64a68
parentc8df096bca84c9eb04b656015c8430d0b87ebbcf
ASoC: soc-dapm: use dapm->component instead of container_of()

Because struct snd_soc_dapm_context is soc-dapm framework specific, user
driver don't need to access its member directly, we would like to hide
them. struct snd_soc_dapm_context will be removed from header in the
future.

Now, snd_soc_dapm_to_component() (A) will convert dapm to component by
container_of() (a).

(A) static inline struct snd_soc_component *snd_soc_dapm_to_component(
struct snd_soc_dapm_context *dapm)
{
(a) return container_of(dapm, struct snd_soc_component, dapm);
}

dapm of component works, but dapm of card will be "unknown" pointer
(= not NULL), because (a) is using "container_of()".

OTOH, ASoC will call snd_soc_dapm_init() (X) to initialize dapm, and
it will be called from snd_soc_bind_card() (p) (for card) or
soc_probe_component() (q) (for component) with component pointer.

(p) static int snd_soc_bind_card(...)
{
...
(X) snd_soc_dapm_init(..., NULL);
...                    ^^^^
}

(q) static int soc_probe_component(...)
{
...
(X) snd_soc_dapm_init(..., component);
...                 ^^^^^^^^^
}

And snd_soc_dapm_init() (X) will fill dapm->component (x)

(X) void snd_soc_dapm_init(..., component, ...)
{
...
(x) dapm->component = component;
...
}

We can simply use dapm->component in snd_soc_dapm_to_component() (A).
In this case, dapm of card (p) will be just NULL.

Use dapm->component instead of container_of().
The picky note can be removed by this patch.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87a53ax06q.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
include/sound/soc-component.h
include/sound/soc-dapm.h
sound/soc/soc-dapm.c