Many still remain. Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> --- include/acpi/actypes.h | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 153f12d..c1a0eb4 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h @@ -167,7 +167,7 @@ typedef u64 acpi_physical_address; * Note: Em64_t and other X86-64 processors support misaligned transfers, * so there is no need to define this flag. */ -#if defined (__IA64__) || defined (__ia64__) +#if defined(__IA64__) || defined(__ia64__) #define ACPI_MISALIGNMENT_NOT_SUPPORTED #endif @@ -242,10 +242,10 @@ typedef u32 acpi_physical_address; * Map the OSL Mutex interfaces to binary semaphores. */ #define acpi_mutex acpi_semaphore -#define acpi_os_create_mutex(out_handle) acpi_os_create_semaphore (1, 1, out_handle) -#define acpi_os_delete_mutex(handle) (void) acpi_os_delete_semaphore (handle) -#define acpi_os_acquire_mutex(handle,time) acpi_os_wait_semaphore (handle, 1, time) -#define acpi_os_release_mutex(handle) (void) acpi_os_signal_semaphore (handle, 1) +#define acpi_os_create_mutex(out_handle) acpi_os_create_semaphore(1, 1, out_handle) +#define acpi_os_delete_mutex(handle) (void) acpi_os_delete_semaphore(handle) +#define acpi_os_acquire_mutex(handle, time) acpi_os_wait_semaphore(handle, 1, time) +#define acpi_os_release_mutex(handle) (void) acpi_os_signal_semaphore(handle, 1) #endif /* Configurable types for synchronization objects */ @@ -417,7 +417,7 @@ typedef unsigned long long acpi_integer; /* * 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, NULL, ACPI_MAX_PTR) #define ACPI_WAIT_FOREVER 0xFFFF /* u16, as per ACPI spec */ #define ACPI_DO_NOT_WAIT 0 @@ -438,8 +438,8 @@ typedef unsigned long long acpi_integer; #define ACPI_SET_BIT(target,bit) ((target) |= (bit)) #define ACPI_CLEAR_BIT(target,bit) ((target) &= ~(bit)) -#define ACPI_MIN(a,b) (((a)<(b))?(a):(b)) -#define ACPI_MAX(a,b) (((a)>(b))?(a):(b)) +#define ACPI_MIN(a, b) (((a)<(b))?(a):(b)) +#define ACPI_MAX(a, b) (((a)>(b))?(a):(b)) /* Size calculation */ @@ -449,21 +449,21 @@ typedef unsigned long long acpi_integer; #define ACPI_CAST_PTR(t, p) ((t *) (acpi_uintptr_t) (p)) #define ACPI_CAST_INDIRECT_PTR(t, p) ((t **) (acpi_uintptr_t) (p)) -#define ACPI_ADD_PTR(t, a, b) ACPI_CAST_PTR (t, (ACPI_CAST_PTR (u8, (a)) + (acpi_size)(b))) -#define ACPI_PTR_DIFF(a, b) (acpi_size) (ACPI_CAST_PTR (u8, (a)) - ACPI_CAST_PTR (u8, (b))) +#define ACPI_ADD_PTR(t, a, b) ACPI_CAST_PTR(t, (ACPI_CAST_PTR(u8, (a)) + (acpi_size)(b))) +#define ACPI_PTR_DIFF(a, b) (acpi_size) (ACPI_CAST_PTR(u8, (a)) - ACPI_CAST_PTR(u8, (b))) /* 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_size) ACPI_PTR_DIFF (&(((d *)0)->f), (void *) NULL) +#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_size) ACPI_PTR_DIFF(&(((d *)0)->f), (void *) NULL) #define ACPI_PHYSADDR_TO_PTR(i) ACPI_TO_POINTER(i) #define ACPI_PTR_TO_PHYSADDR(i) ACPI_TO_INTEGER(i) #ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED -#define ACPI_COMPARE_NAME(a,b) (*ACPI_CAST_PTR (u32, (a)) == *ACPI_CAST_PTR (u32, (b))) +#define ACPI_COMPARE_NAME(a, b) (*ACPI_CAST_PTR(u32, (a)) == *ACPI_CAST_PTR(u32, (b))) #else -#define ACPI_COMPARE_NAME(a,b) (!ACPI_STRNCMP (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAME_SIZE)) +#define ACPI_COMPARE_NAME(a, b) (!ACPI_STRNCMP(ACPI_CAST_PTR(char, (a)), ACPI_CAST_PTR(char, (b)), ACPI_NAME_SIZE)) #endif /******************************************************************************* @@ -631,7 +631,7 @@ typedef u32 acpi_event_type; #define ACPI_EVENT_SLEEP_BUTTON 3 #define ACPI_EVENT_RTC 4 #define ACPI_EVENT_MAX 4 -#define ACPI_NUM_FIXED_EVENTS ACPI_EVENT_MAX + 1 +#define ACPI_NUM_FIXED_EVENTS (ACPI_EVENT_MAX + 1) /* * Event Status - Per event @@ -778,7 +778,7 @@ typedef u8 acpi_adr_space_type; #define ACPI_BITREG_ARB_DISABLE 0x13 #define ACPI_BITREG_MAX 0x13 -#define ACPI_NUM_BITREG ACPI_BITREG_MAX + 1 +#define ACPI_NUM_BITREG (ACPI_BITREG_MAX + 1) /* Status register values. A 1 clears a status bit. 0 = no effect */ @@ -945,7 +945,7 @@ typedef acpi_status(*acpi_adr_space_handler) (u32 function, acpi_physical_address address, u32 bit_width, - acpi_integer * value, + acpi_integer *value, void *handler_context, void *region_context); -- 1.6.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
