Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

2 files changed, 7 insertions, 7 deletions

diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 4f3adca..768bd06 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -1229,7 +1229,7 @@ apm_attach(device_t dev)
 }
 
 static int
-apmopen(dev_t dev, int flag, int fmt, struct thread *td)
+apmopen(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	struct apm_softc *sc = &apm_softc;
 	int ctl = APMDEV(dev);
@@ -1257,7 +1257,7 @@ apmopen(dev_t dev, int flag, int fmt, struct thread *td)
 }
 
 static int
-apmclose(dev_t dev, int flag, int fmt, struct thread *td)
+apmclose(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	struct apm_softc *sc = &apm_softc;
 	int ctl = APMDEV(dev);
@@ -1280,7 +1280,7 @@ apmclose(dev_t dev, int flag, int fmt, struct thread *td)
 }
 
 static int
-apmioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
+apmioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 {
 	struct apm_softc *sc = &apm_softc;
 	struct apm_bios_arg *args;
@@ -1434,7 +1434,7 @@ apmioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 }
 
 static int
-apmwrite(dev_t dev, struct uio *uio, int ioflag)
+apmwrite(struct cdev *dev, struct uio *uio, int ioflag)
 {
 	struct apm_softc *sc = &apm_softc;
 	u_int event_type;
@@ -1464,7 +1464,7 @@ apmwrite(dev_t dev, struct uio *uio, int ioflag)
 }
 
 static int
-apmpoll(dev_t dev, int events, struct thread *td)
+apmpoll(struct cdev *dev, int events, struct thread *td)
 {
 	struct apm_softc *sc = &apm_softc;
 	int revents = 0;
diff --git a/sys/i386/bios/smapi.c b/sys/i386/bios/smapi.c
index 883676c..9879c90 100644
--- a/sys/i386/bios/smapi.c
+++ b/sys/i386/bios/smapi.c
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
 #define	ADDR2HDR(addr)	((struct smapi_bios_header *)BIOS_PADDRTOVADDR(addr))
 
 struct smapi_softc {
-	dev_t			cdev;
+	struct cdev *cdev;
 	device_t		dev;
 	struct resource *	res;
 	int			rid;
@@ -98,7 +98,7 @@ extern int	smapi32_new		(u_long, u_short,
 
 static int
 smapi_ioctl (dev, cmd, data, fflag, td)
-	dev_t		dev;
+	struct cdev *dev;
 	u_long		cmd;
 	caddr_t		data;
 	int		fflag;