Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

4 files changed, 20 insertions, 20 deletions

diff --git a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
index 3aeb21a..27b6641 100644
--- a/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
+++ b/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
@@ -78,7 +78,7 @@ MALLOC_DEFINE(M_NETGRAPH_H4, "netgraph_h4", "Netgraph Bluetooth H4 node");
 #endif /* NG_SEPARATE_MALLOC */
 
 /* Line discipline methods */
-static int	ng_h4_open	(dev_t, struct tty *);
+static int	ng_h4_open	(struct cdev *, struct tty *);
 static int	ng_h4_close	(struct tty *, int);
 static int	ng_h4_read	(struct tty *, struct uio *, int);
 static int	ng_h4_write	(struct tty *, struct uio *, int);
@@ -147,7 +147,7 @@ static int	ng_h4_node = 0;
  */
 
 static int
-ng_h4_open(dev_t dev, struct tty *tp)
+ng_h4_open(struct cdev *dev, struct tty *tp)
 {
 	char		 name[NG_NODESIZ];
 	ng_h4_info_p	 sc = NULL;
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index 5c48c53..c28e772 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -2291,7 +2291,7 @@ done:
  */
 
 Static int
-ubt_open(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ubt_open(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
 {
 	ubt_softc_p	sc = NULL;
 	int		ep = UBT_ENDPOINT(dev);
@@ -2331,7 +2331,7 @@ ubt_open(dev_t dev, int flag, int mode, usb_proc_ptr p)
  */
 
 Static int
-ubt_close(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ubt_close(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
 {
 	ubt_softc_p	sc = NULL;
 	int		ep = UBT_ENDPOINT(dev);
@@ -2368,7 +2368,7 @@ ubt_close(dev_t dev, int flag, int mode, usb_proc_ptr p)
  */
 
 Static int
-ubt_read(dev_t dev, struct uio *uio, int flag)
+ubt_read(struct cdev *dev, struct uio *uio, int flag)
 {
 	ubt_softc_p		sc = NULL;
 	int			error = 0, n, tn, ep = UBT_ENDPOINT(dev);
@@ -2436,7 +2436,7 @@ ubt_read(dev_t dev, struct uio *uio, int flag)
  */
 
 Static int
-ubt_write(dev_t dev, struct uio *uio, int flag)
+ubt_write(struct cdev *dev, struct uio *uio, int flag)
 {
 	ubt_softc_p	sc = NULL;
 	int		error = 0, n, ep = UBT_ENDPOINT(dev);
@@ -2495,7 +2495,7 @@ ubt_write(dev_t dev, struct uio *uio, int flag)
  */
 
 Static int
-ubt_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+ubt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 {
 	ubt_softc_p		 sc = NULL;
 	int			 len, error = 0, ep = UBT_ENDPOINT(dev);
@@ -2613,7 +2613,7 @@ ret:
  */
 
 Static int
-ubt_poll(dev_t dev, int events, usb_proc_ptr p)
+ubt_poll(struct cdev *dev, int events, usb_proc_ptr p)
 {
 	ubt_softc_p	sc = NULL;
 	int		revents = 0, ep = UBT_ENDPOINT(dev);
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
index 3fc3322..fef8189 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
@@ -139,9 +139,9 @@ struct ubt_softc {
 	hook_p			 sc_hook;	/* upstream hook */
 
 	/* Device specific */
-	dev_t			 sc_ctrl_dev;	/* control device */
-	dev_t			 sc_intr_dev;	/* interrupt device */
-	dev_t			 sc_bulk_dev;	/* bulk device */
+	struct cdev *sc_ctrl_dev;	/* control device */
+	struct cdev *sc_intr_dev;	/* interrupt device */
+	struct cdev *sc_bulk_dev;	/* bulk device */
 
 	int			 sc_refcnt;	/* device ref. count */
 	int			 sc_dying;
diff --git a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
index 19e1801..f957cf5 100644
--- a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
+++ b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
@@ -61,9 +61,9 @@
 struct ubtbcmfw_softc {
 	USBBASEDEVICE		sc_dev;			/* base device */
 	usbd_device_handle	sc_udev;		/* USB device handle */
-	dev_t			sc_ctrl_dev;		/* control device */
-	dev_t			sc_intr_in_dev;		/* interrupt device */
-	dev_t			sc_bulk_out_dev;	/* bulk device */
+	struct cdev *sc_ctrl_dev;		/* control device */
+	struct cdev *sc_intr_in_dev;		/* interrupt device */
+	struct cdev *sc_bulk_out_dev;	/* bulk device */
 	usbd_pipe_handle	sc_intr_in_pipe;	/* interrupt pipe */
 	usbd_pipe_handle	sc_bulk_out_pipe;	/* bulk out pipe */
 	int			sc_flags;
@@ -264,7 +264,7 @@ USB_DETACH(ubtbcmfw)
  */
 
 Static int
-ubtbcmfw_open(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ubtbcmfw_open(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
 {
 	ubtbcmfw_softc_p	sc = NULL;
 	int			error = 0;
@@ -316,7 +316,7 @@ ubtbcmfw_open(dev_t dev, int flag, int mode, usb_proc_ptr p)
  */
 
 Static int
-ubtbcmfw_close(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ubtbcmfw_close(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
 {
 	ubtbcmfw_softc_p	sc = NULL;
 
@@ -353,7 +353,7 @@ ubtbcmfw_close(dev_t dev, int flag, int mode, usb_proc_ptr p)
  */
 
 Static int
-ubtbcmfw_read(dev_t dev, struct uio *uio, int flag)
+ubtbcmfw_read(struct cdev *dev, struct uio *uio, int flag)
 {
 	ubtbcmfw_softc_p	sc = NULL;
 	u_int8_t		buf[UBTBCMFW_BSIZE];
@@ -417,7 +417,7 @@ ubtbcmfw_read(dev_t dev, struct uio *uio, int flag)
  */
 
 Static int
-ubtbcmfw_write(dev_t dev, struct uio *uio, int flag)
+ubtbcmfw_write(struct cdev *dev, struct uio *uio, int flag)
 {
 	ubtbcmfw_softc_p	sc = NULL;
 	u_int8_t		buf[UBTBCMFW_BSIZE];
@@ -482,7 +482,7 @@ ubtbcmfw_write(dev_t dev, struct uio *uio, int flag)
  */
 
 Static int
-ubtbcmfw_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+ubtbcmfw_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 {
 	ubtbcmfw_softc_p	sc = NULL;
 	int			error = 0;
@@ -519,7 +519,7 @@ ubtbcmfw_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
  */
 
 Static int
-ubtbcmfw_poll(dev_t dev, int events, usb_proc_ptr p)
+ubtbcmfw_poll(struct cdev *dev, int events, usb_proc_ptr p)
 {
 	ubtbcmfw_softc_p	sc = NULL;
 	int			revents = 0;