ASoC: core: Add component pin control functions

It's often the case that a codec driver will need to control its
own pins. However, if a name_prefix has been applied to this codec it
must be included in the name passed to any of the snd_soc_dapm_x_pin()
functions.

The behaviour of the existing pin control functions is reasonable, since
you may want to search for a fully-specified name within the scope of an
entire card. This means that we can't apply the prefix in these functions
because it will break card-scope searches.

Constructing a prefixed string "manually" in codec drivers leads to a lot
of repetition of the same code.

To make this tidier in codec drivers this patch adds a new set of
equivalent functions that take a struct snd_soc_component instead of a
dapm context and automatically add the component's name_prefix to the
given name. This makes it a simple change in codec drivers to be
prefix-safe.

The new functions are not quite trivial enough to be inlines and the
compiler won't be able to compile-away any part of them.

Although it looks somewhat inefficient to have to allocate a temporary
buffer and combine strings, the current design of the widget list
doesn't lend itself to a more optimized implementation - it's a single
list of all widgets on a card and is searched linearly for a matching
string. As pin state changes are generally low-frequency events it's
unlikely to be a significant issue - at least not enough to rewrite the
widget list handling just for this.

Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 4f1c784e44f634016153b3ff4f0a1b7d3b652b95..a26c651cb1ee88fa2696a19ca572b23b00d75347 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1697,4 +1697,24 @@ static inline void snd_soc_dapm_mutex_unlock(struct snd_soc_dapm_context *dapm)
        mutex_unlock(&dapm->card->dapm_mutex);
 }
 
+int snd_soc_component_enable_pin(struct snd_soc_component *component,
+                                const char *pin);
+int snd_soc_component_enable_pin_unlocked(struct snd_soc_component *component,
+                                         const char *pin);
+int snd_soc_component_disable_pin(struct snd_soc_component *component,
+                                 const char *pin);
+int snd_soc_component_disable_pin_unlocked(struct snd_soc_component *component,
+                                          const char *pin);
+int snd_soc_component_nc_pin(struct snd_soc_component *component,
+                            const char *pin);
+int snd_soc_component_nc_pin_unlocked(struct snd_soc_component *component,
+                                     const char *pin);
+int snd_soc_component_get_pin_status(struct snd_soc_component *component,
+                                    const char *pin);
+int snd_soc_component_force_enable_pin(struct snd_soc_component *component,
+                                      const char *pin);
+int snd_soc_component_force_enable_pin_unlocked(
+                                       struct snd_soc_component *component,
+                                       const char *pin);
+
 #endif

diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c
index 393e8f0fe2cc6902c4bfaf7a54519496c2d073a5..644d9a9ebfbc592f7fabf677bd8d721cee8b3196 100644 (file)
--- a/sound/soc/soc-utils.c
+++ b/sound/soc/soc-utils.c
@@ -58,6 +58,205 @@ int snd_soc_params_to_bclk(struct snd_pcm_hw_params *params)
 }
 EXPORT_SYMBOL_GPL(snd_soc_params_to_bclk);
 
