diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2020-04-22 16:04:43 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-04-23 15:45:31 +0100 |
| commit | cade2f59e7ae3d1ccec9c1e0e971308ca6a74296 (patch) | |
| tree | 91d4b15da8984177768739bfe9022b38f82c1eb9 /sound/soc/intel/skylake/skl-topology.c | |
| parent | 5d7e0b1516dfc5901d1e394f17eb55b360e7d3d3 (diff) | |
| download | linux-cade2f59e7ae3d1ccec9c1e0e971308ca6a74296.tar.bz2 | |
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>
Diffstat (limited to 'sound/soc/intel/skylake/skl-topology.c')
| -rw-r--r-- | sound/soc/intel/skylake/skl-topology.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 69cd7a81bf2a..43a159f23a10 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -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; |