* [PATCH] ASoC: component: Remove misplaced prefix handling in pin control functions
@ 2021-07-26 19:41 Mark Brown
2021-07-28 8:38 ` Lucas tanure
2021-07-28 23:27 ` Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Mark Brown @ 2021-07-26 19:41 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, Mark Brown, Richard Fitzgerald
When the component level pin control functions were added they for some
no longer obvious reason handled adding prefixing of widget names. This
meant that when the lack of prefix handling in the DAPM level pin
operations was fixed by ae4fc532244b3bb4d (ASoC: dapm: use component
prefix when checking widget names) the one device using the component
level API ended up with the prefix being applied twice, causing all
lookups to fail.
Fix this by removing the redundant prefixing from the component code,
which has the nice side effect of also making that code much simpler.
Reported-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/soc-component.c | 63 +++++++++++++++++----------------------
1 file changed, 27 insertions(+), 36 deletions(-)
diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index 3a5e84e16a87..c8dfd0de30e4 100644
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -148,86 +148,75 @@ int snd_soc_component_set_bias_level(struct snd_soc_component *component,
return soc_component_ret(component, ret);
}
-static int soc_component_pin(struct snd_soc_component *component,
- const char *pin,
- int (*pin_func)(struct snd_soc_dapm_context *dapm,
- const char *pin))
-{
- struct snd_soc_dapm_context *dapm =
- snd_soc_component_get_dapm(component);
- char *full_name;
- int ret;
-
- if (!component->name_prefix) {
- ret = pin_func(dapm, pin);
- goto end;
- }
-
- full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
- if (!full_name) {
- ret = -ENOMEM;
- goto end;
- }
-
- ret = pin_func(dapm, full_name);
- kfree(full_name);
-end:
- return soc_component_ret(component, ret);
-}
-
int snd_soc_component_enable_pin(struct snd_soc_component *component,
const char *pin)
{
- return soc_component_pin(component, pin, snd_soc_dapm_enable_pin);
+ struct snd_soc_dapm_context *dapm =
+ snd_soc_component_get_dapm(component);
+ return snd_soc_dapm_enable_pin(dapm, pin);
}
EXPORT_SYMBOL_GPL(snd_soc_component_enable_pin);
int snd_soc_component_enable_pin_unlocked(struct snd_soc_component *component,
const char *pin)
{
- return soc_component_pin(component, pin, snd_soc_dapm_enable_pin_unlocked);
+ struct snd_soc_dapm_context *dapm =
+ snd_soc_component_get_dapm(component);
+ return snd_soc_dapm_enable_pin_unlocked(dapm, pin);
}
EXPORT_SYMBOL_GPL(snd_soc_component_enable_pin_unlocked);
int snd_soc_component_disable_pin(struct snd_soc_component *component,
const char *pin)
{
- return soc_component_pin(component, pin, snd_soc_dapm_disable_pin);
+ struct snd_soc_dapm_context *dapm =
+ snd_soc_component_get_dapm(component);
+ return snd_soc_dapm_disable_pin(dapm, pin);
}
EXPORT_SYMBOL_GPL(snd_soc_component_disable_pin);
int snd_soc_component_disable_pin_unlocked(struct snd_soc_component *component,
const char *pin)
{
- return soc_component_pin(component, pin, snd_soc_dapm_disable_pin_unlocked);
+ struct snd_soc_dapm_context *dapm =
+ snd_soc_component_get_dapm(component);
+ return snd_soc_dapm_disable_pin_unlocked(dapm, pin);
}
EXPORT_SYMBOL_GPL(snd_soc_component_disable_pin_unlocked);
int snd_soc_component_nc_pin(struct snd_soc_component *component,
const char *pin)
{
- return soc_component_pin(component, pin, snd_soc_dapm_nc_pin);
+ struct snd_soc_dapm_context *dapm =
+ snd_soc_component_get_dapm(component);
+ return snd_soc_dapm_nc_pin(dapm, pin);
}
EXPORT_SYMBOL_GPL(snd_soc_component_nc_pin);
int snd_soc_component_nc_pin_unlocked(struct snd_soc_component *component,
const char *pin)
{
- return soc_component_pin(component, pin, snd_soc_dapm_nc_pin_unlocked);
+ struct snd_soc_dapm_context *dapm =
+ snd_soc_component_get_dapm(component);
+ return snd_soc_dapm_nc_pin_unlocked(dapm, pin);
}
EXPORT_SYMBOL_GPL(snd_soc_component_nc_pin_unlocked);
int snd_soc_component_get_pin_status(struct snd_soc_component *component,
const char *pin)
{
- return soc_component_pin(component, pin, snd_soc_dapm_get_pin_status);
+ struct snd_soc_dapm_context *dapm =
+ snd_soc_component_get_dapm(component);
+ return snd_soc_dapm_get_pin_status(dapm, pin);
}
EXPORT_SYMBOL_GPL(snd_soc_component_get_pin_status);
int snd_soc_component_force_enable_pin(struct snd_soc_component *component,
const char *pin)
{
- return soc_component_pin(component, pin, snd_soc_dapm_force_enable_pin);
+ struct snd_soc_dapm_context *dapm =
+ snd_soc_component_get_dapm(component);
+ return snd_soc_dapm_force_enable_pin(dapm, pin);
}
EXPORT_SYMBOL_GPL(snd_soc_component_force_enable_pin);
@@ -235,7 +224,9 @@ int snd_soc_component_force_enable_pin_unlocked(
struct snd_soc_component *component,
const char *pin)
{
- return soc_component_pin(component, pin, snd_soc_dapm_force_enable_pin_unlocked);
+ struct snd_soc_dapm_context *dapm =
+ snd_soc_component_get_dapm(component);
+ return snd_soc_dapm_force_enable_pin_unlocked(dapm, pin);
}
EXPORT_SYMBOL_GPL(snd_soc_component_force_enable_pin_unlocked);
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ASoC: component: Remove misplaced prefix handling in pin control functions
2021-07-26 19:41 [PATCH] ASoC: component: Remove misplaced prefix handling in pin control functions Mark Brown
@ 2021-07-28 8:38 ` Lucas tanure
2021-07-28 23:27 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Lucas tanure @ 2021-07-28 8:38 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: alsa-devel, Richard Fitzgerald
On 7/26/21 8:41 PM, Mark Brown wrote:
> When the component level pin control functions were added they for some
> no longer obvious reason handled adding prefixing of widget names. This
> meant that when the lack of prefix handling in the DAPM level pin
> operations was fixed by ae4fc532244b3bb4d (ASoC: dapm: use component
> prefix when checking widget names) the one device using the component
> level API ended up with the prefix being applied twice, causing all
> lookups to fail.
>
> Fix this by removing the redundant prefixing from the component code,
> which has the nice side effect of also making that code much simpler.
>
> Reported-by: Richard Fitzgerald <rf@opensource.cirrus.com>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
> sound/soc/soc-component.c | 63 +++++++++++++++++----------------------
> 1 file changed, 27 insertions(+), 36 deletions(-)
>
> diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
> index 3a5e84e16a87..c8dfd0de30e4 100644
> --- a/sound/soc/soc-component.c
> +++ b/sound/soc/soc-component.c
> @@ -148,86 +148,75 @@ int snd_soc_component_set_bias_level(struct snd_soc_component *component,
> return soc_component_ret(component, ret);
> }
>
> -static int soc_component_pin(struct snd_soc_component *component,
> - const char *pin,
> - int (*pin_func)(struct snd_soc_dapm_context *dapm,
> - const char *pin))
> -{
> - struct snd_soc_dapm_context *dapm =
> - snd_soc_component_get_dapm(component);
> - char *full_name;
> - int ret;
> -
> - if (!component->name_prefix) {
> - ret = pin_func(dapm, pin);
> - goto end;
> - }
> -
> - full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
> - if (!full_name) {
> - ret = -ENOMEM;
> - goto end;
> - }
> -
> - ret = pin_func(dapm, full_name);
> - kfree(full_name);
> -end:
> - return soc_component_ret(component, ret);
> -}
> -
> int snd_soc_component_enable_pin(struct snd_soc_component *component,
> const char *pin)
> {
> - return soc_component_pin(component, pin, snd_soc_dapm_enable_pin);
> + struct snd_soc_dapm_context *dapm =
> + snd_soc_component_get_dapm(component);
> + return snd_soc_dapm_enable_pin(dapm, pin);
> }
> EXPORT_SYMBOL_GPL(snd_soc_component_enable_pin);
>
> int snd_soc_component_enable_pin_unlocked(struct snd_soc_component *component,
> const char *pin)
> {
> - return soc_component_pin(component, pin, snd_soc_dapm_enable_pin_unlocked);
> + struct snd_soc_dapm_context *dapm =
> + snd_soc_component_get_dapm(component);
> + return snd_soc_dapm_enable_pin_unlocked(dapm, pin);
> }
> EXPORT_SYMBOL_GPL(snd_soc_component_enable_pin_unlocked);
>
> int snd_soc_component_disable_pin(struct snd_soc_component *component,
> const char *pin)
> {
> - return soc_component_pin(component, pin, snd_soc_dapm_disable_pin);
> + struct snd_soc_dapm_context *dapm =
> + snd_soc_component_get_dapm(component);
> + return snd_soc_dapm_disable_pin(dapm, pin);
> }
> EXPORT_SYMBOL_GPL(snd_soc_component_disable_pin);
>
> int snd_soc_component_disable_pin_unlocked(struct snd_soc_component *component,
> const char *pin)
> {
> - return soc_component_pin(component, pin, snd_soc_dapm_disable_pin_unlocked);
> + struct snd_soc_dapm_context *dapm =
> + snd_soc_component_get_dapm(component);
> + return snd_soc_dapm_disable_pin_unlocked(dapm, pin);
> }
> EXPORT_SYMBOL_GPL(snd_soc_component_disable_pin_unlocked);
>
> int snd_soc_component_nc_pin(struct snd_soc_component *component,
> const char *pin)
> {
> - return soc_component_pin(component, pin, snd_soc_dapm_nc_pin);
> + struct snd_soc_dapm_context *dapm =
> + snd_soc_component_get_dapm(component);
> + return snd_soc_dapm_nc_pin(dapm, pin);
> }
> EXPORT_SYMBOL_GPL(snd_soc_component_nc_pin);
>
> int snd_soc_component_nc_pin_unlocked(struct snd_soc_component *component,
> const char *pin)
> {
> - return soc_component_pin(component, pin, snd_soc_dapm_nc_pin_unlocked);
> + struct snd_soc_dapm_context *dapm =
> + snd_soc_component_get_dapm(component);
> + return snd_soc_dapm_nc_pin_unlocked(dapm, pin);
> }
> EXPORT_SYMBOL_GPL(snd_soc_component_nc_pin_unlocked);
>
> int snd_soc_component_get_pin_status(struct snd_soc_component *component,
> const char *pin)
> {
> - return soc_component_pin(component, pin, snd_soc_dapm_get_pin_status);
> + struct snd_soc_dapm_context *dapm =
> + snd_soc_component_get_dapm(component);
> + return snd_soc_dapm_get_pin_status(dapm, pin);
> }
> EXPORT_SYMBOL_GPL(snd_soc_component_get_pin_status);
>
> int snd_soc_component_force_enable_pin(struct snd_soc_component *component,
> const char *pin)
> {
> - return soc_component_pin(component, pin, snd_soc_dapm_force_enable_pin);
> + struct snd_soc_dapm_context *dapm =
> + snd_soc_component_get_dapm(component);
> + return snd_soc_dapm_force_enable_pin(dapm, pin);
> }
> EXPORT_SYMBOL_GPL(snd_soc_component_force_enable_pin);
>
> @@ -235,7 +224,9 @@ int snd_soc_component_force_enable_pin_unlocked(
> struct snd_soc_component *component,
> const char *pin)
> {
> - return soc_component_pin(component, pin, snd_soc_dapm_force_enable_pin_unlocked);
> + struct snd_soc_dapm_context *dapm =
> + snd_soc_component_get_dapm(component);
> + return snd_soc_dapm_force_enable_pin_unlocked(dapm, pin);
> }
> EXPORT_SYMBOL_GPL(snd_soc_component_force_enable_pin_unlocked);
>
>
Tested-by: Lucas Tanure <tanureal@opensource.cirrus.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ASoC: component: Remove misplaced prefix handling in pin control functions
2021-07-26 19:41 [PATCH] ASoC: component: Remove misplaced prefix handling in pin control functions Mark Brown
2021-07-28 8:38 ` Lucas tanure
@ 2021-07-28 23:27 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2021-07-28 23:27 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown; +Cc: Richard Fitzgerald, alsa-devel
On Mon, 26 Jul 2021 20:41:23 +0100, Mark Brown wrote:
> When the component level pin control functions were added they for some
> no longer obvious reason handled adding prefixing of widget names. This
> meant that when the lack of prefix handling in the DAPM level pin
> operations was fixed by ae4fc532244b3bb4d (ASoC: dapm: use component
> prefix when checking widget names) the one device using the component
> level API ended up with the prefix being applied twice, causing all
> lookups to fail.
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: component: Remove misplaced prefix handling in pin control functions
commit: 31428c78748cafdd9352e1f622eb89bf453d9700
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-28 23:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-26 19:41 [PATCH] ASoC: component: Remove misplaced prefix handling in pin control functions Mark Brown
2021-07-28 8:38 ` Lucas tanure
2021-07-28 23:27 ` Mark Brown
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.