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>

diff --git a/sound/soc/intel/skylake/skl-sst-utils.c b/sound/soc/intel/skylake/skl-sst-utils.c
index d43cbf4a71ef27707a33c4f0f693847afd060491..b233f89517c119b7db9202030d04fb211e7682c8 100644 (file)
--- a/sound/soc/intel/skylake/skl-sst-utils.c
+++ b/sound/soc/intel/skylake/skl-sst-utils.c
@@ -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;

diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 69cd7a81bf2ac26062948dd415cc7950033787ec..43a159f23a10d2bbbe05e4eb6e97395ff3731b63 100644 (file)
--- 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;