summaryrefslogtreecommitdiff
path: root/sound/core/compress_offload.c
diff options
context:
space:
mode:
authorRichard Fitzgerald <rf@opensource.wolfsonmicro.com>2015-11-25 13:00:24 +0000
committerTakashi Iwai <tiwai@suse.de>2015-11-30 11:44:59 +0100
commite5241a8c4b22b678dd9b07527ba9f178f02e160e (patch)
tree704b5b132505dd924894f746f1e798b8e5322719 /sound/core/compress_offload.c
parent3174272474862c545d0cb7bf17b25a0f75800966 (diff)
ALSA: compress: Pass id string to snd_compress_new
Make snd_compress_new take an id string (like snd_pcm_new). This string can be included in the procfs info. This patch also updates soc_new_compress() to create an ID based on the stream and dai name, as done for PCM streams. Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com> Acked-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/compress_offload.c')
-rw-r--r--sound/core/compress_offload.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index 1258e9d81fac..2c52510967f0 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -945,6 +945,11 @@ static void snd_compress_proc_done(struct snd_compr *compr)
snd_info_free_entry(compr->proc_root);
compr->proc_root = NULL;
}
+
+static inline void snd_compress_set_id(struct snd_compr *compr, const char *id)
+{
+ strlcpy(compr->id, id, sizeof(compr->id));
+}
#else
static inline int snd_compress_proc_init(struct snd_compr *compr)
{
@@ -954,6 +959,10 @@ static inline int snd_compress_proc_init(struct snd_compr *compr)
static inline void snd_compress_proc_done(struct snd_compr *compr)
{
}
+
+static inline void snd_compress_set_id(struct snd_compr *compr, const char *id)
+{
+}
#endif
static int snd_compress_dev_free(struct snd_device *device)
@@ -974,7 +983,7 @@ static int snd_compress_dev_free(struct snd_device *device)
* @compr: compress device pointer
*/
int snd_compress_new(struct snd_card *card, int device,
- int dirn, struct snd_compr *compr)
+ int dirn, const char *id, struct snd_compr *compr)
{
static struct snd_device_ops ops = {
.dev_free = snd_compress_dev_free,
@@ -987,6 +996,8 @@ int snd_compress_new(struct snd_card *card, int device,
compr->device = device;
compr->direction = dirn;
+ snd_compress_set_id(compr, id);
+
snd_device_initialize(&compr->dev, card);
dev_set_name(&compr->dev, "comprC%iD%i", card->number, device);