Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

4 files changed, 10 insertions, 10 deletions

diff --git a/sys/sparc64/creator/creator.h b/sys/sparc64/creator/creator.h
index 6fa42f7..b3be9e2 100644
--- a/sys/sparc64/creator/creator.h
+++ b/sys/sparc64/creator/creator.h
@@ -142,7 +142,7 @@
 struct creator_softc {
 	video_adapter_t		sc_va;			/* XXX must be first */
 
-	dev_t			sc_si;
+	struct cdev *sc_si;
 
 	struct resource		*sc_reg[FFB_NREG];
 	bus_space_tag_t		sc_bt[FFB_NREG];
diff --git a/sys/sparc64/creator/creator_upa.c b/sys/sparc64/creator/creator_upa.c
index 255d701..864f0b8 100644
--- a/sys/sparc64/creator/creator_upa.c
+++ b/sys/sparc64/creator/creator_upa.c
@@ -212,19 +212,19 @@ creator_upa_attach(device_t dev)
 }
 
 static int
-creator_open(dev_t dev, int flags, int mode, struct thread *td)
+creator_open(struct cdev *dev, int flags, int mode, struct thread *td)
 {
 	return (0);
 }
 
 static int
-creator_close(dev_t dev, int flags, int mode, struct thread *td)
+creator_close(struct cdev *dev, int flags, int mode, struct thread *td)
 {
 	return (0);
 }
 
 static int
-creator_ioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
+creator_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags,
     struct thread *td)
 {
 	struct creator_softc *sc;
@@ -262,7 +262,7 @@ creator_ioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
 }
 
 static int
-creator_mmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
+creator_mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
 {
 	struct creator_softc *sc;
 	struct ffb_map *fm;
diff --git a/sys/sparc64/include/cpu.h b/sys/sparc64/include/cpu.h
index b00280d..6778d04 100644
--- a/sys/sparc64/include/cpu.h
+++ b/sys/sparc64/include/cpu.h
@@ -52,7 +52,7 @@
 /*
  * CTL_MACHDEP definitions.
  */
-#define CPU_CONSDEV		1	/* dev_t: console terminal device */
+#define CPU_CONSDEV		1	/* struct cdev *: console terminal device */
 #define	CPU_ADJKERNTZ		2	/* int:	timezone offset	(seconds) */
 #define	CPU_DISRTCSET		3	/* int: disable resettodr() call */
 #define CPU_BOOTINFO		4	/* struct: bootinfo */
diff --git a/sys/sparc64/sparc64/mem.c b/sys/sparc64/sparc64/mem.c
index fca7c49..d7a1818 100644
--- a/sys/sparc64/sparc64/mem.c
+++ b/sys/sparc64/sparc64/mem.c
@@ -73,7 +73,7 @@
 #include <machine/tlb.h>
 #include <machine/upa.h>
 
-static dev_t memdev, kmemdev;
+static struct cdev *memdev, *kmemdev;
 
 static	d_open_t	mmopen;
 static	d_close_t	mmclose;
@@ -92,14 +92,14 @@ static struct cdevsw mem_cdevsw = {
 };
 
 static int
-mmclose(dev_t dev, int flags, int fmt, struct thread *td)
+mmclose(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 
 	return (0);
 }
 
 static int
-mmopen(dev_t dev, int flags, int fmt, struct thread *td)
+mmopen(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 	int error;
 
@@ -120,7 +120,7 @@ mmopen(dev_t dev, int flags, int fmt, struct thread *td)
 
 /*ARGSUSED*/
 static int
-mmrw(dev_t dev, struct uio *uio, int flags)
+mmrw(struct cdev *dev, struct uio *uio, int flags)
 {
 	struct iovec *iov;
 	vm_offset_t eva;