Re: [PATCH v1] ACPI: Switch to use generic UUID API
From: Zhang Rui <rui.zhang@intel.com>
Date: 2017-05-10 01:21:01
Also in:
alsa-devel, intel-gfx, linux-acpi, linux-input, linux-iommu, linux-mmc, linux-pci, lkml, nouveau
On Thu, 2017-05-04 at 12:21 +0300, Andy Shevchenko wrote:
quoted hunk ↗ jump to hunk
acpi_evaluate_dsm() and friends take a pointer to a raw buffer of 16 bytes. Instead we convert them to use uuid_le type. At the same time we convert current users. acpi_str_to_uuid() becomes useless after the conversion and it's safe to get rid of it. The conversion fixes a potential bug in int340x_thermal as well since we have to use memcmp() on binary data. Cc: Rafael J. Wysocki <redacted> Cc: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: Borislav Petkov <redacted> Cc: Dan Williams <redacted> Cc: Amir Goldstein <amir73il@gmail.com> Cc: Jarkko Sakkinen <redacted> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Ben Skeggs <redacted> Cc: Benjamin Tissoires <redacted> Cc: Joerg Roedel <joro@8bytes.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Yisen Zhuang <redacted> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Zhang Rui <rui.zhang@intel.com> Cc: Felipe Balbi <balbi@kernel.org> Cc: Mathias Nyman <mathias.nyman@intel.com> Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Mark Brown <broonie@kernel.org> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> ---diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.cb/drivers/thermal/int340x_thermal/int3400_thermal.c index 9413c4abf0b9..c0eb3bb19b23 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 const 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(structint3400_thermal_priv *priv) } for (j = 0; j < INT3400_THERMAL_MAXIMUM_UUID; j++) { - u8 uuid[16]; + uuid_le u; - acpi_str_to_uuid(int3400_thermal_uuids[j], uuid); - if (!strncmp(uuid, objb->buffer.pointer, 16)) { + uuid_le_to_bin(int3400_thermal_uuids[j], &u); + if (!uuid_le_cmp(*(uuid_le *)objb-quoted
buffer.pointer), u) {priv->uuid_bitmap |= (1 << j); break; }
thanks for the fix. Acked-by: Zhang Rui <rui.zhang@intel.com> -rui