From: Bob Moore Date: Fri, 16 Aug 2019 21:43:22 +0000 (-0700) Subject: ACPICA: Macros: remove pointer math on a null pointer X-Git-Tag: v5.15~5516^2~2^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=779cc7ce3dc519b05f274b79fb5a6c1703f373b5;p=platform%2Fkernel%2Flinux-starfive.git ACPICA: Macros: remove pointer math on a null pointer ACPICA commit 02bbca5070e42d298c9b824300aa0eb8a082d797 Causes warnings on some compilers and/or tools. Changed ACPI_TO_POINTER to use ACPI_CAST_PTR instead of using arithmetic. Link: https://github.com/acpica/acpica/commit/02bbca50 Reported-by: Qian Cai Signed-off-by: Bob Moore Signed-off-by: Erik Schmauss Signed-off-by: Rafael J. Wysocki --- diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index e31ef75..f52c83e 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h @@ -506,7 +506,7 @@ typedef u64 acpi_integer; /* Pointer/Integer type conversions */ -#define ACPI_TO_POINTER(i) ACPI_ADD_PTR (void, (void *) 0, (acpi_size) (i)) +#define ACPI_TO_POINTER(i) ACPI_CAST_PTR (void, (acpi_size) (i)) #define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p, (void *) 0) #define ACPI_OFFSET(d, f) ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) 0) #define ACPI_PHYSADDR_TO_PTR(i) ACPI_TO_POINTER(i)