diff options
author | Rafael J. Wysocki | 2017-06-22 16:28:35 +0200 |
---|---|---|
committer | Rafael J. Wysocki | 2017-06-22 16:28:35 +0200 |
commit | d07ff6523b1ed24d636365f8479b0db70946dc14 (patch) | |
tree | 802bf35ed93ee4941e193cac24d0888af917913e /drivers/thermal/int340x_thermal | |
parent | ACPI / PM: Ignore spurious SCI wakeups from suspend-to-idle (diff) | |
parent | thermal: int340x_thermal: fix compile after the UUID API switch (diff) | |
download | kernel-qcow2-linux-d07ff6523b1ed24d636365f8479b0db70946dc14.tar.gz kernel-qcow2-linux-d07ff6523b1ed24d636365f8479b0db70946dc14.tar.xz kernel-qcow2-linux-d07ff6523b1ed24d636365f8479b0db70946dc14.zip |
Merge branch 'uuid-types'
Merge branch 'uuid-types' from git://git.infradead.org/users/hch/uuid.git
to satisfy dependencies.
Diffstat (limited to 'drivers/thermal/int340x_thermal')
-rw-r--r-- | drivers/thermal/int340x_thermal/int3400_thermal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c index 9413c4abf0b9..a9ec94ed7a42 100644 --- a/drivers/thermal/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/int340x_thermal/int3400_thermal.c @@ -23,7 +23,7 @@ enum int3400_thermal_uuid { INT3400_THERMAL_MAXIMUM_UUID, }; -static u8 *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = { +static char *int3400_thermal_uuids[INT3400_THERMAL_MAXIMUM_UUID] = { "42A441D6-AE6A-462b-A84B-4A8CE79027D3", "3A95C389-E4B8-4629-A526-C52C88626BAE", "97C68AE7-15FA-499c-B8C9-5DA81D606E0A", @@ -141,10 +141,10 @@ static int int3400_thermal_get_uuids(struct int3400_thermal_priv *priv) } for (j = 0; j < INT3400_THERMAL_MAXIMUM_UUID; j++) { - u8 uuid[16]; + guid_t guid; - acpi_str_to_uuid(int3400_thermal_uuids[j], uuid); - if (!strncmp(uuid, objb->buffer.pointer, 16)) { + guid_parse(int3400_thermal_uuids[j], &guid); + if (guid_equal((guid_t *)objb->buffer.pointer, &guid)) { priv->uuid_bitmap |= (1 << j); break; } |