Introduce two functions: physread() and physwrite() and use these directly

in *devsw[] rather than the 46 local copies of the same functions.

(grog will do the same for vinum when he has time)

1 files changed, 1 insertions, 15 deletions

diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index e893a21fbd40..28b91e745331 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c
@@ -285,8 +285,6 @@ static int labpcprobe(struct isa_device *dev);
 struct isa_driver labpcdriver =
 	{ labpcprobe, labpcattach, "labpc", 0  };
 
-static	d_read_t	labpcread;
-static	d_write_t	labpcwrite;
 static	d_open_t	labpcopen;
 static	d_close_t	labpcclose;
 static	d_ioctl_t	labpcioctl;
@@ -294,7 +292,7 @@ static	d_strategy_t	labpcstrategy;
 
 #define CDEV_MAJOR 66
 static struct cdevsw labpc_cdevsw = 
-	{ labpcopen,	labpcclose,	labpcread,	labpcwrite,
+	{ labpcopen,	labpcclose,	physread,	physwrite,
 	  labpcioctl,	nostop,		nullreset,	nodevtotty,
 	  seltrue,	nommap,		labpcstrategy, "labpc",	NULL,	-1 };
 
@@ -762,18 +760,6 @@ labpcclose(dev_t dev, int flags, int fmt, struct proc *p)
 	return 0;
 }
 
-static int
-labpcread( dev_t dev, struct uio *uio, int ioflag)
-{
-	return (physio(labpcstrategy, NULL, dev, 1, minphys, uio));
-}
-
-static int
-labpcwrite ( dev_t dev, struct uio *uio, int ioflag)
-{
-	return (physio(labpcstrategy, NULL, dev, 0, minphys, uio));
-}
-
 /*
  * Start: Start a frame going in or out.
  */