diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-03 14:13:44 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-03 14:13:44 +0200 |
| commit | 875aabf52e21f84cb6700a760dc734c260c54e7e (patch) | |
| tree | 6c5b012dc066ef584cd5ba31fab1b7381db08281 /sound/soc/intel/skylake/skl-nhlt.c | |
| parent | c0bc126f97fb929b3ae02c1c62322645d70eb408 (diff) | |
| parent | 87085ff2e90ecfa91f8bb0cb0ce19ea661bd6f83 (diff) | |
| download | linux-875aabf52e21f84cb6700a760dc734c260c54e7e.tar.bz2 | |
Merge branch 'uuid-types'
Merge 'uuid-types' from git://git.infradead.org/users/hch/uuid.git
Diffstat (limited to 'sound/soc/intel/skylake/skl-nhlt.c')
| -rw-r--r-- | sound/soc/intel/skylake/skl-nhlt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/intel/skylake/skl-nhlt.c b/sound/soc/intel/skylake/skl-nhlt.c index e3f06672fd6d..e7d766d56c8e 100644 --- a/sound/soc/intel/skylake/skl-nhlt.c +++ b/sound/soc/intel/skylake/skl-nhlt.c @@ -21,8 +21,9 @@ #include "skl.h" /* Unique identification for getting NHLT blobs */ -static u8 OSC_UUID[16] = {0x6E, 0x88, 0x9F, 0xA6, 0xEB, 0x6C, 0x94, 0x45, - 0xA4, 0x1F, 0x7B, 0x5D, 0xCE, 0x24, 0xC5, 0x53}; +static guid_t osc_guid = + GUID_INIT(0xA69F886E, 0x6CEB, 0x4594, + 0xA4, 0x1F, 0x7B, 0x5D, 0xCE, 0x24, 0xC5, 0x53); struct nhlt_acpi_table *skl_nhlt_init(struct device *dev) { @@ -37,7 +38,7 @@ struct nhlt_acpi_table *skl_nhlt_init(struct device *dev) return NULL; } - obj = acpi_evaluate_dsm(handle, OSC_UUID, 1, 1, NULL); + obj = acpi_evaluate_dsm(handle, &osc_guid, 1, 1, NULL); if (obj && obj->type == ACPI_TYPE_BUFFER) { nhlt_ptr = (struct nhlt_resource_desc *)obj->buffer.pointer; nhlt_table = (struct nhlt_acpi_table *) |