Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/acpi return (x) -> return x
details: https://anonhg.NetBSD.org/src/rev/9ee2c86d3f0b
branches: trunk
changeset: 565529:9ee2c86d3f0b
user: kochi <kochi%NetBSD.org@localhost>
date: Sun Apr 11 06:48:25 2004 +0000
description:
return (x) -> return x
use consitent variable name for ACPI_STATUS
diffstat:
sys/dev/acpi/acpi.c | 52 +++++++++---------
sys/dev/acpi/acpi_acad.c | 12 ++--
sys/dev/acpi/acpi_bat.c | 24 ++++----
sys/dev/acpi/acpi_button.c | 8 +-
sys/dev/acpi/acpi_ec.c | 123 +++++++++++++++++++++---------------------
sys/dev/acpi/acpi_lid.c | 8 +-
sys/dev/acpi/acpi_resource.c | 28 ++++----
sys/dev/acpi/pckbc_acpi.c | 12 ++--
sys/dev/acpi/wss_acpi.c | 8 +-
9 files changed, 138 insertions(+), 137 deletions(-)
diffs (truncated from 960 to 300 lines):
diff -r 0798b7512a6b -r 9ee2c86d3f0b sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c Sun Apr 11 06:13:46 2004 +0000
+++ b/sys/dev/acpi/acpi.c Sun Apr 11 06:48:25 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.62 2004/04/10 11:48:10 kochi Exp $ */
+/* $NetBSD: acpi.c,v 1.63 2004/04/11 06:48:25 kochi Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.62 2004/04/10 11:48:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.63 2004/04/11 06:48:25 kochi Exp $");
#include "opt_acpi.h"
@@ -193,7 +193,7 @@
if (ACPI_FAILURE(rv)) {
printf("ACPI: unable to initialize ACPICA: %s\n",
AcpiFormatException(rv));
- return (0);
+ return 0;
}
#ifdef ACPI_DEBUGGER
@@ -205,14 +205,14 @@
if (ACPI_FAILURE(rv)) {
printf("ACPI: unable to load tables: %s\n",
AcpiFormatException(rv));
- return (0);
+ return 0;
}
/*
* Looks like we have ACPI!
*/
- return (1);
+ return 1;
}
/*
@@ -226,7 +226,7 @@
struct acpibus_attach_args *aa = aux;
if (strcmp(aa->aa_busname, acpi_cd.cd_name) != 0)
- return (0);
+ return 0;
/*
* XXX Check other locators? Hard to know -- machine
@@ -234,7 +234,7 @@
* of ACPI by calling acpi_probe(), so I suppose we
* don't really have to do anything else.
*/
- return (1);
+ return 1;
}
/*
@@ -385,7 +385,7 @@
if (ACPI_SUCCESS(rv))
acpi_active = 0;
}
- return (rv);
+ return rv;
}
struct acpi_make_devnode_state {
@@ -571,7 +571,7 @@
case ACPI_TYPE_POWER:
ad = malloc(sizeof(*ad), M_ACPI, M_NOWAIT|M_ZERO);
if (ad == NULL)
- return (AE_NO_MEMORY);
+ return AE_NO_MEMORY;
ad->ad_devinfo = devinfo;
ad->ad_handle = handle;
@@ -602,7 +602,7 @@
}
}
out:
- return (AE_OK);
+ return AE_OK;
}
/*
@@ -665,7 +665,7 @@
}
}
- return (UNCONF);
+ return UNCONF;
}
/*****************************************************************************
@@ -758,7 +758,7 @@
"callback: %s\n", smpsw->smpsw_name,
AcpiFormatException(rv));
- return (ACPI_INTERRUPT_HANDLED);
+ return ACPI_INTERRUPT_HANDLED;
}
/*
@@ -805,7 +805,7 @@
if (ACPI_SUCCESS(rv))
*valp = param.Integer.Value;
- return (rv);
+ return rv;
}
/*
@@ -837,7 +837,7 @@
AcpiOsFree(param);
}
- return (rv);
+ return rv;
}
@@ -860,7 +860,7 @@
rv = AcpiEvaluateObject(handle, path, NULL, bufp);
- return (rv);
+ return rv;
}
/*
@@ -876,7 +876,7 @@
buf->Pointer = NULL;
buf->Length = ACPI_ALLOCATE_BUFFER;
- return ((*getit)(handle, buf));
+ return (*getit)(handle, buf);
}
@@ -893,19 +893,19 @@
while (*ids) {
if (ad->Valid & ACPI_VALID_HID) {
if (pmatch(ad->HardwareId.Value, *ids, NULL) == 2)
- return (1);
+ return 1;
}
if (ad->Valid & ACPI_VALID_CID) {
for (i = 0; i < ad->CompatibilityId.Count; i++) {
if (pmatch(ad->CompatibilityId.Id[i].Value, *ids, NULL) == 2)
- return (1);
+ return 1;
}
}
ids++;
}
- return (0);
+ return 0;
}
@@ -918,8 +918,8 @@
{
UINT8 type_a, type_b;
- return (ACPI_SUCCESS(AcpiGetSleepTypeData((UINT8)state,
- &type_a, &type_b)));
+ return ACPI_SUCCESS(AcpiGetSleepTypeData((UINT8)state,
+ &type_a, &type_b));
}
/*
@@ -986,7 +986,7 @@
break;
}
- return (ret);
+ return ret;
}
#ifdef ACPI_PCI_FIXUP
@@ -1028,7 +1028,7 @@
intr = -1;
rv = acpi_get(handle, &ret, AcpiGetCurrentResources);
if (ACPI_FAILURE(rv))
- return (intr);
+ return intr;
for (res = ret.Pointer; res->Id != ACPI_RSTYPE_END_TAG;
res = ACPI_NEXT_RESOURCE(res)) {
if (res->Id == ACPI_RSTYPE_IRQ) {
@@ -1039,7 +1039,7 @@
}
}
AcpiOsFree(ret.Pointer);
- return (intr);
+ return intr;
}
static void
@@ -1113,7 +1113,7 @@
rv = acpi_get(handle, &buf, AcpiGetIrqRoutingTable);
if (ACPI_FAILURE(rv))
- return (AE_OK);
+ return AE_OK;
/*
* If at level 1, this is a PCI root bus. Try the _BBN method
@@ -1177,7 +1177,7 @@
sc->sc_pci_bus++;
AcpiOsFree(buf.Pointer);
- return (AE_OK);
+ return AE_OK;
}
#endif /* ACPI_PCI_FIXUP */
diff -r 0798b7512a6b -r 9ee2c86d3f0b sys/dev/acpi/acpi_acad.c
--- a/sys/dev/acpi/acpi_acad.c Sun Apr 11 06:13:46 2004 +0000
+++ b/sys/dev/acpi/acpi_acad.c Sun Apr 11 06:48:25 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_acad.c,v 1.13 2004/03/24 11:32:09 kanaoka Exp $ */
+/* $NetBSD: acpi_acad.c,v 1.14 2004/04/11 06:48:25 kochi Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.13 2004/03/24 11:32:09 kanaoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.14 2004/04/11 06:48:25 kochi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -141,9 +141,9 @@
struct acpi_attach_args *aa = aux;
if (aa->aa_node->ad_type != ACPI_TYPE_DEVICE)
- return (0);
+ return 0;
- return (acpi_match_hid(aa->aa_node->ad_devinfo, acad_hid));
+ return acpi_match_hid(aa->aa_node->ad_devinfo, acad_hid);
}
/*
@@ -317,7 +317,7 @@
*tred = sc->sc_data[tred->sensor];
/* XXX locking */
- return (0);
+ return 0;
}
@@ -328,5 +328,5 @@
/* XXX Not implemented */
binfo->validflags = 0;
- return (0);
+ return 0;
}
diff -r 0798b7512a6b -r 9ee2c86d3f0b sys/dev/acpi/acpi_bat.c
--- a/sys/dev/acpi/acpi_bat.c Sun Apr 11 06:13:46 2004 +0000
+++ b/sys/dev/acpi/acpi_bat.c Sun Apr 11 06:48:25 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.36 2004/03/24 11:32:09 kanaoka Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.37 2004/04/11 06:48:25 kochi Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.36 2004/03/24 11:32:09 kanaoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.37 2004/04/11 06:48:25 kochi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -245,9 +245,9 @@
struct acpi_attach_args *aa = aux;
if (aa->aa_node->ad_type != ACPI_TYPE_DEVICE)
- return (0);
+ return 0;
- return (acpi_match_hid(aa->aa_node->ad_devinfo, bat_hid));
+ return acpi_match_hid(aa->aa_node->ad_devinfo, bat_hid);
}
/*
@@ -359,7 +359,7 @@
if (ACPI_FAILURE(rv)) {
Home |
Main Index |
Thread Index |
Old Index