+int snd_soc_component_enable_pin(struct snd_soc_component *component,
+                                const char *pin)
+{
+       struct snd_soc_dapm_context *dapm =
+               snd_soc_component_get_dapm(component);
+       char *full_name;
+       int ret;
+
+       if (!component->name_prefix)
+               return snd_soc_dapm_enable_pin(dapm, pin);
+
+       full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+       if (!full_name)
+               return -ENOMEM;
+
+       ret = snd_soc_dapm_enable_pin(dapm, full_name);
+       kfree(full_name);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_enable_pin);
+
+int snd_soc_component_enable_pin_unlocked(struct snd_soc_component *component,
+                                         const char *pin)
+{
+       struct snd_soc_dapm_context *dapm =
+               snd_soc_component_get_dapm(component);
+       char *full_name;
+       int ret;
+
+       if (!component->name_prefix)
+               return snd_soc_dapm_enable_pin_unlocked(dapm, pin);
+
+       full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+       if (!full_name)
+               return -ENOMEM;
+
+       ret = snd_soc_dapm_enable_pin_unlocked(dapm, full_name);
+       kfree(full_name);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_enable_pin_unlocked);
+
+int snd_soc_component_disable_pin(struct snd_soc_component *component,
+                                 const char *pin)
+{
+       struct snd_soc_dapm_context *dapm =
+               snd_soc_component_get_dapm(component);
+       char *full_name;
+       int ret;
+
+       if (!component->name_prefix)
+               return snd_soc_dapm_disable_pin(dapm, pin);
+
+       full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+       if (!full_name)
+               return -ENOMEM;
+
+       ret = snd_soc_dapm_disable_pin(dapm, full_name);
+       kfree(full_name);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_disable_pin);
+
+int snd_soc_component_disable_pin_unlocked(struct snd_soc_component *component,
+                                          const char *pin)
+{
+       struct snd_soc_dapm_context *dapm =
+               snd_soc_component_get_dapm(component);
+       char *full_name;
+       int ret;
+
+       if (!component->name_prefix)
+               return snd_soc_dapm_disable_pin_unlocked(dapm, pin);
+
+       full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+       if (!full_name)
+               return -ENOMEM;
+
+       ret = snd_soc_dapm_disable_pin_unlocked(dapm, full_name);
+       kfree(full_name);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_disable_pin_unlocked);
+
+int snd_soc_component_nc_pin(struct snd_soc_component *component,
+                            const char *pin)
+{
+       struct snd_soc_dapm_context *dapm =
+               snd_soc_component_get_dapm(component);
+       char *full_name;
+       int ret;
+
+       if (!component->name_prefix)
+               return snd_soc_dapm_nc_pin(dapm, pin);
+
+       full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+       if (!full_name)
+               return -ENOMEM;
+
+       ret = snd_soc_dapm_nc_pin(dapm, full_name);
+       kfree(full_name);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_nc_pin);
+
+int snd_soc_component_nc_pin_unlocked(struct snd_soc_component *component,
+                                     const char *pin)
+{
+       struct snd_soc_dapm_context *dapm =
+               snd_soc_component_get_dapm(component);
+       char *full_name;
+       int ret;
+
+       if (!component->name_prefix)
+               return snd_soc_dapm_nc_pin_unlocked(dapm, pin);
+
+       full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+       if (!full_name)
+               return -ENOMEM;
+
+       ret = snd_soc_dapm_nc_pin_unlocked(dapm, full_name);
+       kfree(full_name);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_nc_pin_unlocked);
+
+int snd_soc_component_get_pin_status(struct snd_soc_component *component,
+                                    const char *pin)
+{
+       struct snd_soc_dapm_context *dapm =
+               snd_soc_component_get_dapm(component);
+       char *full_name;
+       int ret;
+
+       if (!component->name_prefix)
+               return snd_soc_dapm_get_pin_status(dapm, pin);
+
+       full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+       if (!full_name)
+               return -ENOMEM;
+
+       ret = snd_soc_dapm_get_pin_status(dapm, full_name);
+       kfree(full_name);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_get_pin_status);
+
+int snd_soc_component_force_enable_pin(struct snd_soc_component *component,
+                                      const char *pin)
+{
+       struct snd_soc_dapm_context *dapm =
+               snd_soc_component_get_dapm(component);
+       char *full_name;
+       int ret;
+
+       if (!component->name_prefix)
+               return snd_soc_dapm_force_enable_pin(dapm, pin);
+
+       full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+       if (!full_name)
+               return -ENOMEM;
+
+       ret = snd_soc_dapm_force_enable_pin(dapm, full_name);
+       kfree(full_name);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_force_enable_pin);
+
+int snd_soc_component_force_enable_pin_unlocked(
+                                       struct snd_soc_component *component,
+                                       const char *pin)
+{
+       struct snd_soc_dapm_context *dapm =
+               snd_soc_component_get_dapm(component);
+       char *full_name;
+       int ret;
+
+       if (!component->name_prefix)
+               return snd_soc_dapm_force_enable_pin_unlocked(dapm, pin);
+
+       full_name = kasprintf(GFP_KERNEL, "%s %s", component->name_prefix, pin);
+       if (!full_name)
+               return -ENOMEM;
+
+       ret = snd_soc_dapm_force_enable_pin_unlocked(dapm, full_name);
+       kfree(full_name);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_force_enable_pin_unlocked);
+
 static const struct snd_pcm_hardware dummy_dma_hardware = {
        /* Random values to keep userspace happy when checking constraints */
        .info                   = SNDRV_PCM_INFO_INTERLEAVED |