|
@@ -485,7 +485,7 @@ typedef u8 acpi_owner_id;
|
|
|
/*
|
|
|
* 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_DO_NOT_WAIT 0
|
|
|
|
|
@@ -536,9 +536,9 @@ typedef u64 acpi_integer;
|
|
|
|
|
|
/* Pointer/Integer type conversions */
|
|
|
|
|
|
-#define ACPI_TO_POINTER(i) ACPI_ADD_PTR (void, (void *) NULL,(acpi_size) i)
|
|
|
-#define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p, (void *) NULL)
|
|
|
-#define ACPI_OFFSET(d, f) ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) NULL)
|
|
|
+#define ACPI_TO_POINTER(i) ACPI_ADD_PTR (void, (void *) 0, (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)
|
|
|
#define ACPI_PTR_TO_PHYSADDR(i) ACPI_TO_INTEGER(i)
|
|
|
|