summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2004-11-13 23:39:56 +0000
committerimp <imp@FreeBSD.org>2004-11-13 23:39:56 +0000
commitd3854eb0e5dfd362deca6c1e8ea4eeac2535cd0c (patch)
treec54f457054f2666773fce749365ba807653a7e2f
parentb99ff6bbb678feaf9573724b84ffc2c5584a84e0 (diff)
downloadFreeBSD-src-d3854eb0e5dfd362deca6c1e8ea4eeac2535cd0c.zip
FreeBSD-src-d3854eb0e5dfd362deca6c1e8ea4eeac2535cd0c.tar.gz
Kill ACPI_FUNCTION_TRACE. It is killing the tinderbox build, and it
isn't worth adding to the modules lists that we have to hard code for this to work. Since we print PID right away, we have a trace point already. Minor knf while I'm here.
-rw-r--r--sys/dev/acpi_support/acpi_sony.c16
-rw-r--r--sys/dev/acpica/acpi_snc.c16
2 files changed, 12 insertions, 20 deletions
diff --git a/sys/dev/acpi_support/acpi_sony.c b/sys/dev/acpi_support/acpi_sony.c
index 2bcb840..006055e 100644
--- a/sys/dev/acpi_support/acpi_sony.c
+++ b/sys/dev/acpi_support/acpi_sony.c
@@ -112,21 +112,17 @@ acpi_snc_attach(device_t dev)
{
struct acpi_snc_softc *sc;
int i;
- ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__);
sc = device_get_softc(dev);
-
acpi_GetInteger(acpi_get_handle(dev), ACPI_SNC_GET_PID, &sc->pid);
device_printf(dev, "PID %x\n", sc->pid);
-
- for(i = 0 ; acpi_snc_oids[i].nodename != NULL; i++){
+ for (i = 0 ; acpi_snc_oids[i].nodename != NULL; i++){
SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
- SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
- i, acpi_snc_oids[i].nodename , CTLTYPE_INT |
- ((acpi_snc_oids[i].setmethod)? CTLFLAG_RW: CTLFLAG_RD),
- dev, i,
- sysctl_acpi_snc_gen_handler, "I",
- acpi_snc_oids[i].comment);
+ SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
+ i, acpi_snc_oids[i].nodename , CTLTYPE_INT |
+ ((acpi_snc_oids[i].setmethod)? CTLFLAG_RW: CTLFLAG_RD),
+ dev, i, sysctl_acpi_snc_gen_handler, "I",
+ acpi_snc_oids[i].comment);
}
return_VALUE(0);
diff --git a/sys/dev/acpica/acpi_snc.c b/sys/dev/acpica/acpi_snc.c
index 2bcb840..006055e 100644
--- a/sys/dev/acpica/acpi_snc.c
+++ b/sys/dev/acpica/acpi_snc.c
@@ -112,21 +112,17 @@ acpi_snc_attach(device_t dev)
{
struct acpi_snc_softc *sc;
int i;
- ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__);
sc = device_get_softc(dev);
-
acpi_GetInteger(acpi_get_handle(dev), ACPI_SNC_GET_PID, &sc->pid);
device_printf(dev, "PID %x\n", sc->pid);
-
- for(i = 0 ; acpi_snc_oids[i].nodename != NULL; i++){
+ for (i = 0 ; acpi_snc_oids[i].nodename != NULL; i++){
SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
- SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
- i, acpi_snc_oids[i].nodename , CTLTYPE_INT |
- ((acpi_snc_oids[i].setmethod)? CTLFLAG_RW: CTLFLAG_RD),
- dev, i,
- sysctl_acpi_snc_gen_handler, "I",
- acpi_snc_oids[i].comment);
+ SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
+ i, acpi_snc_oids[i].nodename , CTLTYPE_INT |
+ ((acpi_snc_oids[i].setmethod)? CTLFLAG_RW: CTLFLAG_RD),
+ dev, i, sysctl_acpi_snc_gen_handler, "I",
+ acpi_snc_oids[i].comment);
}
return_VALUE(0);
OpenPOWER on IntegriCloud