Use bdev_decl() to get block device function prototypes instead of rolling

our own (sometimes incorrect).

3 files changed, 11 insertions, 22 deletions

diff --git a/sys/arch/vax/mba/hp.c b/sys/arch/vax/mba/hp.c
index ab5450e1828..9320519dd69 100644
--- a/sys/arch/vax/mba/hp.c
+++ b/sys/arch/vax/mba/hp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hp.c,v 1.23 2010/09/22 06:40:25 krw Exp $ */
+/*	$OpenBSD: hp.c,v 1.24 2011/04/06 18:12:47 miod Exp $ */
 /*	$NetBSD: hp.c,v 1.22 2000/02/12 16:09:33 ragge Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -53,6 +53,7 @@
 #include <sys/fcntl.h>
 #include <sys/syslog.h>
 #include <sys/reboot.h>
+#include <sys/conf.h>
 
 #include <machine/trap.h>
 #include <machine/pte.h>
@@ -75,17 +76,12 @@ struct	hp_softc {
 
 int     hpmatch(struct device *, struct cfdata *, void *);
 void    hpattach(struct device *, struct device *, void *);
-void	hpstrategy(struct buf *);
 void	hpstart(struct mba_device *);
 int	hpattn(struct mba_device *);
 enum	xfer_action hpfinish(struct mba_device *, int, int *);
-int	hpopen(dev_t, int, int);
-int	hpclose(dev_t, int, int);
-int	hpioctl(dev_t, u_long, caddr_t, int, struct proc *);
-int	hpdump(dev_t, daddr64_t, caddr_t, size_t);
+bdev_decl(hp);
 int	hpread(dev_t, struct uio *);
 int	hpwrite(dev_t, struct uio *);
-daddr64_t hpsize(dev_t);
 
 struct	cfattach hp_ca = {
 	sizeof(struct hp_softc), hpmatch, hpattach
diff --git a/sys/arch/vax/mscp/mscp_disk.c b/sys/arch/vax/mscp/mscp_disk.c
index 4686d977567..b1271d0bf3e 100644
--- a/sys/arch/vax/mscp/mscp_disk.c
+++ b/sys/arch/vax/mscp/mscp_disk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mscp_disk.c,v 1.32 2010/09/22 06:40:25 krw Exp $	*/
+/*	$OpenBSD: mscp_disk.c,v 1.33 2011/04/06 18:12:47 miod Exp $	*/
 /*	$NetBSD: mscp_disk.c,v 1.30 2001/11/13 07:38:28 lukem Exp $	*/
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -59,6 +59,7 @@
 #include <sys/reboot.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
+#include <sys/conf.h>
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
@@ -105,15 +106,10 @@ void	rrmakelabel(struct disklabel *, long);
 
 int	ramatch(struct device *, struct cfdata *, void *);
 void	raattach(struct device *, struct device *, void *);
-int	raopen(dev_t, int, int, struct proc *);
-int	raclose(dev_t, int, int, struct proc *);
-void	rastrategy(struct buf *);
 int	raread(dev_t, struct uio *);
 int	rawrite(dev_t, struct uio *);
-int	raioctl(dev_t, int, caddr_t, int, struct proc *);
-int	radump(dev_t, daddr64_t, caddr_t, size_t);
-daddr64_t	rasize(dev_t);
 int	ra_putonline(struct ra_softc *);
+bdev_decl(ra);
 
 struct	cfattach ra_ca = {
 	sizeof(struct ra_softc), (cfmatch_t)ramatch, rxattach
@@ -363,7 +359,7 @@ rawrite(dev, uio)
 int
 raioctl(dev, cmd, data, flag, p)
 	dev_t dev;
-	int cmd;
+	u_long cmd;
 	caddr_t data;
 	int flag;
 	struct proc *p;
diff --git a/sys/arch/vax/mscp/mscp_tape.c b/sys/arch/vax/mscp/mscp_tape.c
index 8a7ea3beb82..1975a8447c1 100644
--- a/sys/arch/vax/mscp/mscp_tape.c
+++ b/sys/arch/vax/mscp/mscp_tape.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mscp_tape.c,v 1.11 2010/09/22 01:18:57 matthew Exp $ */
+/*	$OpenBSD: mscp_tape.c,v 1.12 2011/04/06 18:12:47 miod Exp $ */
 /*	$NetBSD: mscp_tape.c,v 1.16 2001/11/13 07:38:28 lukem Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -53,6 +53,7 @@
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <sys/conf.h>
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
@@ -85,16 +86,12 @@ int	mtonline(struct device *, struct mscp *);
 int	mtgotstatus(struct device *, struct mscp *);
 int	mtioerror(struct device *, struct mscp *, struct buf *);
 void	mtfillin(struct buf *, struct mscp *);
-int	mtopen(dev_t, int, int, struct proc *);
-int	mtclose(dev_t, int, int, struct proc *);
-void	mtstrategy(struct buf *);
 int	mtread(dev_t, struct uio *);
 int	mtwrite(dev_t, struct uio *);
-int	mtioctl(dev_t, int, caddr_t, int, struct proc *);
-int	mtdump(dev_t, daddr64_t, caddr_t, size_t);
 int	mtcmd(struct mt_softc *, int, int, int);
 void	mtcmddone(struct device *, struct mscp *);
 int	mt_putonline(struct mt_softc *);
+bdev_decl(mt);
 
 struct	mscp_device mt_device = {
 	mtdgram,
@@ -428,7 +425,7 @@ mtioerror(usc, mp, bp)
 int
 mtioctl(dev, cmd, data, flag, p)
 	dev_t dev;
-	int cmd;
+	u_long cmd;
 	caddr_t data;
 	int flag;
 	struct proc *p;