On 6/19/19 5:02 PM, Andy Shevchenko wrote:
Switch the driver to use modern UUID API, i.e. guid_t type and accompanying functions, such as guid_equal().
Cc: Liam Girdwood lgirdwood@gmail.com Cc: Mark Brown broonie@kernel.org Cc: Vinod Koul vkoul@kernel.org Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
Looks good to me - couple of nit-picks below on unrelated indentation changes.
Reviewed-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
@@ -247,7 +241,6 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, const struct firmware *fw, struct adsp_fw_hdr *adsp_hdr; struct adsp_module_entry *mod_entry; int i, num_entry, size;
- uuid_le *uuid_bin; const char *buf; struct skl_sst *skl = ctx->thread_context; struct uuid_module *module;
@@ -279,8 +272,7 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, const struct firmware *fw, return -EINVAL; }
- mod_entry = (struct adsp_module_entry *)
(buf + offset + adsp_hdr->len);
- mod_entry = (struct adsp_module_entry *)(buf + offset + adsp_hdr->len);
this really has nothing to do with the guid change, could be a separate patch in a perfect world.
diff --git a/sound/soc/intel/skylake/skl-sst.c b/sound/soc/intel/skylake/skl-sst.c index 5951bbdf1f1a..13c636dece56 100644 --- a/sound/soc/intel/skylake/skl-sst.c +++ b/sound/soc/intel/skylake/skl-sst.c @@ -420,11 +420,9 @@ static int skl_load_module(struct sst_dsp *ctx, u16 mod_id, u8 *guid) struct skl_module_table *module_entry = NULL; int ret = 0; char mod_name[64]; /* guid str = 32 chars + 4 hyphens */
uuid_le *uuid_mod;
uuid_mod = (uuid_le *)guid; snprintf(mod_name, sizeof(mod_name), "%s%pUL%s",
"intel/dsp_fw_", uuid_mod, ".bin");
"intel/dsp_fw_", guid, ".bin");
indentation looks off, not sure if this is a diff effect.