Use the standard DISKFLAG_OPEN instead of implementing our own.

Use noclose() instead now that our close method is empty.

2 files changed, 2 insertions, 19 deletions

diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c
index 3fc2b74..0f64808 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);
diff --git a/sys/dev/amr/amrvar.h b/sys/dev/amr/amrvar.h
index 1c9884f..0ea90a9 100644
--- a/sys/dev/amr/amrvar.h
+++ b/sys/dev/amr/amrvar.h
@@ -256,8 +256,6 @@ struct amrd_softc
     struct disk		amrd_disk;
     struct devstat	amrd_stats;
     int			amrd_unit;
-    int			amrd_flags;
-#define AMRD_OPEN	(1<<0)		/* drive is open (can't detach) */
 };
 
 /*