···556556 * indicate this to the interpreter, set the557557 * object to the root558558 */559559- obj_desc =560560- ACPI_CAST_PTR(union561561- acpi_operand_object,562562- acpi_gbl_root_node);559559+ obj_desc = ACPI_CAST_PTR(union560560+ acpi_operand_object,561561+ acpi_gbl_root_node);563562 status = AE_OK;564563 } else {565564 /*
+3-6
drivers/acpi/dispatcher/dswstate.c
···630630 *631631 ******************************************************************************/632632633633-struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,634634- union acpi_parse_object635635- *origin,636636- union acpi_operand_object637637- *method_desc,638638- struct acpi_thread_state633633+struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union acpi_parse_object634634+ *origin, union acpi_operand_object635635+ *method_desc, struct acpi_thread_state639636 *thread)640637{641638 struct acpi_walk_state *walk_state;
+2-3
drivers/acpi/events/evgpe.c
···341341342342 /* A Non-NULL gpe_device means this is a GPE Block Device */343343344344- obj_desc =345345- acpi_ns_get_attached_object((struct acpi_namespace_node *)346346- gpe_device);344344+ obj_desc = acpi_ns_get_attached_object((struct acpi_namespace_node *)345345+ gpe_device);347346 if (!obj_desc || !obj_desc->device.gpe_block) {348347 return (NULL);349348 }
···320320 acpi_gbl_global_lock_acquired = TRUE;321321 /* Send a unit to the semaphore */322322323323- if (ACPI_FAILURE(acpi_os_signal_semaphore(324324- acpi_gbl_global_lock_semaphore, 1))) {323323+ if (ACPI_FAILURE324324+ (acpi_os_signal_semaphore325325+ (acpi_gbl_global_lock_semaphore, 1))) {325326 ACPI_ERROR((AE_INFO,326327 "Could not signal Global Lock semaphore"));327328 }···448447 }449448450449 if (ACPI_FAILURE(status)) {451451- status = acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex, timeout);450450+ status =451451+ acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex,452452+ timeout);452453 }453454 if (ACPI_FAILURE(status)) {454455 return_ACPI_STATUS(status);
+2-1
drivers/acpi/events/evrgnini.c
···228228229229 /* Install a handler for this PCI root bridge */230230231231- status = acpi_install_address_space_handler((acpi_handle) pci_root_node, ACPI_ADR_SPACE_PCI_CONFIG, ACPI_DEFAULT_HANDLER, NULL, NULL);231231+ status =232232+ acpi_install_address_space_handler((acpi_handle) pci_root_node, ACPI_ADR_SPACE_PCI_CONFIG, ACPI_DEFAULT_HANDLER, NULL, NULL);232233 if (ACPI_FAILURE(status)) {233234 if (status == AE_SAME_HANDLER) {234235 /*
···512512 * Create a new string object and string buffer513513 * (-1 because of extra separator included in string_length from above)514514 */515515- return_desc =516516- acpi_ut_create_string_object((acpi_size)517517- (string_length - 1));515515+ return_desc = acpi_ut_create_string_object((acpi_size)516516+ (string_length - 1));518517 if (!return_desc) {519518 return_ACPI_STATUS(AE_NO_MEMORY);520519 }
···142142};143143#endif144144145145-#endif /* ACPI_FUTURE_USAGE */145145+#endif /* ACPI_FUTURE_USAGE */146146/*147147 * Base sizes for external AML resource descriptors, indexed by internal type.148148 * Includes size of the descriptor header (1 byte for small descriptors,
+3-4
drivers/acpi/resources/rslist.c
···153153154154 /* Perform the conversion */155155156156- status = acpi_rs_convert_resource_to_aml(resource,157157- ACPI_CAST_PTR(union158158- aml_resource,159159- aml),156156+ status = acpi_rs_convert_resource_to_aml(resource, ACPI_CAST_PTR(union157157+ aml_resource,158158+ aml),160159 acpi_gbl_set_resource_dispatch161160 [resource->type]);162161 if (ACPI_FAILURE(status)) {
···334334 (acpi_gbl_FADT.xpm1a_event_block.address +335335 pm1_register_length));336336 /* Don't forget to copy space_id of the GAS */337337- acpi_gbl_xpm1a_enable.space_id = acpi_gbl_FADT.xpm1a_event_block.space_id;337337+ acpi_gbl_xpm1a_enable.space_id =338338+ acpi_gbl_FADT.xpm1a_event_block.space_id;338339339340 /* The PM1B register block is optional, ignore if not present */340341···345344 (acpi_gbl_FADT.xpm1b_event_block.346345 address + pm1_register_length));347346 /* Don't forget to copy space_id of the GAS */348348- acpi_gbl_xpm1b_enable.space_id = acpi_gbl_FADT.xpm1a_event_block.space_id;347347+ acpi_gbl_xpm1b_enable.space_id =348348+ acpi_gbl_FADT.xpm1a_event_block.space_id;349349350350 }351351
+8-8
drivers/acpi/tables/tbxface.c
···201201202202 return_ACPI_STATUS(AE_OK);203203}204204+204205/*******************************************************************************205206 *206207 * FUNCTION: acpi_load_table···263262acpi_status264263acpi_get_table_header(char *signature,265264 acpi_native_uint instance,266266- struct acpi_table_header *out_table_header)265265+ struct acpi_table_header * out_table_header)267266{268267 acpi_native_uint i;269268 acpi_native_uint j;···322321323322ACPI_EXPORT_SYMBOL(acpi_get_table_header)324323325325-326324/******************************************************************************327325 *328326 * FUNCTION: acpi_unload_table_id···346346 continue;347347 }348348 /*349349- * Delete all namespace objects owned by this table. Note that these350350- * objects can appear anywhere in the namespace by virtue of the AML351351- * "Scope" operator. Thus, we need to track ownership by an ID, not352352- * simply a position within the hierarchy353353- */349349+ * Delete all namespace objects owned by this table. Note that these350350+ * objects can appear anywhere in the namespace by virtue of the AML351351+ * "Scope" operator. Thus, we need to track ownership by an ID, not352352+ * simply a position within the hierarchy353353+ */354354 acpi_tb_delete_namespace_by_owner(i);355355 status = acpi_tb_release_owner_id(i);356356 acpi_tb_set_table_loaded_flag(i, FALSE);···376376 *****************************************************************************/377377acpi_status378378acpi_get_table(char *signature,379379- acpi_native_uint instance, struct acpi_table_header ** out_table)379379+ acpi_native_uint instance, struct acpi_table_header **out_table)380380{381381 acpi_native_uint i;382382 acpi_native_uint j;
···45454646#define _COMPONENT ACPI_UTILITIES4747ACPI_MODULE_NAME("utdebug")4848-4948#ifdef ACPI_DEBUG_OUTPUT5049static acpi_thread_id acpi_gbl_prev_thread_id;5150static char *acpi_gbl_fn_entry_str = "----Entry";···180181 if (ACPI_LV_THREADS & acpi_dbg_level) {181182 acpi_os_printf182183 ("\n**** Context Switch from TID %lX to TID %lX ****\n\n",183183- (unsigned long)acpi_gbl_prev_thread_id, (unsigned long)thread_id);184184+ (unsigned long)acpi_gbl_prev_thread_id,185185+ (unsigned long)thread_id);184186 }185187186188 acpi_gbl_prev_thread_id = thread_id;
+2-4
drivers/acpi/utilities/utglobal.c
···5555 * Static global variable initialization.5656 *5757 ******************************************************************************/5858-5958/*6059 * We want the debug switches statically initialized so they6160 * are already set when the debugger is entered.6261 */6363-6462/* Debug switch - level and trace mask */6563u32 acpi_dbg_level = ACPI_DEBUG_DEFAULT;6664···733735}734736735737ACPI_EXPORT_SYMBOL(acpi_dbg_level)736736-ACPI_EXPORT_SYMBOL(acpi_dbg_layer)737737-ACPI_EXPORT_SYMBOL(acpi_gpe_count)738738+ ACPI_EXPORT_SYMBOL(acpi_dbg_layer)739739+ ACPI_EXPORT_SYMBOL(acpi_gpe_count)
+3-3
drivers/acpi/utilities/utmisc.c
···802802803803 valid_digits++;804804805805- if (sign_of0x806806- && ((valid_digits > 16)807807- || ((valid_digits > 8) && mode32))) {805805+ if (sign_of0x && ((valid_digits > 16)806806+ || ((valid_digits > 8) && mode32))) {808807 /*809808 * This is to_integer operation case.810809 * No any restrictions for string-to-integer conversion,···10481049 acpi_os_vprintf(format, args);10491050 acpi_os_printf(" [%X]\n", ACPI_CA_VERSION);10501051}10521052+10511053EXPORT_SYMBOL(acpi_ut_exception);1052105410531055void ACPI_INTERNAL_VAR_XFACE
···46464747#define _COMPONENT ACPI_UTILITIES4848ACPI_MODULE_NAME("utresrc")4949-5049#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)5150/*5251 * Strings used to decode resource descriptors.
···630630 * and bytelists.631631 */632632struct acpi_parse_obj_named {633633- ACPI_PARSE_COMMON u8 * path;633633+ ACPI_PARSE_COMMON u8 *path;634634 u8 *data; /* AML body or bytelist data */635635 u32 length; /* AML length */636636 u32 name; /* 4-byte name or zero if no name */
···216216 /* The next two fields take advantage of the 3-byte space before NOTIFY_INFO */217217 u8 proc_id;218218 u8 length;219219- ACPI_COMMON_NOTIFY_INFO acpi_io_address address;219219+ ACPI_COMMON_NOTIFY_INFO acpi_io_address address;220220};221221222222struct acpi_object_thermal_zone {
+5-4
include/acpi/acpi_bus.h
···9191typedef int (*acpi_op_lock) (struct acpi_device * device, int type);9292typedef int (*acpi_op_start) (struct acpi_device * device);9393typedef int (*acpi_op_stop) (struct acpi_device * device, int type);9494-typedef int (*acpi_op_suspend) (struct acpi_device * device, pm_message_t state);9494+typedef int (*acpi_op_suspend) (struct acpi_device * device,9595+ pm_message_t state);9596typedef int (*acpi_op_resume) (struct acpi_device * device);9697typedef int (*acpi_op_scan) (struct acpi_device * device);9798typedef int (*acpi_op_bind) (struct acpi_device * device);···297296 void *driver_data;298297 struct device dev;299298 struct acpi_bus_ops bus_ops; /* workaround for different code path for hotplug */300300- enum acpi_bus_removal_type removal_type; /* indicate for different removal type */299299+ enum acpi_bus_removal_type removal_type; /* indicate for different removal type */301300};302301303302#define acpi_driver_data(d) ((d)->driver_data)···339338 acpi_handle handle, int type);340339int acpi_bus_trim(struct acpi_device *start, int rmdevice);341340int acpi_bus_start(struct acpi_device *device);342342-acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd);341341+acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd);343342int acpi_match_ids(struct acpi_device *device, char *ids);344343int acpi_create_dir(struct acpi_device *);345344void acpi_remove_dir(struct acpi_device *);···364363acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int);365364#define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle))366365367367-#endif /* CONFIG_ACPI */366366+#endif /* CONFIG_ACPI */368367369368#endif /*__ACPI_BUS_H__*/
···88#if MAX_NUMNODES > 25699#define MAX_PXM_DOMAINS MAX_NUMNODES1010#else1111-#define MAX_PXM_DOMAINS (256) /* Old pxm spec is defined 8 bit */1111+#define MAX_PXM_DOMAINS (256) /* Old pxm spec is defined 8 bit */1212#endif13131414extern int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS];