diff options
Diffstat (limited to 'drivers/acpi/events/evxfevnt.c')
| -rw-r--r-- | drivers/acpi/events/evxfevnt.c | 465 | 
1 files changed, 200 insertions, 265 deletions
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c index f337dc2cc56..887ff9f28a0 100644 --- a/drivers/acpi/events/evxfevnt.c +++ b/drivers/acpi/events/evxfevnt.c @@ -48,8 +48,7 @@  #include <acpi/acnamesp.h>  #define _COMPONENT          ACPI_EVENTS -	 ACPI_MODULE_NAME    ("evxfevnt") - +ACPI_MODULE_NAME("evxfevnt")  /*******************************************************************************   * @@ -62,44 +61,39 @@   * DESCRIPTION: Transfers the system into ACPI mode.   *   ******************************************************************************/ - -acpi_status -acpi_enable ( -	void) +acpi_status acpi_enable(void)  { -	acpi_status                     status = AE_OK; - +	acpi_status status = AE_OK; -	ACPI_FUNCTION_TRACE ("acpi_enable"); +	ACPI_FUNCTION_TRACE("acpi_enable"); - -	/* Make sure we have the FADT*/ +	/* Make sure we have the FADT */  	if (!acpi_gbl_FADT) { -		ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "No FADT information present!\n")); -		return_ACPI_STATUS (AE_NO_ACPI_TABLES); +		ACPI_DEBUG_PRINT((ACPI_DB_WARN, +				  "No FADT information present!\n")); +		return_ACPI_STATUS(AE_NO_ACPI_TABLES);  	}  	if (acpi_hw_get_mode() == ACPI_SYS_MODE_ACPI) { -		ACPI_DEBUG_PRINT ((ACPI_DB_INIT, "System is already in ACPI mode\n")); -	} -	else { +		ACPI_DEBUG_PRINT((ACPI_DB_INIT, +				  "System is already in ACPI mode\n")); +	} else {  		/* Transition to ACPI mode */ -		status = acpi_hw_set_mode (ACPI_SYS_MODE_ACPI); -		if (ACPI_FAILURE (status)) { -			ACPI_REPORT_ERROR (("Could not transition to ACPI mode.\n")); -			return_ACPI_STATUS (status); +		status = acpi_hw_set_mode(ACPI_SYS_MODE_ACPI); +		if (ACPI_FAILURE(status)) { +			ACPI_REPORT_ERROR(("Could not transition to ACPI mode.\n")); +			return_ACPI_STATUS(status);  		} -		ACPI_DEBUG_PRINT ((ACPI_DB_INIT, -			"Transition to ACPI mode successful\n")); +		ACPI_DEBUG_PRINT((ACPI_DB_INIT, +				  "Transition to ACPI mode successful\n"));  	} -	return_ACPI_STATUS (status); +	return_ACPI_STATUS(status);  } -  /*******************************************************************************   *   * FUNCTION:    acpi_disable @@ -112,43 +106,38 @@ acpi_enable (   *   ******************************************************************************/ -acpi_status -acpi_disable ( -	void) +acpi_status acpi_disable(void)  { -	acpi_status                     status = AE_OK; - - -	ACPI_FUNCTION_TRACE ("acpi_disable"); +	acpi_status status = AE_OK; +	ACPI_FUNCTION_TRACE("acpi_disable");  	if (!acpi_gbl_FADT) { -		ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "No FADT information present!\n")); -		return_ACPI_STATUS (AE_NO_ACPI_TABLES); +		ACPI_DEBUG_PRINT((ACPI_DB_WARN, +				  "No FADT information present!\n")); +		return_ACPI_STATUS(AE_NO_ACPI_TABLES);  	}  	if (acpi_hw_get_mode() == ACPI_SYS_MODE_LEGACY) { -		ACPI_DEBUG_PRINT ((ACPI_DB_INIT, -			"System is already in legacy (non-ACPI) mode\n")); -	} -	else { +		ACPI_DEBUG_PRINT((ACPI_DB_INIT, +				  "System is already in legacy (non-ACPI) mode\n")); +	} else {  		/* Transition to LEGACY mode */ -		status = acpi_hw_set_mode (ACPI_SYS_MODE_LEGACY); +		status = acpi_hw_set_mode(ACPI_SYS_MODE_LEGACY); -		if (ACPI_FAILURE (status)) { -			ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, -				"Could not exit ACPI mode to legacy mode")); -			return_ACPI_STATUS (status); +		if (ACPI_FAILURE(status)) { +			ACPI_DEBUG_PRINT((ACPI_DB_ERROR, +					  "Could not exit ACPI mode to legacy mode")); +			return_ACPI_STATUS(status);  		} -		ACPI_DEBUG_PRINT ((ACPI_DB_INIT, "ACPI mode disabled\n")); +		ACPI_DEBUG_PRINT((ACPI_DB_INIT, "ACPI mode disabled\n"));  	} -	return_ACPI_STATUS (status); +	return_ACPI_STATUS(status);  } -  /*******************************************************************************   *   * FUNCTION:    acpi_enable_event @@ -162,52 +151,50 @@ acpi_disable (   *   ******************************************************************************/ -acpi_status -acpi_enable_event ( -	u32                             event, -	u32                             flags) +acpi_status acpi_enable_event(u32 event, u32 flags)  { -	acpi_status                     status = AE_OK; -	u32                             value; - - -	ACPI_FUNCTION_TRACE ("acpi_enable_event"); +	acpi_status status = AE_OK; +	u32 value; +	ACPI_FUNCTION_TRACE("acpi_enable_event");  	/* Decode the Fixed Event */  	if (event > ACPI_EVENT_MAX) { -		return_ACPI_STATUS (AE_BAD_PARAMETER); +		return_ACPI_STATUS(AE_BAD_PARAMETER);  	}  	/*  	 * Enable the requested fixed event (by writing a one to the  	 * enable register bit)  	 */ -	status = acpi_set_register (acpi_gbl_fixed_event_info[event].enable_register_id, -			 1, ACPI_MTX_LOCK); -	if (ACPI_FAILURE (status)) { -		return_ACPI_STATUS (status); +	status = +	    acpi_set_register(acpi_gbl_fixed_event_info[event]. +			      enable_register_id, 1, ACPI_MTX_LOCK); +	if (ACPI_FAILURE(status)) { +		return_ACPI_STATUS(status);  	}  	/* Make sure that the hardware responded */ -	status = acpi_get_register (acpi_gbl_fixed_event_info[event].enable_register_id, -			  &value, ACPI_MTX_LOCK); -	if (ACPI_FAILURE (status)) { -		return_ACPI_STATUS (status); +	status = +	    acpi_get_register(acpi_gbl_fixed_event_info[event]. +			      enable_register_id, &value, ACPI_MTX_LOCK); +	if (ACPI_FAILURE(status)) { +		return_ACPI_STATUS(status);  	}  	if (value != 1) { -		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, -			"Could not enable %s event\n", acpi_ut_get_event_name (event))); -		return_ACPI_STATUS (AE_NO_HARDWARE_RESPONSE); +		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, +				  "Could not enable %s event\n", +				  acpi_ut_get_event_name(event))); +		return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);  	} -	return_ACPI_STATUS (status); +	return_ACPI_STATUS(status);  } -EXPORT_SYMBOL(acpi_enable_event); +EXPORT_SYMBOL(acpi_enable_event);  /*******************************************************************************   * @@ -223,40 +210,34 @@ EXPORT_SYMBOL(acpi_enable_event);   *   ******************************************************************************/ -acpi_status -acpi_set_gpe_type ( -	acpi_handle                     gpe_device, -	u32                             gpe_number, -	u8                              type) +acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type)  { -	acpi_status                     status = AE_OK; -	struct acpi_gpe_event_info      *gpe_event_info; - - -	ACPI_FUNCTION_TRACE ("acpi_set_gpe_type"); +	acpi_status status = AE_OK; +	struct acpi_gpe_event_info *gpe_event_info; +	ACPI_FUNCTION_TRACE("acpi_set_gpe_type");  	/* Ensure that we have a valid GPE number */ -	gpe_event_info = acpi_ev_get_gpe_event_info (gpe_device, gpe_number); +	gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);  	if (!gpe_event_info) {  		status = AE_BAD_PARAMETER;  		goto unlock_and_exit;  	}  	if ((gpe_event_info->flags & ACPI_GPE_TYPE_MASK) == type) { -		return_ACPI_STATUS (AE_OK); +		return_ACPI_STATUS(AE_OK);  	}  	/* Set the new type (will disable GPE if currently enabled) */ -	status = acpi_ev_set_gpe_type (gpe_event_info, type); +	status = acpi_ev_set_gpe_type(gpe_event_info, type); -unlock_and_exit: -	return_ACPI_STATUS (status); +      unlock_and_exit: +	return_ACPI_STATUS(status);  } -EXPORT_SYMBOL(acpi_set_gpe_type); +EXPORT_SYMBOL(acpi_set_gpe_type);  /*******************************************************************************   * @@ -273,31 +254,25 @@ EXPORT_SYMBOL(acpi_set_gpe_type);   *   ******************************************************************************/ -acpi_status -acpi_enable_gpe ( -	acpi_handle                     gpe_device, -	u32                             gpe_number, -	u32                             flags) +acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)  { -	acpi_status                     status = AE_OK; -	struct acpi_gpe_event_info      *gpe_event_info; - - -	ACPI_FUNCTION_TRACE ("acpi_enable_gpe"); +	acpi_status status = AE_OK; +	struct acpi_gpe_event_info *gpe_event_info; +	ACPI_FUNCTION_TRACE("acpi_enable_gpe");  	/* Use semaphore lock if not executing at interrupt level */  	if (flags & ACPI_NOT_ISR) { -		status = acpi_ut_acquire_mutex (ACPI_MTX_EVENTS); -		if (ACPI_FAILURE (status)) { -			return_ACPI_STATUS (status); +		status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS); +		if (ACPI_FAILURE(status)) { +			return_ACPI_STATUS(status);  		}  	}  	/* Ensure that we have a valid GPE number */ -	gpe_event_info = acpi_ev_get_gpe_event_info (gpe_device, gpe_number); +	gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);  	if (!gpe_event_info) {  		status = AE_BAD_PARAMETER;  		goto unlock_and_exit; @@ -305,16 +280,16 @@ acpi_enable_gpe (  	/* Perform the enable */ -	status = acpi_ev_enable_gpe (gpe_event_info, TRUE); +	status = acpi_ev_enable_gpe(gpe_event_info, TRUE); -unlock_and_exit: +      unlock_and_exit:  	if (flags & ACPI_NOT_ISR) { -		(void) acpi_ut_release_mutex (ACPI_MTX_EVENTS); +		(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);  	} -	return_ACPI_STATUS (status); +	return_ACPI_STATUS(status);  } -EXPORT_SYMBOL(acpi_enable_gpe); +EXPORT_SYMBOL(acpi_enable_gpe);  /*******************************************************************************   * @@ -331,46 +306,39 @@ EXPORT_SYMBOL(acpi_enable_gpe);   *   ******************************************************************************/ -acpi_status -acpi_disable_gpe ( -	acpi_handle                     gpe_device, -	u32                             gpe_number, -	u32                             flags) +acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)  { -	acpi_status                     status = AE_OK; -	struct acpi_gpe_event_info      *gpe_event_info; - - -	ACPI_FUNCTION_TRACE ("acpi_disable_gpe"); +	acpi_status status = AE_OK; +	struct acpi_gpe_event_info *gpe_event_info; +	ACPI_FUNCTION_TRACE("acpi_disable_gpe");  	/* Use semaphore lock if not executing at interrupt level */  	if (flags & ACPI_NOT_ISR) { -		status = acpi_ut_acquire_mutex (ACPI_MTX_EVENTS); -		if (ACPI_FAILURE (status)) { -			return_ACPI_STATUS (status); +		status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS); +		if (ACPI_FAILURE(status)) { +			return_ACPI_STATUS(status);  		}  	}  	/* Ensure that we have a valid GPE number */ -	gpe_event_info = acpi_ev_get_gpe_event_info (gpe_device, gpe_number); +	gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);  	if (!gpe_event_info) {  		status = AE_BAD_PARAMETER;  		goto unlock_and_exit;  	} -	status = acpi_ev_disable_gpe (gpe_event_info); +	status = acpi_ev_disable_gpe(gpe_event_info); -unlock_and_exit: +      unlock_and_exit:  	if (flags & ACPI_NOT_ISR) { -		(void) acpi_ut_release_mutex (ACPI_MTX_EVENTS); +		(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);  	} -	return_ACPI_STATUS (status); +	return_ACPI_STATUS(status);  } -  /*******************************************************************************   *   * FUNCTION:    acpi_disable_event @@ -384,50 +352,48 @@ unlock_and_exit:   *   ******************************************************************************/ -acpi_status -acpi_disable_event ( -	u32                             event, -	u32                             flags) +acpi_status acpi_disable_event(u32 event, u32 flags)  { -	acpi_status                     status = AE_OK; -	u32                             value; - - -	ACPI_FUNCTION_TRACE ("acpi_disable_event"); +	acpi_status status = AE_OK; +	u32 value; +	ACPI_FUNCTION_TRACE("acpi_disable_event");  	/* Decode the Fixed Event */  	if (event > ACPI_EVENT_MAX) { -		return_ACPI_STATUS (AE_BAD_PARAMETER); +		return_ACPI_STATUS(AE_BAD_PARAMETER);  	}  	/*  	 * Disable the requested fixed event (by writing a zero to the  	 * enable register bit)  	 */ -	status = acpi_set_register (acpi_gbl_fixed_event_info[event].enable_register_id, -			 0, ACPI_MTX_LOCK); -	if (ACPI_FAILURE (status)) { -		return_ACPI_STATUS (status); +	status = +	    acpi_set_register(acpi_gbl_fixed_event_info[event]. +			      enable_register_id, 0, ACPI_MTX_LOCK); +	if (ACPI_FAILURE(status)) { +		return_ACPI_STATUS(status);  	} -	status = acpi_get_register (acpi_gbl_fixed_event_info[event].enable_register_id, -			 &value, ACPI_MTX_LOCK); -	if (ACPI_FAILURE (status)) { -		return_ACPI_STATUS (status); +	status = +	    acpi_get_register(acpi_gbl_fixed_event_info[event]. +			      enable_register_id, &value, ACPI_MTX_LOCK); +	if (ACPI_FAILURE(status)) { +		return_ACPI_STATUS(status);  	}  	if (value != 0) { -		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, -			"Could not disable %s events\n", acpi_ut_get_event_name (event))); -		return_ACPI_STATUS (AE_NO_HARDWARE_RESPONSE); +		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, +				  "Could not disable %s events\n", +				  acpi_ut_get_event_name(event))); +		return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);  	} -	return_ACPI_STATUS (status); +	return_ACPI_STATUS(status);  } -EXPORT_SYMBOL(acpi_disable_event); +EXPORT_SYMBOL(acpi_disable_event);  /*******************************************************************************   * @@ -441,33 +407,30 @@ EXPORT_SYMBOL(acpi_disable_event);   *   ******************************************************************************/ -acpi_status -acpi_clear_event ( -	u32                             event) +acpi_status acpi_clear_event(u32 event)  { -	acpi_status                     status = AE_OK; - - -	ACPI_FUNCTION_TRACE ("acpi_clear_event"); +	acpi_status status = AE_OK; +	ACPI_FUNCTION_TRACE("acpi_clear_event");  	/* Decode the Fixed Event */  	if (event > ACPI_EVENT_MAX) { -		return_ACPI_STATUS (AE_BAD_PARAMETER); +		return_ACPI_STATUS(AE_BAD_PARAMETER);  	}  	/*  	 * Clear the requested fixed event (By writing a one to the  	 * status register bit)  	 */ -	status = acpi_set_register (acpi_gbl_fixed_event_info[event].status_register_id, -			1, ACPI_MTX_LOCK); +	status = +	    acpi_set_register(acpi_gbl_fixed_event_info[event]. +			      status_register_id, 1, ACPI_MTX_LOCK); -	return_ACPI_STATUS (status); +	return_ACPI_STATUS(status);  } -EXPORT_SYMBOL(acpi_clear_event); +EXPORT_SYMBOL(acpi_clear_event);  /*******************************************************************************   * @@ -483,46 +446,39 @@ EXPORT_SYMBOL(acpi_clear_event);   *   ******************************************************************************/ -acpi_status -acpi_clear_gpe ( -	acpi_handle                     gpe_device, -	u32                             gpe_number, -	u32                             flags) +acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)  { -	acpi_status                     status = AE_OK; -	struct acpi_gpe_event_info      *gpe_event_info; - - -	ACPI_FUNCTION_TRACE ("acpi_clear_gpe"); +	acpi_status status = AE_OK; +	struct acpi_gpe_event_info *gpe_event_info; +	ACPI_FUNCTION_TRACE("acpi_clear_gpe");  	/* Use semaphore lock if not executing at interrupt level */  	if (flags & ACPI_NOT_ISR) { -		status = acpi_ut_acquire_mutex (ACPI_MTX_EVENTS); -		if (ACPI_FAILURE (status)) { -			return_ACPI_STATUS (status); +		status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS); +		if (ACPI_FAILURE(status)) { +			return_ACPI_STATUS(status);  		}  	}  	/* Ensure that we have a valid GPE number */ -	gpe_event_info = acpi_ev_get_gpe_event_info (gpe_device, gpe_number); +	gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);  	if (!gpe_event_info) {  		status = AE_BAD_PARAMETER;  		goto unlock_and_exit;  	} -	status = acpi_hw_clear_gpe (gpe_event_info); +	status = acpi_hw_clear_gpe(gpe_event_info); -unlock_and_exit: +      unlock_and_exit:  	if (flags & ACPI_NOT_ISR) { -		(void) acpi_ut_release_mutex (ACPI_MTX_EVENTS); +		(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);  	} -	return_ACPI_STATUS (status); +	return_ACPI_STATUS(status);  } -  #ifdef ACPI_FUTURE_USAGE  /*******************************************************************************   * @@ -538,36 +494,31 @@ unlock_and_exit:   *   ******************************************************************************/ -acpi_status -acpi_get_event_status ( -	u32                             event, -	acpi_event_status               *event_status) +acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)  { -	acpi_status                     status = AE_OK; - - -	ACPI_FUNCTION_TRACE ("acpi_get_event_status"); +	acpi_status status = AE_OK; +	ACPI_FUNCTION_TRACE("acpi_get_event_status");  	if (!event_status) { -		return_ACPI_STATUS (AE_BAD_PARAMETER); +		return_ACPI_STATUS(AE_BAD_PARAMETER);  	}  	/* Decode the Fixed Event */  	if (event > ACPI_EVENT_MAX) { -		return_ACPI_STATUS (AE_BAD_PARAMETER); +		return_ACPI_STATUS(AE_BAD_PARAMETER);  	}  	/* Get the status of the requested fixed event */ -	status = acpi_get_register (acpi_gbl_fixed_event_info[event].status_register_id, -			  event_status, ACPI_MTX_LOCK); +	status = +	    acpi_get_register(acpi_gbl_fixed_event_info[event]. +			      status_register_id, event_status, ACPI_MTX_LOCK); -	return_ACPI_STATUS (status); +	return_ACPI_STATUS(status);  } -  /*******************************************************************************   *   * FUNCTION:    acpi_get_gpe_status @@ -585,31 +536,26 @@ acpi_get_event_status (   ******************************************************************************/  acpi_status -acpi_get_gpe_status ( -	acpi_handle                     gpe_device, -	u32                             gpe_number, -	u32                             flags, -	acpi_event_status               *event_status) +acpi_get_gpe_status(acpi_handle gpe_device, +		    u32 gpe_number, u32 flags, acpi_event_status * event_status)  { -	acpi_status                     status = AE_OK; -	struct acpi_gpe_event_info      *gpe_event_info; - - -	ACPI_FUNCTION_TRACE ("acpi_get_gpe_status"); +	acpi_status status = AE_OK; +	struct acpi_gpe_event_info *gpe_event_info; +	ACPI_FUNCTION_TRACE("acpi_get_gpe_status");  	/* Use semaphore lock if not executing at interrupt level */  	if (flags & ACPI_NOT_ISR) { -		status = acpi_ut_acquire_mutex (ACPI_MTX_EVENTS); -		if (ACPI_FAILURE (status)) { -			return_ACPI_STATUS (status); +		status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS); +		if (ACPI_FAILURE(status)) { +			return_ACPI_STATUS(status);  		}  	}  	/* Ensure that we have a valid GPE number */ -	gpe_event_info = acpi_ev_get_gpe_event_info (gpe_device, gpe_number); +	gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);  	if (!gpe_event_info) {  		status = AE_BAD_PARAMETER;  		goto unlock_and_exit; @@ -617,16 +563,15 @@ acpi_get_gpe_status (  	/* Obtain status on the requested GPE number */ -	status = acpi_hw_get_gpe_status (gpe_event_info, event_status); +	status = acpi_hw_get_gpe_status(gpe_event_info, event_status); -unlock_and_exit: +      unlock_and_exit:  	if (flags & ACPI_NOT_ISR) { -		(void) acpi_ut_release_mutex (ACPI_MTX_EVENTS); +		(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);  	} -	return_ACPI_STATUS (status); +	return_ACPI_STATUS(status);  } -#endif  /*  ACPI_FUTURE_USAGE  */ - +#endif				/*  ACPI_FUTURE_USAGE  */  /*******************************************************************************   * @@ -635,7 +580,7 @@ unlock_and_exit:   * PARAMETERS:  gpe_device          - Handle to the parent GPE Block Device   *              gpe_block_address   - Address and space_iD   *              register_count      - Number of GPE register pairs in the block - *              interrupt_level     - H/W interrupt for the block + *              interrupt_number    - H/W interrupt for the block   *   * RETURN:      Status   * @@ -644,33 +589,27 @@ unlock_and_exit:   ******************************************************************************/  acpi_status -acpi_install_gpe_block ( -	acpi_handle                     gpe_device, -	struct acpi_generic_address     *gpe_block_address, -	u32                             register_count, -	u32                             interrupt_level) +acpi_install_gpe_block(acpi_handle gpe_device, +		       struct acpi_generic_address *gpe_block_address, +		       u32 register_count, u32 interrupt_number)  { -	acpi_status                     status; -	union acpi_operand_object       *obj_desc; -	struct acpi_namespace_node      *node; -	struct acpi_gpe_block_info      *gpe_block; - +	acpi_status status; +	union acpi_operand_object *obj_desc; +	struct acpi_namespace_node *node; +	struct acpi_gpe_block_info *gpe_block; -	ACPI_FUNCTION_TRACE ("acpi_install_gpe_block"); +	ACPI_FUNCTION_TRACE("acpi_install_gpe_block"); - -	if ((!gpe_device)      || -		(!gpe_block_address) || -		(!register_count)) { -		return_ACPI_STATUS (AE_BAD_PARAMETER); +	if ((!gpe_device) || (!gpe_block_address) || (!register_count)) { +		return_ACPI_STATUS(AE_BAD_PARAMETER);  	} -	status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE); -	if (ACPI_FAILURE (status)) { +	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE); +	if (ACPI_FAILURE(status)) {  		return (status);  	} -	node = acpi_ns_map_handle_to_node (gpe_device); +	node = acpi_ns_map_handle_to_node(gpe_device);  	if (!node) {  		status = AE_BAD_PARAMETER;  		goto unlock_and_exit; @@ -680,31 +619,33 @@ acpi_install_gpe_block (  	 * For user-installed GPE Block Devices, the gpe_block_base_number  	 * is always zero  	 */ -	status = acpi_ev_create_gpe_block (node, gpe_block_address, register_count, -			  0, interrupt_level, &gpe_block); -	if (ACPI_FAILURE (status)) { +	status = +	    acpi_ev_create_gpe_block(node, gpe_block_address, register_count, 0, +				     interrupt_number, &gpe_block); +	if (ACPI_FAILURE(status)) {  		goto unlock_and_exit;  	}  	/* Get the device_object attached to the node */ -	obj_desc = acpi_ns_get_attached_object (node); +	obj_desc = acpi_ns_get_attached_object(node);  	if (!obj_desc) {  		/* No object, create a new one */ -		obj_desc = acpi_ut_create_internal_object (ACPI_TYPE_DEVICE); +		obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_DEVICE);  		if (!obj_desc) {  			status = AE_NO_MEMORY;  			goto unlock_and_exit;  		} -		status = acpi_ns_attach_object (node, obj_desc, ACPI_TYPE_DEVICE); +		status = +		    acpi_ns_attach_object(node, obj_desc, ACPI_TYPE_DEVICE);  		/* Remove local reference to the object */ -		acpi_ut_remove_reference (obj_desc); +		acpi_ut_remove_reference(obj_desc); -		if (ACPI_FAILURE (status)) { +		if (ACPI_FAILURE(status)) {  			goto unlock_and_exit;  		}  	} @@ -713,13 +654,12 @@ acpi_install_gpe_block (  	obj_desc->device.gpe_block = gpe_block; - -unlock_and_exit: -	(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE); -	return_ACPI_STATUS (status); +      unlock_and_exit: +	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE); +	return_ACPI_STATUS(status);  } -EXPORT_SYMBOL(acpi_install_gpe_block); +EXPORT_SYMBOL(acpi_install_gpe_block);  /*******************************************************************************   * @@ -733,28 +673,24 @@ EXPORT_SYMBOL(acpi_install_gpe_block);   *   ******************************************************************************/ -acpi_status -acpi_remove_gpe_block ( -	acpi_handle                     gpe_device) +acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)  { -	union acpi_operand_object       *obj_desc; -	acpi_status                     status; -	struct acpi_namespace_node      *node; - - -	ACPI_FUNCTION_TRACE ("acpi_remove_gpe_block"); +	union acpi_operand_object *obj_desc; +	acpi_status status; +	struct acpi_namespace_node *node; +	ACPI_FUNCTION_TRACE("acpi_remove_gpe_block");  	if (!gpe_device) { -		return_ACPI_STATUS (AE_BAD_PARAMETER); +		return_ACPI_STATUS(AE_BAD_PARAMETER);  	} -	status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE); -	if (ACPI_FAILURE (status)) { +	status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE); +	if (ACPI_FAILURE(status)) {  		return (status);  	} -	node = acpi_ns_map_handle_to_node (gpe_device); +	node = acpi_ns_map_handle_to_node(gpe_device);  	if (!node) {  		status = AE_BAD_PARAMETER;  		goto unlock_and_exit; @@ -762,22 +698,21 @@ acpi_remove_gpe_block (  	/* Get the device_object attached to the node */ -	obj_desc = acpi_ns_get_attached_object (node); -	if (!obj_desc || -		!obj_desc->device.gpe_block) { -		return_ACPI_STATUS (AE_NULL_OBJECT); +	obj_desc = acpi_ns_get_attached_object(node); +	if (!obj_desc || !obj_desc->device.gpe_block) { +		return_ACPI_STATUS(AE_NULL_OBJECT);  	}  	/* Delete the GPE block (but not the device_object) */ -	status = acpi_ev_delete_gpe_block (obj_desc->device.gpe_block); -	if (ACPI_SUCCESS (status)) { +	status = acpi_ev_delete_gpe_block(obj_desc->device.gpe_block); +	if (ACPI_SUCCESS(status)) {  		obj_desc->device.gpe_block = NULL;  	} -unlock_and_exit: -	(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE); -	return_ACPI_STATUS (status); +      unlock_and_exit: +	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE); +	return_ACPI_STATUS(status);  }  EXPORT_SYMBOL(acpi_remove_gpe_block);  |