acpi: replace return_ACPI_STATUS with return

PATCH In review Lin Ming 1 participant 1 message Nov 26, 2008 ACPI

lore

Share & tools

lore

Lin Ming

author

2008-11-26 02:58 UTC #0 lore raw

PATCH 2/8 acpi: replace return_ACPI_STATUS with return

return_ACPI_STATUS is an internal acpica function. Replace it with return.

Signed-off-by Lin Ming <[email protected]>

---
 drivers/acpi/osl.c        |    4 ++--
 drivers/acpi/sleep/proc.c |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

drivers/acpi/osl.c +2 -2

index 4be2521..8057a8f 100644
@@ -737,7 +737,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
 
 	dpc = kmalloc(sizeof(struct acpi_os_dpc), GFP_ATOMIC);
 	if (!dpc)
-		return_ACPI_STATUS(AE_NO_MEMORY);
+		return AE_NO_MEMORY;
 
 	dpc->function = function;
 	dpc->context = context;

@@ -758,7 +758,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
 		status = AE_ERROR;
 		kfree(dpc);
 	}
-	return_ACPI_STATUS(status);
+	return status;
 }
 
 acpi_status acpi_os_execute(acpi_execute_type type,

drivers/acpi/sleep/proc.c +3 -3

index 64e591b..1400510 100644
@@ -230,10 +230,10 @@ acpi_system_write_alarm(struct file *file,
 	ACPI_FUNCTION_TRACE("acpi_system_write_alarm");
 
 	if (count > sizeof(alarm_string) - 1)
-		return_VALUE(-EINVAL);
+		return -EINVAL;
 
 	if (copy_from_user(alarm_string, buffer, count))
-		return_VALUE(-EFAULT);
+		return -EFAULT;
 
 	alarm_string[count] = '\0';

@@ -334,7 +334,7 @@ acpi_system_write_alarm(struct file *file,
 
 	result = 0;
       end:
-	return_VALUE(result ? result : count);
+	return result ? result : count;
 }
 #endif				/* HAVE_ACPI_LEGACY_ALARM */