leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: SOF: topology: Modify the get_token op for string tokens

Browse Source 
Modify the get_token op for string type tokens to pass the string as the
argument instead of a pointer to struct snd_soc_tplg_vendor_string_elem.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220307181111.49392-9-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ranjani Sridharan 2022-03-07 10:11:01 -08:00 committed by Mark Brown
parent 6a6b5727f8
commit 5ef969e2f8
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/sof/topology.c
View File

@ -507,28 +507,25 @@ static int get_token_uuid(void *elem, void *object, u32 offset)
static int get_token_comp_format(void *elem, void *object, u32 offset)
{
struct snd_soc_tplg_vendor_string_elem *velem = elem;
u32 *val = (u32 *)((u8 *)object + offset);
*val = find_format(velem->string);
*val = find_format((const char *)elem);
return 0;
}
static int get_token_dai_type(void *elem, void *object, u32 offset)
{
struct snd_soc_tplg_vendor_string_elem *velem = elem;
u32 *val = (u32 *)((u8 *)object + offset);
*val = find_dai(velem->string);
*val = find_dai((const char *)elem);
return 0;
}
static int get_token_process_type(void *elem, void *object, u32 offset)
{
struct snd_soc_tplg_vendor_string_elem *velem = elem;
u32 *val = (u32 *)((u8 *)object + offset);
*val = find_process(velem->string);
*val = find_process((const char *)elem);
return 0;
}
@ -872,8 +869,7 @@ static int sof_parse_string_tokens(struct snd_soc_component *scomp,
continue;
/* matched - now load token */
tokens[j].get_token(elem, object,
offset + tokens[j].offset);
tokens[j].get_token(elem->string, object, offset + tokens[j].offset);
found++;
}