ASoC: Intel: Skylake: Replace guid_copy() with import_guid() (cade2f59) · Commits · 戴 / test

sound/soc/intel/skylake/skl-sst-utils.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;