diff options
| author | Shreyas NC | 2016-04-21 08:15:22 +0200 |
|---|---|---|
| committer | Mark Brown | 2016-04-21 18:09:03 +0200 |
| commit | 09305da97c7808b900985526aa9198233f32fb37 (patch) | |
| tree | 56abc364a09ec212b0553592d9b2ea5a0f686f4f /sound/soc/intel/skylake/skl-topology.c | |
| parent | ASoC: Intel: Bxtn: Add Broxton DSP support (diff) | |
| download | kernel-qcow2-linux-09305da97c7808b900985526aa9198233f32fb37.tar.gz kernel-qcow2-linux-09305da97c7808b900985526aa9198233f32fb37.tar.xz kernel-qcow2-linux-09305da97c7808b900985526aa9198233f32fb37.zip | |
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-topology.c')
| -rw-r--r-- | sound/soc/intel/skylake/skl-topology.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 545b4e77b8aa..4f27d82be0ed 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -1550,6 +1550,8 @@ static int skl_tplg_widget_load(struct snd_soc_component *cmpnt, return -ENOMEM; w->priv = mconfig; + memcpy(&mconfig->guid, &dfw_config->uuid, 16); + mconfig->id.module_id = dfw_config->module_id; mconfig->id.instance_id = dfw_config->instance_id; mconfig->mcps = dfw_config->max_mcps; @@ -1579,10 +1581,6 @@ static int skl_tplg_widget_load(struct snd_soc_component *cmpnt, mconfig->time_slot = dfw_config->time_slot; mconfig->formats_config.caps_size = dfw_config->caps.caps_size; - if (dfw_config->is_loadable) - memcpy(mconfig->guid, dfw_config->uuid, - ARRAY_SIZE(dfw_config->uuid)); - mconfig->m_in_pin = devm_kzalloc(bus->dev, (mconfig->max_in_queue) * sizeof(*mconfig->m_in_pin), GFP_KERNEL); |