Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

2 files changed, 11 insertions, 11 deletions

diff --git a/sys/dev/iir/iir.h b/sys/dev/iir/iir.h
index 44c4cf5..688cf63 100644
--- a/sys/dev/iir/iir.h
+++ b/sys/dev/iir/iir.h
@@ -602,7 +602,7 @@ struct gdt_softc {
 #define GDT_POLLING     0x01
 #define GDT_SHUTDOWN    0x02
 #define GDT_POLL_WAIT   0x80
-    dev_t sc_dev;
+    struct cdev *sc_dev;
     bus_space_tag_t sc_dpmemt;
     bus_space_handle_t sc_dpmemh;
     bus_addr_t sc_dpmembase;
@@ -746,8 +746,8 @@ gdt_dec32(addr)
 extern TAILQ_HEAD(gdt_softc_list, gdt_softc) gdt_softcs;
 extern u_int8_t gdt_polling;
 
-dev_t   gdt_make_dev(int unit);
-void    gdt_destroy_dev(dev_t dev);
+struct cdev *gdt_make_dev(int unit);
+void    gdt_destroy_dev(struct cdev *dev);
 void    gdt_next(struct gdt_softc *gdt);
 void gdt_free_ccb(struct gdt_softc *gdt, struct gdt_ccb *gccb);
 
diff --git a/sys/dev/iir/iir_ctrl.c b/sys/dev/iir/iir_ctrl.c
index 87275b5..4d976b3 100644
--- a/sys/dev/iir/iir_ctrl.c
+++ b/sys/dev/iir/iir_ctrl.c
@@ -95,10 +95,10 @@ extern gdt_statist_t gdt_stat;
  * Given a controller number,
  * make a special device and return the dev_t
  */
-dev_t 
+struct cdev *
 gdt_make_dev(int unit)
 {
-    dev_t dev;
+    struct cdev *dev;
 
 #ifdef SDEV_PER_HBA
     dev = make_dev(&iir_cdevsw, hba2minor(unit), UID_ROOT, GID_OPERATOR,
@@ -114,7 +114,7 @@ gdt_make_dev(int unit)
 }
 
 void
-gdt_destroy_dev(dev_t dev)
+gdt_destroy_dev(struct cdev *dev)
 {
     if (dev != NULL)
         destroy_dev(dev);
@@ -144,7 +144,7 @@ gdt_minor2softc(int minor_no)
 }
 
 static int
-iir_open(dev_t dev, int flags, int fmt, d_thread_t * p)
+iir_open(struct cdev *dev, int flags, int fmt, d_thread_t * p)
 {
     GDT_DPRINTF(GDT_D_DEBUG, ("iir_open()\n"));
 
@@ -162,7 +162,7 @@ iir_open(dev_t dev, int flags, int fmt, d_thread_t * p)
 }
 
 static int
-iir_close(dev_t dev, int flags, int fmt, d_thread_t * p)
+iir_close(struct cdev *dev, int flags, int fmt, d_thread_t * p)
 {
     GDT_DPRINTF(GDT_D_DEBUG, ("iir_close()\n"));
                 
@@ -180,7 +180,7 @@ iir_close(dev_t dev, int flags, int fmt, d_thread_t * p)
 }
 
 static int
-iir_write(dev_t dev, struct uio * uio, int ioflag)
+iir_write(struct cdev *dev, struct uio * uio, int ioflag)
 {
     GDT_DPRINTF(GDT_D_DEBUG, ("iir_write()\n"));
                 
@@ -198,7 +198,7 @@ iir_write(dev_t dev, struct uio * uio, int ioflag)
 }
 
 static int
-iir_read(dev_t dev, struct uio * uio, int ioflag)
+iir_read(struct cdev *dev, struct uio * uio, int ioflag)
 {
     GDT_DPRINTF(GDT_D_DEBUG, ("iir_read()\n"));
                 
@@ -222,7 +222,7 @@ iir_read(dev_t dev, struct uio * uio, int ioflag)
  */
 
 static int
-iir_ioctl(dev_t dev, u_long cmd, caddr_t cmdarg, int flags, d_thread_t * p)
+iir_ioctl(struct cdev *dev, u_long cmd, caddr_t cmdarg, int flags, d_thread_t * p)
 {
     GDT_DPRINTF(GDT_D_DEBUG, ("iir_ioctl() cmd 0x%lx\n",cmd));