aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-05-09 23:34:35 -0400
committerLen Brown <len.brown@intel.com>2007-05-09 23:34:35 -0400
commitfd3509436fde38d4c854bf5a6b83d2c779904f8e (patch)
treeaf3ffbe044021f6781982d14ae0b7b8aafd4b89b /include/acpi
parent88db5e1489f23876a226f5393fd978ddc09dc5f9 (diff)
ACPICA: Lindent
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acdispat.h9
-rw-r--r--include/acpi/acglobal.h2
-rw-r--r--include/acpi/aclocal.h2
-rw-r--r--include/acpi/acnamesp.h6
-rw-r--r--include/acpi/acobject.h2
-rw-r--r--include/acpi/acpi_bus.h9
-rw-r--r--include/acpi/acpi_drivers.h6
-rw-r--r--include/acpi/acpi_numa.h2
-rw-r--r--include/acpi/acpiosxf.h3
-rw-r--r--include/acpi/actypes.h2
-rw-r--r--include/acpi/acutils.h3
-rw-r--r--include/acpi/platform/aclinux.h21
-rw-r--r--include/acpi/processor.h18
13 files changed, 48 insertions, 37 deletions
diff --git a/include/acpi/acdispat.h b/include/acpi/acdispat.h
index cb8d2868c8ac..7f690bb0f02f 100644
--- a/include/acpi/acdispat.h
+++ b/include/acpi/acdispat.h
@@ -290,12 +290,9 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state *walk_state);
290acpi_status 290acpi_status
291acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state *walk_state); 291acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state *walk_state);
292 292
293struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, 293struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union acpi_parse_object
294 union acpi_parse_object 294 *origin, union acpi_operand_object
295 *origin, 295 *mth_desc, struct acpi_thread_state
296 union acpi_operand_object
297 *mth_desc,
298 struct acpi_thread_state
299 *thread); 296 *thread);
300 297
301acpi_status 298acpi_status
diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h
index 24c3f05ab367..347a911d8237 100644
--- a/include/acpi/acglobal.h
+++ b/include/acpi/acglobal.h
@@ -319,7 +319,7 @@ ACPI_EXTERN struct acpi_fixed_event_handler
319 acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS]; 319 acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS];
320ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head; 320ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head;
321ACPI_EXTERN struct acpi_gpe_block_info 321ACPI_EXTERN struct acpi_gpe_block_info
322 *acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS]; 322*acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS];
323 323
324/***************************************************************************** 324/*****************************************************************************
325 * 325 *
diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h
index 6f83ddbed3af..202cd4242ba1 100644
--- a/include/acpi/aclocal.h
+++ b/include/acpi/aclocal.h
@@ -630,7 +630,7 @@ ACPI_PARSE_COMMON};
630 * and bytelists. 630 * and bytelists.
631 */ 631 */
632struct acpi_parse_obj_named { 632struct acpi_parse_obj_named {
633 ACPI_PARSE_COMMON u8 * path; 633 ACPI_PARSE_COMMON u8 *path;
634 u8 *data; /* AML body or bytelist data */ 634 u8 *data; /* AML body or bytelist data */
635 u32 length; /* AML length */ 635 u32 length; /* AML length */
636 u32 name; /* 4-byte name or zero if no name */ 636 u32 name; /* 4-byte name or zero if no name */
diff --git a/include/acpi/acnamesp.h b/include/acpi/acnamesp.h
index 535b7e1c41bc..5ef38a6c8a61 100644
--- a/include/acpi/acnamesp.h
+++ b/include/acpi/acnamesp.h
@@ -100,10 +100,8 @@ acpi_ns_walk_namespace(acpi_object_type type,
100 acpi_walk_callback user_function, 100 acpi_walk_callback user_function,
101 void *context, void **return_value); 101 void *context, void **return_value);
102 102
103struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type, 103struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type, struct acpi_namespace_node
104 struct acpi_namespace_node 104 *parent, struct acpi_namespace_node
105 *parent,
106 struct acpi_namespace_node
107 *child); 105 *child);
108 106
109/* 107/*
diff --git a/include/acpi/acobject.h b/include/acpi/acobject.h
index 04e9735a6742..7e1211a8b8fa 100644
--- a/include/acpi/acobject.h
+++ b/include/acpi/acobject.h
@@ -216,7 +216,7 @@ struct acpi_object_processor {
216 /* The next two fields take advantage of the 3-byte space before NOTIFY_INFO */ 216 /* The next two fields take advantage of the 3-byte space before NOTIFY_INFO */
217 u8 proc_id; 217 u8 proc_id;
218 u8 length; 218 u8 length;
219 ACPI_COMMON_NOTIFY_INFO acpi_io_address address; 219 ACPI_COMMON_NOTIFY_INFO acpi_io_address address;
220}; 220};
221 221
222struct acpi_object_thermal_zone { 222struct acpi_object_thermal_zone {
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 9cfd5b1a48eb..c6fa5e023bc7 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -91,7 +91,8 @@ typedef int (*acpi_op_remove) (struct acpi_device * device, int type);
91typedef int (*acpi_op_lock) (struct acpi_device * device, int type); 91typedef int (*acpi_op_lock) (struct acpi_device * device, int type);
92typedef int (*acpi_op_start) (struct acpi_device * device); 92typedef int (*acpi_op_start) (struct acpi_device * device);
93typedef int (*acpi_op_stop) (struct acpi_device * device, int type); 93typedef int (*acpi_op_stop) (struct acpi_device * device, int type);
94typedef int (*acpi_op_suspend) (struct acpi_device * device, pm_message_t state); 94typedef int (*acpi_op_suspend) (struct acpi_device * device,
95 pm_message_t state);
95typedef int (*acpi_op_resume) (struct acpi_device * device); 96typedef int (*acpi_op_resume) (struct acpi_device * device);
96typedef int (*acpi_op_scan) (struct acpi_device * device); 97typedef int (*acpi_op_scan) (struct acpi_device * device);
97typedef int (*acpi_op_bind) (struct acpi_device * device); 98typedef int (*acpi_op_bind) (struct acpi_device * device);
@@ -296,7 +297,7 @@ struct acpi_device {
296 void *driver_data; 297 void *driver_data;
297 struct device dev; 298 struct device dev;
298 struct acpi_bus_ops bus_ops; /* workaround for different code path for hotplug */ 299 struct acpi_bus_ops bus_ops; /* workaround for different code path for hotplug */
299 enum acpi_bus_removal_type removal_type; /* indicate for different removal type */ 300 enum acpi_bus_removal_type removal_type; /* indicate for different removal type */
300}; 301};
301 302
302#define acpi_driver_data(d) ((d)->driver_data) 303#define acpi_driver_data(d) ((d)->driver_data)
@@ -338,7 +339,7 @@ int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent,
338 acpi_handle handle, int type); 339 acpi_handle handle, int type);
339int acpi_bus_trim(struct acpi_device *start, int rmdevice); 340int acpi_bus_trim(struct acpi_device *start, int rmdevice);
340int acpi_bus_start(struct acpi_device *device); 341int acpi_bus_start(struct acpi_device *device);
341acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd); 342acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd);
342int acpi_match_ids(struct acpi_device *device, char *ids); 343int acpi_match_ids(struct acpi_device *device, char *ids);
343int acpi_create_dir(struct acpi_device *); 344int acpi_create_dir(struct acpi_device *);
344void acpi_remove_dir(struct acpi_device *); 345void acpi_remove_dir(struct acpi_device *);
@@ -363,6 +364,6 @@ acpi_handle acpi_get_child(acpi_handle, acpi_integer);
363acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); 364acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int);
364#define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) 365#define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle))
365 366
366#endif /* CONFIG_ACPI */ 367#endif /* CONFIG_ACPI */
367 368
368#endif /*__ACPI_BUS_H__*/ 369#endif /*__ACPI_BUS_H__*/
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index f6275b0e66dd..553515912c0b 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -113,7 +113,8 @@ extern int is_dock_device(acpi_handle handle);
113extern int register_dock_notifier(struct notifier_block *nb); 113extern int register_dock_notifier(struct notifier_block *nb);
114extern void unregister_dock_notifier(struct notifier_block *nb); 114extern void unregister_dock_notifier(struct notifier_block *nb);
115extern int register_hotplug_dock_device(acpi_handle handle, 115extern int register_hotplug_dock_device(acpi_handle handle,
116 acpi_notify_handler handler, void *context); 116 acpi_notify_handler handler,
117 void *context);
117extern void unregister_hotplug_dock_device(acpi_handle handle); 118extern void unregister_hotplug_dock_device(acpi_handle handle);
118#else 119#else
119static inline int is_dock_device(acpi_handle handle) 120static inline int is_dock_device(acpi_handle handle)
@@ -128,7 +129,8 @@ static inline void unregister_dock_notifier(struct notifier_block *nb)
128{ 129{
129} 130}
130static inline int register_hotplug_dock_device(acpi_handle handle, 131static inline int register_hotplug_dock_device(acpi_handle handle,
131 acpi_notify_handler handler, void *context) 132 acpi_notify_handler handler,
133 void *context)
132{ 134{
133 return -ENODEV; 135 return -ENODEV;
134} 136}
diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h
index 1049f2a0a6db..f9d2bde9a7bb 100644
--- a/include/acpi/acpi_numa.h
+++ b/include/acpi/acpi_numa.h
@@ -8,7 +8,7 @@
8#if MAX_NUMNODES > 256 8#if MAX_NUMNODES > 256
9#define MAX_PXM_DOMAINS MAX_NUMNODES 9#define MAX_PXM_DOMAINS MAX_NUMNODES
10#else 10#else
11#define MAX_PXM_DOMAINS (256) /* Old pxm spec is defined 8 bit */ 11#define MAX_PXM_DOMAINS (256) /* Old pxm spec is defined 8 bit */
12#endif 12#endif
13 13
14extern int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS]; 14extern int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS];
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 2785058c82ab..5e07db0d46e9 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -143,7 +143,8 @@ void acpi_os_release_mutex(acpi_mutex handle);
143 */ 143 */
144void *acpi_os_allocate(acpi_size size); 144void *acpi_os_allocate(acpi_size size);
145 145
146void __iomem *acpi_os_map_memory(acpi_physical_address where, acpi_native_uint length); 146void __iomem *acpi_os_map_memory(acpi_physical_address where,
147 acpi_native_uint length);
147 148
148void acpi_os_unmap_memory(void __iomem * logical_address, acpi_size size); 149void acpi_os_unmap_memory(void __iomem * logical_address, acpi_size size);
149 150
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 56bf492e7acc..fe8abc276437 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -344,7 +344,7 @@ typedef u32 acpi_integer;
344 344
345/* 64-bit integers */ 345/* 64-bit integers */
346 346
347typedef unsigned long long acpi_integer; 347typedef unsigned long long acpi_integer;
348#define ACPI_INTEGER_MAX ACPI_UINT64_MAX 348#define ACPI_INTEGER_MAX ACPI_UINT64_MAX
349#define ACPI_INTEGER_BIT_SIZE 64 349#define ACPI_INTEGER_BIT_SIZE 64
350#define ACPI_MAX_DECIMAL_DIGITS 20 /* 2^64 = 18,446,744,073,709,551,616 */ 350#define ACPI_MAX_DECIMAL_DIGITS 20 /* 2^64 = 18,446,744,073,709,551,616 */
diff --git a/include/acpi/acutils.h b/include/acpi/acutils.h
index 883ffe92148f..15a838862cd4 100644
--- a/include/acpi/acutils.h
+++ b/include/acpi/acutils.h
@@ -498,7 +498,8 @@ acpi_ut_display_init_pathname(u8 type,
498acpi_status 498acpi_status
499acpi_ut_walk_aml_resources(u8 * aml, 499acpi_ut_walk_aml_resources(u8 * aml,
500 acpi_size aml_length, 500 acpi_size aml_length,
501 acpi_walk_aml_callback user_function, void **context); 501 acpi_walk_aml_callback user_function,
502 void **context);
502 503
503acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index); 504acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index);
504 505
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 5f532d2ac180..a568717f98c6 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -103,7 +103,10 @@
103 103
104#define acpi_thread_id struct task_struct * 104#define acpi_thread_id struct task_struct *
105 105
106static inline acpi_thread_id acpi_os_get_thread_id(void) { return current; } 106static inline acpi_thread_id acpi_os_get_thread_id(void)
107{
108 return current;
109}
107 110
108/* 111/*
109 * The irqs_disabled() check is for resume from RAM. 112 * The irqs_disabled() check is for resume from RAM.
@@ -112,15 +115,19 @@ static inline acpi_thread_id acpi_os_get_thread_id(void) { return current; }
112 * to quiet __might_sleep() in kmalloc() and resume does not. 115 * to quiet __might_sleep() in kmalloc() and resume does not.
113 */ 116 */
114#include <acpi/actypes.h> 117#include <acpi/actypes.h>
115static inline void *acpi_os_allocate(acpi_size size) { 118static inline void *acpi_os_allocate(acpi_size size)
116 return kmalloc(size, irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL); 119{
120 return kmalloc(size, irqs_disabled()? GFP_ATOMIC : GFP_KERNEL);
117} 121}
118static inline void *acpi_os_allocate_zeroed(acpi_size size) { 122static inline void *acpi_os_allocate_zeroed(acpi_size size)
119 return kzalloc(size, irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL); 123{
124 return kzalloc(size, irqs_disabled()? GFP_ATOMIC : GFP_KERNEL);
120} 125}
121 126
122static inline void *acpi_os_acquire_object(acpi_cache_t * cache) { 127static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
123 return kmem_cache_zalloc(cache, irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL); 128{
129 return kmem_cache_zalloc(cache,
130 irqs_disabled()? GFP_ATOMIC : GFP_KERNEL);
124} 131}
125 132
126#define ACPI_ALLOCATE(a) acpi_os_allocate(a) 133#define ACPI_ALLOCATE(a) acpi_os_allocate(a)
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 916c0102db5b..b4b0ffdab098 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -18,7 +18,7 @@
18 18
19#define ACPI_PDC_REVISION_ID 0x1 19#define ACPI_PDC_REVISION_ID 0x1
20 20
21#define ACPI_PSD_REV0_REVISION 0 /* Support for _PSD as in ACPI 3.0 */ 21#define ACPI_PSD_REV0_REVISION 0 /* Support for _PSD as in ACPI 3.0 */
22#define ACPI_PSD_REV0_ENTRIES 5 22#define ACPI_PSD_REV0_ENTRIES 5
23 23
24/* 24/*
@@ -189,8 +189,9 @@ struct acpi_processor_errata {
189 } piix4; 189 } piix4;
190}; 190};
191 191
192extern int acpi_processor_preregister_performance( 192extern int acpi_processor_preregister_performance(struct
193 struct acpi_processor_performance **performance); 193 acpi_processor_performance
194 **performance);
194 195
195extern int acpi_processor_register_performance(struct acpi_processor_performance 196extern int acpi_processor_register_performance(struct acpi_processor_performance
196 *performance, unsigned int cpu); 197 *performance, unsigned int cpu);
@@ -213,7 +214,8 @@ void arch_acpi_processor_init_pdc(struct acpi_processor *pr);
213void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags, 214void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags,
214 unsigned int cpu); 215 unsigned int cpu);
215int acpi_processor_ffh_cstate_probe(unsigned int cpu, 216int acpi_processor_ffh_cstate_probe(unsigned int cpu,
216 struct acpi_processor_cx *cx, struct acpi_power_register *reg); 217 struct acpi_processor_cx *cx,
218 struct acpi_power_register *reg);
217void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cstate); 219void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cstate);
218#else 220#else
219static inline void acpi_processor_power_init_bm_check(struct 221static inline void acpi_processor_power_init_bm_check(struct
@@ -224,12 +226,14 @@ static inline void acpi_processor_power_init_bm_check(struct
224 return; 226 return;
225} 227}
226static inline int acpi_processor_ffh_cstate_probe(unsigned int cpu, 228static inline int acpi_processor_ffh_cstate_probe(unsigned int cpu,
227 struct acpi_processor_cx *cx, struct acpi_power_register *reg) 229 struct acpi_processor_cx *cx,
230 struct acpi_power_register
231 *reg)
228{ 232{
229 return -1; 233 return -1;
230} 234}
231static inline void acpi_processor_ffh_cstate_enter( 235static inline void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx
232 struct acpi_processor_cx *cstate) 236 *cstate)
233{ 237{
234 return; 238 return;
235} 239}