26c26
< * $FreeBSD: head/sys/dev/acpica/acpi_powerres.c 89054 2002-01-08 06:46:01Z msmith $
---
> * $FreeBSD: head/sys/dev/acpica/acpi_powerres.c 91125 2002-02-23 05:28:22Z msmith $
78c78
< MODULE_NAME("POWERRES")
---
> ACPI_MODULE_NAME("POWERRES")
151c151
< FUNCTION_TRACE(__func__);
---
> ACPI_FUNCTION_TRACE(__func__);
154c154
< obj = NULL;
---
> buf.Pointer = NULL;
169,170c169,170
< bzero(&buf, sizeof(buf));
< if ((status = acpi_EvaluateIntoBuffer(res, NULL, NULL, &buf)) != AE_OK) {
---
> buf.Length = ACPI_ALLOCATE_BUFFER;
> if (ACPI_FAILURE(status = AcpiEvaluateObject(res, NULL, NULL, &buf))) {
200,202c200,202
< if (obj != NULL)
< AcpiOsFree(obj);
< if ((status != AE_OK) && (rp != NULL))
---
> if (buf.Pointer != NULL)
> AcpiOsFree(buf.Pointer);
> if (ACPI_FAILURE(status) && (rp != NULL))
215c215
< FUNCTION_TRACE(__func__);
---
> ACPI_FUNCTION_TRACE(__func__);
246c246
< FUNCTION_TRACE(__func__);
---
> ACPI_FUNCTION_TRACE(__func__);
277c277
< FUNCTION_TRACE(__func__);
---
> ACPI_FUNCTION_TRACE(__func__);
310c310
< FUNCTION_TRACE(__func__);
---
> ACPI_FUNCTION_TRACE(__func__);
314c314
< if ((status = acpi_pwr_register_consumer(consumer)) != AE_OK)
---
> if (ACPI_FAILURE(status = acpi_pwr_register_consumer(consumer)))
358a359
> reslist_buffer.Pointer = NULL;
360c361
< if (AcpiGetHandle(consumer, method_name, &method_handle) != AE_OK)
---
> if (ACPI_FAILURE(AcpiGetHandle(consumer, method_name, &method_handle)))
362c363
< if (AcpiGetHandle(consumer, reslist_name, &reslist_handle) != AE_OK)
---
> if (ACPI_FAILURE(AcpiGetHandle(consumer, reslist_name, &reslist_handle)))
374c375
< if (AcpiGetHandle(consumer, "_PR0", &pr0_handle) != AE_OK) {
---
> if (ACPI_FAILURE(AcpiGetHandle(consumer, "_PR0", &pr0_handle))) {
377,379c378,379
< bzero(&reslist_buffer, sizeof(reslist_buffer));
< status = acpi_EvaluateIntoBuffer(pr0_handle, NULL, NULL, &reslist_buffer);
< if (status != AE_OK) {
---
> reslist_buffer.Length = ACPI_ALLOCATE_BUFFER;
> if (ACPI_FAILURE(status = AcpiEvaluateObject(pr0_handle, NULL, NULL, &reslist_buffer))) {
387c387,389
< AcpiOsFree(reslist_object);
---
> AcpiOsFree(reslist_buffer.Pointer);
> reslist_buffer.Pointer = NULL;
> reslist_object = NULL;
394,395c396,397
< bzero(&reslist_buffer, sizeof(reslist_buffer));
< if ((status = acpi_EvaluateIntoBuffer(reslist_handle, NULL, NULL, &reslist_buffer)) != AE_OK) {
---
> reslist_buffer.Length = ACPI_ALLOCATE_BUFFER;
> if (ACPI_FAILURE(status = AcpiEvaluateObject(reslist_handle, NULL, NULL, &reslist_buffer))) {
398c400
< return_ACPI_STATUS(status);
---
> goto out;
404c406,407
< return_ACPI_STATUS(AE_TYPE);
---
> status = AE_TYPE;
> goto out;
406,407d408
< } else {
< reslist_object = NULL;
438c439
< if ((status = acpi_pwr_switch_power()) != AE_OK) {
---
> if (ACPI_FAILURE(status = acpi_pwr_switch_power())) {
441c442
< return_ACPI_STATUS(status); /* XXX is this appropriate? Should we return to previous state? */
---
> goto out; /* XXX is this appropriate? Should we return to previous state? */
448,450c449,454
< if ((status = AcpiEvaluateObject(method_handle, NULL, NULL, NULL)) != AE_OK)
< pc->ac_state = ACPI_STATE_UNKNOWN;
< return_ACPI_STATUS(status); /* XXX is this appropriate? Should we return to previous state? */
---
> if (ACPI_FAILURE(status = AcpiEvaluateObject(method_handle, NULL, NULL, NULL))) {
> ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "failed to set state - %s\n",
> AcpiFormatException(status)));
> pc->ac_state = ACPI_STATE_UNKNOWN;
> goto out; /* XXX Should we return to previous state? */
> }
452c456
<
---
>
460,462c464,469
< if (reslist_object)
< AcpiOsFree(reslist_object);
< return_ACPI_STATUS(AE_BAD_PARAMETER);
---
> status = AE_BAD_PARAMETER;
>
> out:
> if (reslist_buffer.Pointer != NULL)
> AcpiOsFree(reslist_buffer.Pointer);
> return_ACPI_STATUS(status);
478c485
< FUNCTION_TRACE(__func__);
---
> ACPI_FUNCTION_TRACE(__func__);
536c543
< FUNCTION_TRACE(__func__);
---
> ACPI_FUNCTION_TRACE(__func__);
549c556
< if ((status = acpi_EvaluateInteger(rp->ap_resource, "_STA", &cur)) != AE_OK) {
---
> if (ACPI_FAILURE(status = acpi_EvaluateInteger(rp->ap_resource, "_STA", &cur))) {
583c590
< if ((status = acpi_EvaluateInteger(rp->ap_resource, "_STA", &cur)) != AE_OK) {
---
> if (ACPI_FAILURE(status = acpi_EvaluateInteger(rp->ap_resource, "_STA", &cur))) {
616c623
< FUNCTION_TRACE(__func__);
---
> ACPI_FUNCTION_TRACE(__func__);
632c639
< FUNCTION_TRACE(__func__);
---
> ACPI_FUNCTION_TRACE(__func__);