diff options
| author | gibbs <gibbs@FreeBSD.org> | 2000-09-20 04:46:15 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 2000-09-20 04:46:15 +0000 |
| commit | d33239bba3d070726d4220eb9027836b605d4e4f (patch) | |
| tree | 85770bf67ba0b8eba2d8b025f253adac8b7b40b0 /sys/dev | |
| parent | 556211d48c47e44561f556f3b42d15c02e028039 (diff) | |
| download | FreeBSD-src-d33239bba3d070726d4220eb9027836b605d4e4f.zip FreeBSD-src-d33239bba3d070726d4220eb9027836b605d4e4f.tar.gz | |
Remove the last two uses of ahc->unit in the FreeBSD version of the driver.
ahc->unit is depricated and will be going away as soon as the Linux
driver catches up. In the FreeBSD case, it is always initialized to 0
and this caused some strangeness in registering multiple ahc controllers
with CAM.
Noticed by: Tor.Egge@fast.no
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/aic7xxx/aic7xxx_freebsd.c | 5 | ||||
| -rw-r--r-- | sys/dev/aic7xxx/aic7xxx_osm.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/aic7xxx/aic7xxx_freebsd.c b/sys/dev/aic7xxx/aic7xxx_freebsd.c index c9c8f5a..98e1474 100644 --- a/sys/dev/aic7xxx/aic7xxx_freebsd.c +++ b/sys/dev/aic7xxx/aic7xxx_freebsd.c @@ -146,7 +146,8 @@ ahc_attach(struct ahc_softc *ahc) /* * Construct our first channel SIM entry */ - sim = cam_sim_alloc(ahc_action, ahc_poll, "ahc", ahc, ahc->unit, + sim = cam_sim_alloc(ahc_action, ahc_poll, "ahc", ahc, + device_get_unit(ahc->dev_softc), 1, AHC_SCB_MAX, devq); if (sim == NULL) { cam_simq_free(devq); @@ -178,7 +179,7 @@ ahc_attach(struct ahc_softc *ahc) if (ahc->features & AHC_TWIN) { sim2 = cam_sim_alloc(ahc_action, ahc_poll, "ahc", - ahc, ahc->unit, 1, + ahc, device_get_unit(ahc->dev_softc), 1, AHC_SCB_MAX, devq); if (sim2 == NULL) { diff --git a/sys/dev/aic7xxx/aic7xxx_osm.c b/sys/dev/aic7xxx/aic7xxx_osm.c index c9c8f5a..98e1474 100644 --- a/sys/dev/aic7xxx/aic7xxx_osm.c +++ b/sys/dev/aic7xxx/aic7xxx_osm.c @@ -146,7 +146,8 @@ ahc_attach(struct ahc_softc *ahc) /* * Construct our first channel SIM entry */ - sim = cam_sim_alloc(ahc_action, ahc_poll, "ahc", ahc, ahc->unit, + sim = cam_sim_alloc(ahc_action, ahc_poll, "ahc", ahc, + device_get_unit(ahc->dev_softc), 1, AHC_SCB_MAX, devq); if (sim == NULL) { cam_simq_free(devq); @@ -178,7 +179,7 @@ ahc_attach(struct ahc_softc *ahc) if (ahc->features & AHC_TWIN) { sim2 = cam_sim_alloc(ahc_action, ahc_poll, "ahc", - ahc, ahc->unit, 1, + ahc, device_get_unit(ahc->dev_softc), 1, AHC_SCB_MAX, devq); if (sim2 == NULL) { |
