From 871722fc592554929f8b11fe1281250ed4096621 Mon Sep 17 00:00:00 2001 From: des Date: Sun, 31 Oct 2004 15:02:53 +0000 Subject: Whitespace cleanup --- sys/amd64/pci/pci_bus.c | 10 +++++----- sys/dev/acpica/acpi_pcib_acpi.c | 8 ++++---- sys/i386/pci/pci_bus.c | 16 ++++++++-------- sys/sys/kernel.h | 2 +- sys/sys/systm.h | 10 +++++----- 5 files changed, 23 insertions(+), 23 deletions(-) (limited to 'sys') diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c index 54bc138..a85dd19 100644 --- a/sys/amd64/pci/pci_bus.c +++ b/sys/amd64/pci/pci_bus.c @@ -117,7 +117,7 @@ legacy_pcib_identify(driver_t *driver, device_t parent) * via some other means. If we have, bail since otherwise * we're going to end up duplicating it. */ - if ((pci_devclass = devclass_find("pci")) && + if ((pci_devclass = devclass_find("pci")) && devclass_get_device(pci_devclass, 0)) return; @@ -136,7 +136,7 @@ legacy_pcib_identify(driver_t *driver, device_t parent) */ if ((hdrtype & PCIM_HDRTYPE) > PCI_MAXHDRTYPE) continue; - if ((hdrtype & PCIM_MFDEV) && + if ((hdrtype & PCIM_MFDEV) && (!found_orion || hdrtype != 0xff)) pcifunchigh = PCI_FUNCMAX; else @@ -394,12 +394,12 @@ DRIVER_MODULE(hostb, pci, pci_hostb_driver, pci_hostb_devclass, 0, 0); /* * Install placeholder to claim the resources owned by the - * PCI bus interface. This could be used to extract the + * PCI bus interface. This could be used to extract the * config space registers in the extreme case where the PnP * ID is available and the PCI BIOS isn't, but for now we just * eat the PnP ID and do nothing else. * - * XXX we should silence this probe, as it will generally confuse + * XXX we should silence this probe, as it will generally confuse * people. */ static struct isa_pnp_id pcibus_pnp_ids[] = { @@ -411,7 +411,7 @@ static int pcibus_pnp_probe(device_t dev) { int result; - + if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, pcibus_pnp_ids)) <= 0) device_quiet(dev); return(result); diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 8ec60e7..3ba2aab 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -73,7 +73,7 @@ static void acpi_pcib_write_config(device_t dev, int bus, int slot, static int acpi_pcib_acpi_route_interrupt(device_t pcib, device_t dev, int pin); static struct resource *acpi_pcib_acpi_alloc_resource(device_t dev, - device_t child, int type, int *rid, + device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags); @@ -92,7 +92,7 @@ static device_method_t acpi_pcib_acpi_methods[] = { DEVMETHOD(bus_alloc_resource, acpi_pcib_acpi_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), @@ -147,7 +147,7 @@ acpi_pcib_acpi_attach(device_t dev) * Get our base bus number by evaluating _BBN. * If this doesn't work, we assume we're bus number 0. * - * XXX note that it may also not exist in the case where we are + * XXX note that it may also not exist in the case where we are * meant to use a private configuration space mechanism for this bus, * so we should dig out our resources and check to see if we have * anything like that. How do we do this? @@ -264,7 +264,7 @@ acpi_pcib_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) static int acpi_pcib_write_ivar(device_t dev, device_t child, int which, uintptr_t value) { - struct acpi_hpcib_softc *sc = device_get_softc(dev); + struct acpi_hpcib_softc *sc = device_get_softc(dev); switch (which) { case PCIB_IVAR_BUS: diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c index 378075a..e561fa2 100644 --- a/sys/i386/pci/pci_bus.c +++ b/sys/i386/pci/pci_bus.c @@ -134,9 +134,9 @@ legacy_pcib_is_host_bridge(int bus, int slot, int func, case 0x84ca8086: /* * For the 450nx chipset, there is a whole bundle of - * things pretending to be host bridges. The MIOC will + * things pretending to be host bridges. The MIOC will * be seen first and isn't really a pci bridge (the - * actual busses are attached to the PXB's). We need to + * actual busses are attached to the PXB's). We need to * read the registers of the MIOC to figure out the * bus numbers for the PXB channels. * @@ -239,7 +239,7 @@ legacy_pcib_is_host_bridge(int bus, int slot, int func, s = "ServerWorks NB6536 2.0HE host to PCI bridge"; *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); break; - + case 0x00061166: /* FALLTHROUGH */ case 0x00081166: @@ -313,7 +313,7 @@ legacy_pcib_identify(driver_t *driver, device_t parent) * via some other means. If we have, bail since otherwise * we're going to end up duplicating it. */ - if ((pci_devclass = devclass_find("pci")) && + if ((pci_devclass = devclass_find("pci")) && devclass_get_device(pci_devclass, 0)) return; @@ -332,7 +332,7 @@ legacy_pcib_identify(driver_t *driver, device_t parent) */ if ((hdrtype & PCIM_HDRTYPE) > PCI_MAXHDRTYPE) continue; - if ((hdrtype & PCIM_MFDEV) && + if ((hdrtype & PCIM_MFDEV) && (!found_orion || hdrtype != 0xff)) pcifunchigh = PCI_FUNCMAX; else @@ -600,12 +600,12 @@ DRIVER_MODULE(hostb, pci, pci_hostb_driver, pci_hostb_devclass, 0, 0); /* * Install placeholder to claim the resources owned by the - * PCI bus interface. This could be used to extract the + * PCI bus interface. This could be used to extract the * config space registers in the extreme case where the PnP * ID is available and the PCI BIOS isn't, but for now we just * eat the PnP ID and do nothing else. * - * XXX we should silence this probe, as it will generally confuse + * XXX we should silence this probe, as it will generally confuse * people. */ static struct isa_pnp_id pcibus_pnp_ids[] = { @@ -617,7 +617,7 @@ static int pcibus_pnp_probe(device_t dev) { int result; - + if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, pcibus_pnp_ids)) <= 0) device_quiet(dev); return(result); diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 9c449ec..f5795c4 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -188,7 +188,7 @@ enum sysinit_elem_order { * to discern SYSINIT's which take non-constant data pointers and * SYSINIT's which take constant data pointers, * - * The C_* macros take functions expecting const void * arguments + * The C_* macros take functions expecting const void * arguments * while the non-C_* macros take functions expecting just void * arguments. * * With -Wcast-qual on, the compiler issues warnings: diff --git a/sys/sys/systm.h b/sys/sys/systm.h index b8de519..4b3662f 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -155,7 +155,7 @@ int sprintf(char *buf, const char *, ...) __printflike(2, 3); int uprintf(const char *, ...) __printflike(1, 2); int vprintf(const char *, __va_list) __printflike(1, 0); int vsnprintf(char *, size_t, const char *, __va_list) __printflike(3, 0); -int vsnrprintf(char *, size_t, int, const char *, __va_list) __printflike(4, 0); +int vsnrprintf(char *, size_t, int, const char *, __va_list) __printflike(4, 0); int vsprintf(char *buf, const char *, __va_list) __printflike(2, 0); int ttyprintf(struct tty *, const char *, ...) __printflike(2, 3); int sscanf(const char *, char const *, ...) __nonnull(1) __nonnull(2); @@ -232,10 +232,10 @@ int setenv(const char *name, const char *value); int unsetenv(const char *name); int testenv(const char *name); -#ifdef APM_FIXUP_CALLTODO +#ifdef APM_FIXUP_CALLTODO struct timeval; -void adjust_timeout_calltodo(struct timeval *time_change); -#endif /* APM_FIXUP_CALLTODO */ +void adjust_timeout_calltodo(struct timeval *time_change); +#endif /* APM_FIXUP_CALLTODO */ #include @@ -283,7 +283,7 @@ static __inline intrmask_t spltty(void) { return 0; } static __inline intrmask_t splvm(void) { return 0; } static __inline void splx(intrmask_t ipl __unused) { return; } -/* +/* * Common `proc' functions are declared here so that proc.h can be included * less often. */ -- cgit v1.1