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.

5 files changed, 1 insertions, 13 deletions

diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c
index 2f725b1..464ad87 100644
--- a/sys/dev/ida/ida.c
+++ b/sys/dev/ida/ida.c
@@ -46,7 +46,6 @@
 
 #include <sys/bio.h>
 #include <sys/bus.h>
-#include <sys/devicestat.h>
 #include <sys/conf.h>
 #include <sys/disk.h>
 
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index c7cc93e..7efb8de 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -38,7 +38,6 @@
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/cons.h>
-#include <sys/devicestat.h>
 #include <sys/disk.h>
 
 #include <machine/bus_memio.h>
@@ -105,7 +104,6 @@ idad_strategy(struct bio *bp)
 	}
 
 	s = splbio();
-	devstat_start_transaction(&drv->stats);
 	ida_submit_buf(drv->controller, bp);
 	splx(s);
 	return;
@@ -156,7 +154,7 @@ idad_intr(struct bio *bp)
 	else
 		bp->bio_resid = 0;
 
-	biofinish(bp, &drv->stats, 0);
+	biodone(bp);
 }
 
 static int
@@ -202,11 +200,6 @@ idad_attach(device_t dev)
 	    drv->secperunit / ((1024 * 1024) / drv->secsize),
 	    drv->secperunit, drv->secsize);
 
-	devstat_add_entry(&drv->stats, "idad", drv->unit, drv->secsize,
-	    DEVSTAT_NO_ORDERED_TAGS,
-	    DEVSTAT_TYPE_STORARRAY| DEVSTAT_TYPE_IF_OTHER,
-	    DEVSTAT_PRIORITY_ARRAY);
-
 	drv->disk.d_strategy = idad_strategy;
 	drv->disk.d_name = "idad";
 	drv->disk.d_dump = idad_dump;
@@ -227,7 +220,6 @@ idad_detach(device_t dev)
 	struct idad_softc *drv;
 
 	drv = (struct idad_softc *)device_get_softc(dev);
-	devstat_remove_entry(&drv->stats);
 	disk_destroy(&drv->disk);
 	return (0);
 }
diff --git a/sys/dev/ida/ida_eisa.c b/sys/dev/ida/ida_eisa.c
index c041fe2..eca4722 100644
--- a/sys/dev/ida/ida_eisa.c
+++ b/sys/dev/ida/ida_eisa.c
@@ -33,7 +33,6 @@
 #include <sys/bus.h>
 
 #include <sys/bio.h>
-#include <sys/devicestat.h>
 #include <sys/conf.h>
 #include <sys/disk.h>
 
diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c
index 00f1bc7..f7194a4 100644
--- a/sys/dev/ida/ida_pci.c
+++ b/sys/dev/ida/ida_pci.c
@@ -32,7 +32,6 @@
 
 #include <sys/bio.h>
 #include <sys/bus.h>
-#include <sys/devicestat.h>
 #include <sys/conf.h>
 #include <sys/disk.h>
 
diff --git a/sys/dev/ida/idavar.h b/sys/dev/ida/idavar.h
index c11438e..4d5a9d6 100644
--- a/sys/dev/ida/idavar.h
+++ b/sys/dev/ida/idavar.h
@@ -170,7 +170,6 @@ struct idad_softc {
 	device_t	dev;
 	struct 		ida_softc *controller;
 	struct		disk disk;
-	struct		devstat stats;
 	int		drive;			/* per controller */
 	int		unit;			/* global */
 	int		cylinders;