diff options
-rw-r--r-- | sys/dev/acpica/acpi.c | 6 | ||||
-rw-r--r-- | sys/dev/acpica/acpi_ec.c | 2 | ||||
-rw-r--r-- | sys/dev/acpica/acpi_pcib.c | 2 | ||||
-rw-r--r-- | sys/dev/acpica/acpi_pcib_pci.c | 4 | ||||
-rw-r--r-- | sys/dev/acpica/acpi_powerres.c | 4 | ||||
-rw-r--r-- | sys/dev/acpica/acpi_resource.c | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index eccee0e..a559857 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -1900,7 +1900,7 @@ acpi_FindIndexedResource(ACPI_BUFFER *buf, int index, ACPI_RESOURCE **resp) rp = (ACPI_RESOURCE *)buf->Pointer; i = index; while (i-- > 0) { - /* Range check */ + /* Range check */ if (rp > (ACPI_RESOURCE *)((u_int8_t *)buf->Pointer + buf->Length)) return (AE_BAD_PARAMETER); @@ -2657,7 +2657,7 @@ acpi_register_ioctl(u_long cmd, acpi_ioctl_fn fn, void *arg) return (0); } -void +void acpi_deregister_ioctl(u_long cmd, acpi_ioctl_fn fn) { struct acpi_ioctl_hook *hp; @@ -3034,7 +3034,7 @@ acpi_pm_func(u_long cmd, void *arg, ...) va_start(ap, arg); state = va_arg(ap, int); - va_end(ap); + va_end(ap); switch (state) { case POWER_SLEEP_STATE_STANDBY: diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c index 1f168ca..17a9d6f 100644 --- a/sys/dev/acpica/acpi_ec.c +++ b/sys/dev/acpica/acpi_ec.c @@ -176,7 +176,7 @@ typedef UINT8 EC_COMMAND; * Note that a set bit (1) indicates the property is TRUE * (e.g. if bit 0 is set then the output buffer is full). * +-+-+-+-+-+-+-+-+ - * |7|6|5|4|3|2|1|0| + * |7|6|5|4|3|2|1|0| * +-+-+-+-+-+-+-+-+ * | | | | | | | | * | | | | | | | +- Output Buffer Full? diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c index 51c3207..39f6cd5 100644 --- a/sys/dev/acpica/acpi_pcib.c +++ b/sys/dev/acpica/acpi_pcib.c @@ -57,7 +57,7 @@ struct prt_lookup_request { u_int pr_pin; u_int pr_slot; }; - + typedef void prt_entry_handler(ACPI_PCI_ROUTING_TABLE *entry, void *arg); static void prt_attach_devices(ACPI_PCI_ROUTING_TABLE *entry, void *arg); diff --git a/sys/dev/acpica/acpi_pcib_pci.c b/sys/dev/acpica/acpi_pcib_pci.c index a4c587f..35c3f3d 100644 --- a/sys/dev/acpica/acpi_pcib_pci.c +++ b/sys/dev/acpica/acpi_pcib_pci.c @@ -55,12 +55,12 @@ struct acpi_pcib_softc { ACPI_HANDLE ap_handle; ACPI_BUFFER ap_prt; /* interrupt routing table */ }; - + struct acpi_pcib_lookup_info { UINT32 address; ACPI_HANDLE handle; }; - + static int acpi_pcib_pci_probe(device_t bus); static int acpi_pcib_pci_attach(device_t bus); static int acpi_pcib_pci_resume(device_t bus); diff --git a/sys/dev/acpica/acpi_powerres.c b/sys/dev/acpica/acpi_powerres.c index 624fc54..1a37216 100644 --- a/sys/dev/acpica/acpi_powerres.c +++ b/sys/dev/acpica/acpi_powerres.c @@ -468,7 +468,7 @@ acpi_pwr_switch_consumer(ACPI_HANDLE consumer, int state) acpi_name(consumer), state)); /* XXX is this appropriate? Should we return to previous state? */ - goto out; + goto out; } /* Invoke power state switch method (if present) */ @@ -486,7 +486,7 @@ acpi_pwr_switch_consumer(ACPI_HANDLE consumer, int state) goto out; } } - + /* Transition was successful */ pc->ac_state = state; status = AE_OK; diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c index c5be7bb..9ccf45c 100644 --- a/sys/dev/acpica/acpi_resource.c +++ b/sys/dev/acpica/acpi_resource.c @@ -131,7 +131,7 @@ acpi_config_intr(device_t dev, ACPI_RESOURCE *res) } BUS_CONFIG_INTR(dev, irq, (trig == ACPI_EDGE_SENSITIVE) ? INTR_TRIGGER_EDGE : INTR_TRIGGER_LEVEL, (pol == ACPI_ACTIVE_HIGH) ? - INTR_POLARITY_HIGH : INTR_POLARITY_LOW); + INTR_POLARITY_HIGH : INTR_POLARITY_LOW); } /* |