diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-02-22 10:10:12 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-02-22 10:10:12 +0000 |
| commit | 3eb309c55e17faae1b661b35b6c673d3a41f8dea (patch) | |
| tree | 502bcba47cbea7e0f899a545c1c9975a728b0142 /sys/dev/amr/amr_disk.c | |
| parent | 3512c1b38697382a2841f18157194cbc3f4e661d (diff) | |
Notes
Diffstat (limited to 'sys/dev/amr/amr_disk.c')
| -rw-r--r-- | sys/dev/amr/amr_disk.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c index 3fc2b74ff92d..0f6480860c6a 100644 --- a/sys/dev/amr/amr_disk.c +++ b/sys/dev/amr/amr_disk.c @@ -85,14 +85,13 @@ static int amrd_attach(device_t dev); static int amrd_detach(device_t dev); static d_open_t amrd_open; -static d_close_t amrd_close; static d_strategy_t amrd_strategy; #define AMRD_CDEV_MAJOR 133 static struct cdevsw amrd_cdevsw = { /* open */ amrd_open, - /* close */ amrd_close, + /* close */ noclose, /* read */ physread, /* write */ physwrite, /* ioctl */ noioctl, @@ -164,20 +163,6 @@ amrd_open(dev_t dev, int flags, int fmt, d_thread_t *td) sc->amrd_disk.d_fwheads = sc->amrd_drive->al_heads; #endif - sc->amrd_flags |= AMRD_OPEN; - return (0); -} - -static int -amrd_close(dev_t dev, int flags, int fmt, d_thread_t *td) -{ - struct amrd_softc *sc = (struct amrd_softc *)dev->si_drv1; - - debug_called(1); - - if (sc == NULL) - return (ENXIO); - sc->amrd_flags &= ~AMRD_OPEN; return (0); } @@ -284,7 +269,7 @@ amrd_detach(device_t dev) debug_called(1); - if (sc->amrd_flags & AMRD_OPEN) + if (sc->amrd_disk.d_flags & DISKFLAG_OPEN) return(EBUSY); devstat_remove_entry(&sc->amrd_stats); |
