Browse Source

ACPI: replace AE_BAD_ADDRESS exception code with AE_ERROR

The AE_BAD_ADDRESS exception code is now unused in ACPICA.
For linux, it's only used at wmi.c and acer-wmi.c.
I checked both wmi.c and acer-wmi.c, the AE_BAD_ADDRESS exception code
has no special meaning. The parent functions just call AE_SUCCESS() or
AE_FAILURE() to check the return status.
So it's safe to replace AE_BAD_ADDRESS with AE_ERROR.

Signed-off-by Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Lin Ming 17 years ago
parent
commit
08237974af
2 changed files with 10 additions and 10 deletions
  1. 5 5
      drivers/acpi/wmi.c
  2. 5 5
      drivers/misc/acer-wmi.c

+ 5 - 5
drivers/acpi/wmi.c

@@ -242,7 +242,7 @@ u32 method_id, const struct acpi_buffer *in, struct acpi_buffer *out)
 	char method[4] = "WM";
 	char method[4] = "WM";
 
 
 	if (!find_guid(guid_string, &wblock))
 	if (!find_guid(guid_string, &wblock))
-		return AE_BAD_ADDRESS;
+		return AE_ERROR;
 
 
 	block = &wblock->gblock;
 	block = &wblock->gblock;
 	handle = wblock->handle;
 	handle = wblock->handle;
@@ -304,7 +304,7 @@ struct acpi_buffer *out)
 		return AE_BAD_PARAMETER;
 		return AE_BAD_PARAMETER;
 
 
 	if (!find_guid(guid_string, &wblock))
 	if (!find_guid(guid_string, &wblock))
-		return AE_BAD_ADDRESS;
+		return AE_ERROR;
 
 
 	block = &wblock->gblock;
 	block = &wblock->gblock;
 	handle = wblock->handle;
 	handle = wblock->handle;
@@ -314,7 +314,7 @@ struct acpi_buffer *out)
 
 
 	/* Check GUID is a data block */
 	/* Check GUID is a data block */
 	if (block->flags & (ACPI_WMI_EVENT | ACPI_WMI_METHOD))
 	if (block->flags & (ACPI_WMI_EVENT | ACPI_WMI_METHOD))
-		return AE_BAD_ADDRESS;
+		return AE_ERROR;
 
 
 	input.count = 1;
 	input.count = 1;
 	input.pointer = wq_params;
 	input.pointer = wq_params;
@@ -385,7 +385,7 @@ const struct acpi_buffer *in)
 		return AE_BAD_DATA;
 		return AE_BAD_DATA;
 
 
 	if (!find_guid(guid_string, &wblock))
 	if (!find_guid(guid_string, &wblock))
-		return AE_BAD_ADDRESS;
+		return AE_ERROR;
 
 
 	block = &wblock->gblock;
 	block = &wblock->gblock;
 	handle = wblock->handle;
 	handle = wblock->handle;
@@ -395,7 +395,7 @@ const struct acpi_buffer *in)
 
 
 	/* Check GUID is a data block */
 	/* Check GUID is a data block */
 	if (block->flags & (ACPI_WMI_EVENT | ACPI_WMI_METHOD))
 	if (block->flags & (ACPI_WMI_EVENT | ACPI_WMI_METHOD))
-		return AE_BAD_ADDRESS;
+		return AE_ERROR;
 
 
 	input.count = 2;
 	input.count = 2;
 	input.pointer = params;
 	input.pointer = params;

+ 5 - 5
drivers/misc/acer-wmi.c

@@ -476,7 +476,7 @@ struct wmi_interface *iface)
 		}
 		}
 		break;
 		break;
 	default:
 	default:
-		return AE_BAD_ADDRESS;
+		return AE_ERROR;
 	}
 	}
 	return AE_OK;
 	return AE_OK;
 }
 }
@@ -514,7 +514,7 @@ static acpi_status AMW0_set_u32(u32 value, u32 cap, struct wmi_interface *iface)
 			break;
 			break;
 		}
 		}
 	default:
 	default:
-		return AE_BAD_ADDRESS;
+		return AE_ERROR;
 	}
 	}
 
 
 	/* Actually do the set */
 	/* Actually do the set */
@@ -689,7 +689,7 @@ struct wmi_interface *iface)
 			return 0;
 			return 0;
 		}
 		}
 	default:
 	default:
-		return AE_BAD_ADDRESS;
+		return AE_ERROR;
 	}
 	}
 	status = WMI_execute_u32(method_id, 0, &result);
 	status = WMI_execute_u32(method_id, 0, &result);
 
 
@@ -735,7 +735,7 @@ static acpi_status WMID_set_u32(u32 value, u32 cap, struct wmi_interface *iface)
 		}
 		}
 		break;
 		break;
 	default:
 	default:
-		return AE_BAD_ADDRESS;
+		return AE_ERROR;
 	}
 	}
 	return WMI_execute_u32(method_id, (u32)value, NULL);
 	return WMI_execute_u32(method_id, (u32)value, NULL);
 }
 }
@@ -785,7 +785,7 @@ static struct wmi_interface wmid_interface = {
 
 
 static acpi_status get_u32(u32 *value, u32 cap)
 static acpi_status get_u32(u32 *value, u32 cap)
 {
 {
-	acpi_status status = AE_BAD_ADDRESS;
+	acpi_status status = AE_ERROR;
 
 
 	switch (interface->type) {
 	switch (interface->type) {
 	case ACER_AMW0:
 	case ACER_AMW0: