Centralize the devstat handling for all GEOM disk device drivers

in geom_disk.c.

As a side effect this makes a lot of #include <sys/devicestat.h>
lines not needed and some biofinish() calls can be reduced to
biodone() again.

6 files changed, 1 insertions, 14 deletions

diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index 3b58af5..170ff98 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -68,7 +68,6 @@
 #include <dev/amr/amr_compat.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
-#include <sys/devicestat.h>
 #include <sys/disk.h>
 #include <sys/stat.h>
 
diff --git a/sys/dev/amr/amr_cam.c b/sys/dev/amr/amr_cam.c
index 603a751..1c8f6b6 100644
--- a/sys/dev/amr/amr_cam.c
+++ b/sys/dev/amr/amr_cam.c
@@ -64,7 +64,6 @@
 #include <dev/amr/amr_compat.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
-#include <sys/devicestat.h>
 #include <sys/disk.h>
 #include <sys/stat.h>
 
diff --git a/sys/dev/amr/amr_compat.h b/sys/dev/amr/amr_compat.h
index 9bd5dc8..33a09f0 100644
--- a/sys/dev/amr/amr_compat.h
+++ b/sys/dev/amr/amr_compat.h
@@ -91,7 +91,7 @@
 #else
 # include <sys/bio.h>
 # define BIO_IS_READ(x)				((x)->bio_cmd == BIO_READ)
-# define AMR_BIO_FINISH(x)                      biofinish(x, &sc->amrd_stats, 0)
+# define AMR_BIO_FINISH(x)                      biodone(x)
 #endif
 
 /************************************************************************
diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c
index 2960bda6..4266f15 100644
--- a/sys/dev/amr/amr_disk.c
+++ b/sys/dev/amr/amr_disk.c
@@ -68,7 +68,6 @@
 #include <dev/amr/amr_compat.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
-#include <sys/devicestat.h>
 #include <sys/disk.h>
 
 #include <machine/bus.h>
@@ -161,7 +160,6 @@ amrd_strategy(struct bio *bio)
 	goto bad;
     }
 
-    devstat_start_transaction(&sc->amrd_stats);
     amr_submit_bio(sc->amrd_controller, bio);
     return;
 
@@ -180,7 +178,6 @@ void
 amrd_intr(void *data)
 {
     struct bio *bio = (struct bio *)data;
-    struct amrd_softc *sc = (struct amrd_softc *)bio->bio_disk->d_drv1;
 
     debug_called(2);
 
@@ -223,11 +220,6 @@ amrd_attach(device_t dev)
 		  sc->amrd_drive->al_size, sc->amrd_drive->al_properties & AMR_DRV_RAID_MASK, 
 		  amr_describe_code(amr_table_drvstate, AMR_DRV_CURSTATE(sc->amrd_drive->al_state)));
 
-    devstat_add_entry(&sc->amrd_stats, "amrd", sc->amrd_unit, AMR_BLKSIZE,
-		      DEVSTAT_NO_ORDERED_TAGS,
-		      DEVSTAT_TYPE_STORARRAY | DEVSTAT_TYPE_IF_OTHER, 
-		      DEVSTAT_PRIORITY_ARRAY);
-
     sc->amrd_disk.d_drv1 = sc;
     sc->amrd_disk.d_maxsize = (AMR_NSEG - 1) * PAGE_SIZE;
     sc->amrd_disk.d_open = amrd_open;
@@ -251,7 +243,6 @@ amrd_detach(device_t dev)
     if (sc->amrd_disk.d_flags & DISKFLAG_OPEN)
 	return(EBUSY);
 
-    devstat_remove_entry(&sc->amrd_stats);
 #ifdef FREEBSD_4
     if (--disks_registered == 0)
 	cdevsw_remove(&amrddisk_cdevsw);
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index f870d4c..caffc5d 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -63,7 +63,6 @@
 #include <dev/amr/amr_compat.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
-#include <sys/devicestat.h>
 #include <sys/disk.h>
 
 #include <machine/bus_memio.h>
diff --git a/sys/dev/amr/amrvar.h b/sys/dev/amr/amrvar.h
index bc6f4ae..a9bca40 100644
--- a/sys/dev/amr/amrvar.h
+++ b/sys/dev/amr/amrvar.h
@@ -253,7 +253,6 @@ struct amrd_softc
     struct amr_softc	*amrd_controller;
     struct amr_logdrive	*amrd_drive;
     struct disk		amrd_disk;
-    struct devstat	amrd_stats;
     int			amrd_unit;
 };