]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ASoC: simple-card-utils: add asoc_simple_card_set_dailink_name()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 11 Jul 2016 23:57:14 +0000 (23:57 +0000)
committerMark Brown <broonie@kernel.org>
Sat, 16 Jul 2016 12:03:01 +0000 (13:03 +0100)
Current simple-card is creating dai_link->name / dai_link->stream_name.
These are based on CPU + Codec name, or "fe.CPU" or "be.Codec" if it
was DPCM.
This patch adds asoc_simple_card_set_dailink_name() and set dailink
name as common method.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
include/sound/simple_card_utils.h
sound/soc/generic/simple-card-utils.c

index 50aa7b22a94c80acdf720fa317e8f6c70b1d17fe..b88a8dcfe4ba6f8f4e61cfa729b88d2ce03629c8 100644 (file)
@@ -27,5 +27,8 @@ int asoc_simple_card_parse_daifmt(struct device *dev,
                                  struct device_node *codec,
                                  char *prefix,
                                  unsigned int *retfmt);
+int asoc_simple_card_set_dailink_name(struct device *dev,
+                                     struct snd_soc_dai_link *dai_link,
+                                     const char *fmt, ...);
 
 #endif /* __SIMPLE_CARD_CORE_H */
index 3f6b72526f71926ed1fcd1509ea64e621b47f0ab..48c73660b66ae38af3d180580f84ba152faa78b5 100644 (file)
@@ -52,3 +52,26 @@ int asoc_simple_card_parse_daifmt(struct device *dev,
        return 0;
 }
 EXPORT_SYMBOL_GPL(asoc_simple_card_parse_daifmt);
+
+int asoc_simple_card_set_dailink_name(struct device *dev,
+                                     struct snd_soc_dai_link *dai_link,
+                                     const char *fmt, ...)
+{
+       va_list ap;
+       char *name = NULL;
+       int ret = -ENOMEM;
+
+       va_start(ap, fmt);
+       name = devm_kvasprintf(dev, GFP_KERNEL, fmt, ap);
+       va_end(ap);
+
+       if (name) {
+               ret = 0;
+
+               dai_link->name          = name;
+               dai_link->stream_name   = name;
+       }
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(asoc_simple_card_set_dailink_name);