ASoC: Intel: Skylake: Replace guid_copy() with import_guid()

There is a specific API to treat raw data as GUID, i.e. import_guid().
Use it instead of guid_copy() with explicit casting.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200422130443.38815-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andy Shevchenko 2020-04-22 16:04:43 +03:00 committed by Mark Brown
parent 5d7e0b1516
commit cade2f59e7
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 4 additions and 4 deletions

View File

@ -290,7 +290,7 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, const struct firmware *fw,
goto free_uuid_list;
}
guid_copy(&module->uuid, (guid_t *)&mod_entry->uuid);
import_guid(&module->uuid, mod_entry->uuid);
module->id = (i | (index << 12));
module->is_loadable = mod_entry->type.load_type;

View File

@ -1989,7 +1989,7 @@ static int skl_tplg_get_uuid(struct device *dev, guid_t *guid,
struct snd_soc_tplg_vendor_uuid_elem *uuid_tkn)
{
if (uuid_tkn->token == SKL_TKN_UUID) {
guid_copy(guid, (guid_t *)&uuid_tkn->uuid);
import_guid(guid, uuid_tkn->uuid);
return 0;
}
@ -3376,8 +3376,8 @@ static int skl_tplg_get_manifest_tkn(struct device *dev,
dev_err(dev, "Too many UUID tokens\n");
return -EINVAL;
}
guid_copy(&skl->modules[uuid_index++]->uuid,
(guid_t *)&array->uuid->uuid);
import_guid(&skl->modules[uuid_index++]->uuid,
array->uuid->uuid);
tuple_size += sizeof(*array->uuid);
continue;