diff options
| author | Shreyas NC <shreyas.nc@intel.com> | 2016-04-21 11:45:22 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-04-21 17:09:03 +0100 |
| commit | 09305da97c7808b900985526aa9198233f32fb37 (patch) | |
| tree | 56abc364a09ec212b0553592d9b2ea5a0f686f4f /sound/soc/intel/skylake/skl-sst.c | |
| parent | 92eb4f62cbac0211e43ee4a6715ee2ea43167e88 (diff) | |
| download | linux-09305da97c7808b900985526aa9198233f32fb37.tar.bz2 | |
ASoC: Intel: Skylake: Use UUID in binary format
To avoid complex string manipulations with UUID in canonical
form, use UUID in binary format.
Signed-off-by: Shreyas NC <shreyas.nc@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/skylake/skl-sst.c')
| -rw-r--r-- | sound/soc/intel/skylake/skl-sst.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/intel/skylake/skl-sst.c b/sound/soc/intel/skylake/skl-sst.c index 348a734f8e24..bec4a7c486fd 100644 --- a/sound/soc/intel/skylake/skl-sst.c +++ b/sound/soc/intel/skylake/skl-sst.c @@ -20,6 +20,7 @@ #include <linux/delay.h> #include <linux/device.h> #include <linux/err.h> +#include <linux/uuid.h> #include "../common/sst-dsp.h" #include "../common/sst-dsp-priv.h" #include "../common/sst-ipc.h" @@ -304,14 +305,16 @@ static int skl_transfer_module(struct sst_dsp *ctx, return ret; } -static int skl_load_module(struct sst_dsp *ctx, u16 mod_id, char *guid) +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; - snprintf(mod_name, sizeof(mod_name), "%s%s%s", - "intel/dsp_fw_", guid, ".bin"); + uuid_mod = (uuid_le *)guid; + snprintf(mod_name, sizeof(mod_name), "%s%pUL%s", + "intel/dsp_fw_", uuid_mod, ".bin"); module_entry = skl_module_get_from_id(ctx, mod_id); if (module_entry == NULL) { |