summaryrefslogtreecommitdiffstats
path: root/sys/dev/aha
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2004-11-12 02:18:42 +0000
committerimp <imp@FreeBSD.org>2004-11-12 02:18:42 +0000
commit54bb856be5bafc2787c62f4dbe5002f4b4aa4245 (patch)
tree9e371377c6fed627f8cf2a96407bc1ac8f573b69 /sys/dev/aha
parent4527d163738e015ea8f8927e0d2f4f2cc86da05f (diff)
downloadFreeBSD-src-54bb856be5bafc2787c62f4dbe5002f4b4aa4245.zip
FreeBSD-src-54bb856be5bafc2787c62f4dbe5002f4b4aa4245.tar.gz
Various whitespace nits.
Noticed by: njl
Diffstat (limited to 'sys/dev/aha')
-rw-r--r--sys/dev/aha/aha_isa.c48
1 files changed, 27 insertions, 21 deletions
diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c
index db4634a..c43a428 100644
--- a/sys/dev/aha/aha_isa.c
+++ b/sys/dev/aha/aha_isa.c
@@ -122,7 +122,7 @@ aha_isa_probe(device_t dev)
port_rid = 0;
port_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &port_rid,
- 0, ~0, AHA_NREGS, RF_ACTIVE);
+ 0, ~0, AHA_NREGS, RF_ACTIVE);
if (port_res == NULL)
return (ENXIO);
@@ -150,7 +150,7 @@ aha_isa_probe(device_t dev)
"settings for adapter at %#jx. Failing probe\n",
(uintmax_t)port_start);
aha_free(aha);
- bus_release_resource(dev, SYS_RES_IOPORT, port_rid,
+ bus_release_resource(dev, SYS_RES_IOPORT, port_rid,
port_res);
return (ENXIO);
}
@@ -208,7 +208,8 @@ aha_isa_attach(device_t dev)
RF_ACTIVE);
if (!aha->irq) {
device_printf(dev, "Unable to allocate excluse use of irq\n");
- bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port);
+ bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid,
+ aha->port);
return ENOMEM;
}
@@ -217,7 +218,8 @@ aha_isa_attach(device_t dev)
RF_ACTIVE);
if (!aha->drq) {
device_printf(dev, "Unable to allocate drq\n");
- bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port);
+ bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid,
+ aha->port);
bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq);
return ENOMEM;
}
@@ -247,41 +249,45 @@ aha_isa_attach(device_t dev)
/* lockfunc */ busdma_lock_mutex,
/* lockarg */ &Giant,
&aha->parent_dmat) != 0) {
- bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port);
+ bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid,
+ aha->port);
bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq);
bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq);
- aha_free(aha);
- return (ENOMEM);
- }
+ aha_free(aha);
+ return (ENOMEM);
+ }
- if (aha_init(aha)) {
+ if (aha_init(aha)) {
device_printf(dev, "init failed\n");
- bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port);
+ bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid,
+ aha->port);
bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq);
bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq);
- aha_free(aha);
- return (ENOMEM);
- }
+ aha_free(aha);
+ return (ENOMEM);
+ }
error = aha_attach(aha);
if (error) {
device_printf(dev, "attach failed\n");
- bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port);
+ bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid,
+ aha->port);
bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq);
bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq);
- aha_free(aha);
- return (error);
+ aha_free(aha);
+ return (error);
}
- error = bus_setup_intr(dev, aha->irq, INTR_TYPE_CAM|INTR_ENTROPY, aha_intr, aha,
- &ih);
+ error = bus_setup_intr(dev, aha->irq, INTR_TYPE_CAM|INTR_ENTROPY,
+ aha_intr, aha, &ih);
if (error) {
device_printf(dev, "Unable to register interrupt handler\n");
- bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port);
+ bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid,
+ aha->port);
bus_release_resource(dev, SYS_RES_IRQ, aha->irqrid, aha->irq);
bus_release_resource(dev, SYS_RES_DRQ, aha->drqrid, aha->drq);
- aha_free(aha);
- return (error);
+ aha_free(aha);
+ return (error);
}
return (0);
OpenPOWER on IntegriCloud