diff options
| author | imp <imp@FreeBSD.org> | 2003-11-09 19:51:16 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-11-09 19:51:16 +0000 |
| commit | e060a36d77eab7ddc10328b6d86ccbd6f044648f (patch) | |
| tree | 0652da449588358cfb53cc4e077d8eb8e69e0d98 /sys/dev/aha/aha_mca.c | |
| parent | 9189a12295dbbf9c9e8b80a6095bf5b7c3a24a8b (diff) | |
| download | FreeBSD-src-e060a36d77eab7ddc10328b6d86ccbd6f044648f.zip FreeBSD-src-e060a36d77eab7ddc10328b6d86ccbd6f044648f.tar.gz | |
Let bus space manage softc.
Diffstat (limited to 'sys/dev/aha/aha_mca.c')
| -rw-r--r-- | sys/dev/aha/aha_mca.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sys/dev/aha/aha_mca.c b/sys/dev/aha/aha_mca.c index c3d4417..caa110f 100644 --- a/sys/dev/aha/aha_mca.c +++ b/sys/dev/aha/aha_mca.c @@ -110,15 +110,13 @@ aha_mca_probe (device_t dev) mca_add_drq(dev, drq); mca_add_irq(dev, irq); - aha_unit++; - return (0); } static int aha_mca_attach (device_t dev) { - struct aha_softc * sc = NULL; + struct aha_softc * sc = device_get_softc(dev); struct resource * io = NULL; struct resource * irq = NULL; struct resource * drq = NULL; @@ -154,13 +152,7 @@ aha_mca_attach (device_t dev) goto bad; } - sc = aha_alloc(unit, rman_get_bustag(io), rman_get_bushandle(io)); - if (sc == NULL) { - device_printf(dev, "aha_alloc() failed!\n"); - error = ENOMEM; - goto bad; - } - + aha_alloc(sc, unit, rman_get_bustag(io), rman_get_bushandle(io)); error = aha_probe(sc); if (error) { device_printf(dev, "aha_probe() failed!\n"); |
