topology: Merge lookup for data reference into tplg_copy_data()

Code refactor to reduce function calls. Now tplg_copy_data() can look up
a referenced data element and merge its data.

Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Mengdong Lin 2016-07-15 20:18:11 +08:00 committed by Takashi Iwai
parent bb03d929e8
commit 2481ef315f
4 changed files with 34 additions and 31 deletions

View file

@ -191,12 +191,11 @@ static int tplg_build_widget(snd_tplg_t *tplg,
break;
case SND_TPLG_TYPE_DATA:
if (!ref->elem)
ref->elem = tplg_elem_lookup(&tplg->pdata_list,
ref->id, SND_TPLG_TYPE_DATA);
if (ref->elem)
err = tplg_copy_data(elem, ref->elem);
err = tplg_copy_data(tplg, elem, ref);
if (err < 0)
return err;
break;
default:
break;
}