Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

5 files changed, 13 insertions, 13 deletions

diff --git a/sys/pci/agp.c b/sys/pci/agp.c
index 46f10a3..239b5bf 100644
--- a/sys/pci/agp.c
+++ b/sys/pci/agp.c
@@ -762,7 +762,7 @@ agp_unbind_user(device_t dev, agp_unbind *unbind)
 }
 
 static int
-agp_open(dev_t kdev, int oflags, int devtype, struct thread *td)
+agp_open(struct cdev *kdev, int oflags, int devtype, struct thread *td)
 {
 	device_t dev = KDEV2DEV(kdev);
 	struct agp_softc *sc = device_get_softc(dev);
@@ -776,7 +776,7 @@ agp_open(dev_t kdev, int oflags, int devtype, struct thread *td)
 }
 
 static int
-agp_close(dev_t kdev, int fflag, int devtype, struct thread *td)
+agp_close(struct cdev *kdev, int fflag, int devtype, struct thread *td)
 {
 	device_t dev = KDEV2DEV(kdev);
 	struct agp_softc *sc = device_get_softc(dev);
@@ -799,7 +799,7 @@ agp_close(dev_t kdev, int fflag, int devtype, struct thread *td)
 }
 
 static int
-agp_ioctl(dev_t kdev, u_long cmd, caddr_t data, int fflag, struct thread *td)
+agp_ioctl(struct cdev *kdev, u_long cmd, caddr_t data, int fflag, struct thread *td)
 {
 	device_t dev = KDEV2DEV(kdev);
 
@@ -834,7 +834,7 @@ agp_ioctl(dev_t kdev, u_long cmd, caddr_t data, int fflag, struct thread *td)
 }
 
 static int
-agp_mmap(dev_t kdev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
+agp_mmap(struct cdev *kdev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
 {
 	device_t dev = KDEV2DEV(kdev);
 	struct agp_softc *sc = device_get_softc(dev);
diff --git a/sys/pci/agppriv.h b/sys/pci/agppriv.h
index 6ba4ed6..7e846d1 100644
--- a/sys/pci/agppriv.h
+++ b/sys/pci/agppriv.h
@@ -75,7 +75,7 @@ struct agp_softc {
 	struct agp_memory_list	as_memory;	/* list of allocated memory */
 	int			as_nextid;	/* next memory block id */
 	int			as_isopen;	/* user device is open */
-	dev_t			as_devnode;	/* from make_dev */
+	struct cdev *as_devnode;	/* from make_dev */
 	struct mtx		as_lock;	/* lock for access to GATT */
 };
 
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index ad5366e..b801916 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -3121,7 +3121,7 @@ ti_ioctl(ifp, command, data)
 }
 
 static int
-ti_open(dev_t dev, int flags, int fmt, struct thread *td)
+ti_open(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 	struct ti_softc *sc;
 
@@ -3137,7 +3137,7 @@ ti_open(dev_t dev, int flags, int fmt, struct thread *td)
 }
 
 static int
-ti_close(dev_t dev, int flag, int fmt, struct thread *td)
+ti_close(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	struct ti_softc *sc;
 
@@ -3156,7 +3156,7 @@ ti_close(dev_t dev, int flag, int fmt, struct thread *td)
  * This ioctl routine goes along with the Tigon character device.
  */
 static int 
-ti_ioctl2(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
+ti_ioctl2(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 {
 	int error;
 	struct ti_softc *sc;
diff --git a/sys/pci/if_tireg.h b/sys/pci/if_tireg.h
index 71d9661..3552514 100644
--- a/sys/pci/if_tireg.h
+++ b/sys/pci/if_tireg.h
@@ -1025,7 +1025,7 @@ struct ti_softc {
 	int			ti_txcnt;
 	struct mtx		ti_mtx;
 	ti_flag_vals		ti_flags;
-	dev_t			dev;
+	struct cdev *dev;
 };
 
 #define	TI_LOCK(_sc)		mtx_lock(&(_sc)->ti_mtx)
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index 38014a3..7ec18a5 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -113,7 +113,7 @@ xrpu_poll_pps(struct timecounter *tc)
 }
 
 static int
-xrpu_open(dev_t dev, int flag, int mode, struct  thread *td)
+xrpu_open(struct cdev *dev, int flag, int mode, struct  thread *td)
 {
 	struct softc *sc = devclass_get_softc(xrpu_devclass, dev2unit(dev));
 
@@ -124,13 +124,13 @@ xrpu_open(dev_t dev, int flag, int mode, struct  thread *td)
 }
 
 static int
-xrpu_close(dev_t dev, int flag, int mode, struct  thread *td)
+xrpu_close(struct cdev *dev, int flag, int mode, struct  thread *td)
 { 
 	return (0);
 }
 
 static int
-xrpu_mmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot)
+xrpu_mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot)
 {
 	struct softc *sc = dev->si_drv1;
 	if (offset >= 0x1000000) 
@@ -140,7 +140,7 @@ xrpu_mmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot)
 }
 
 static int
-xrpu_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct  thread *tdr)
+xrpu_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int flag, struct  thread *tdr)
 {
 	struct softc *sc = dev->si_drv1;
 	int i, error;