mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
ACPICA: Avoid NULL pointer arithmetic
We should not assume NULL is defined as "(void *)0" because NULL is an implementation-defined macro. Especially, Clang 6 complains about it, i.e., "arithmetic on a null pointer treated as a cast from integer to pointer is a GNU extension". Signed-off-by: Jung-uk Kim <jkim@free_BSD.org> Signed-off-by: Erik Schmauss <erik.schmauss@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
0eedae8e5f
commit
761f0b8239
1 changed files with 4 additions and 4 deletions
|
@ -485,7 +485,7 @@ typedef u8 acpi_owner_id;
|
||||||
/*
|
/*
|
||||||
* Constants with special meanings
|
* Constants with special meanings
|
||||||
*/
|
*/
|
||||||
#define ACPI_ROOT_OBJECT ACPI_ADD_PTR (acpi_handle, NULL, ACPI_MAX_PTR)
|
#define ACPI_ROOT_OBJECT ACPI_ADD_PTR (acpi_handle, (void *) 0, ACPI_MAX_PTR)
|
||||||
#define ACPI_WAIT_FOREVER 0xFFFF /* u16, as per ACPI spec */
|
#define ACPI_WAIT_FOREVER 0xFFFF /* u16, as per ACPI spec */
|
||||||
#define ACPI_DO_NOT_WAIT 0
|
#define ACPI_DO_NOT_WAIT 0
|
||||||
|
|
||||||
|
@ -536,9 +536,9 @@ typedef u64 acpi_integer;
|
||||||
|
|
||||||
/* Pointer/Integer type conversions */
|
/* Pointer/Integer type conversions */
|
||||||
|
|
||||||
#define ACPI_TO_POINTER(i) ACPI_ADD_PTR (void, (void *) NULL,(acpi_size) i)
|
#define ACPI_TO_POINTER(i) ACPI_ADD_PTR (void, (void *) 0, (acpi_size) (i))
|
||||||
#define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p, (void *) NULL)
|
#define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p, (void *) 0)
|
||||||
#define ACPI_OFFSET(d, f) ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) NULL)
|
#define ACPI_OFFSET(d, f) ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) 0)
|
||||||
#define ACPI_PHYSADDR_TO_PTR(i) ACPI_TO_POINTER(i)
|
#define ACPI_PHYSADDR_TO_PTR(i) ACPI_TO_POINTER(i)
|
||||||
#define ACPI_PTR_TO_PHYSADDR(i) ACPI_TO_INTEGER(i)
|
#define ACPI_PTR_TO_PHYSADDR(i) ACPI_TO_INTEGER(i)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue