summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorcegger <cegger@NetBSD.org>2009-05-07 12:15:33 +0000
committercegger <cegger@NetBSD.org>2009-05-07 12:15:33 +0000
commitbc33dc599e4dca9d1c33b4d4c6e60cabb40f1574 (patch)
treeed3fb663e67e7ea8a5edc4ebc84f5bd64c4c805e /sys/dev
parent7dc37dded5d9e9ab3f66ee1c5d9046553431994f (diff)
struct device * -> device_t, no functional changes intended.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/bio.c12
-rw-r--r--sys/dev/biovar.h7
2 files changed, 10 insertions, 9 deletions
diff --git a/sys/dev/bio.c b/sys/dev/bio.c
index d698eadc32e..9604670908c 100644
--- a/sys/dev/bio.c
+++ b/sys/dev/bio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bio.c,v 1.8 2008/04/09 05:47:19 cegger Exp $ */
+/* $NetBSD: bio.c,v 1.9 2009/05/07 12:15:33 cegger Exp $ */
/* $OpenBSD: bio.c,v 1.9 2007/03/20 02:35:55 marco Exp $ */
/*
@@ -28,7 +28,7 @@
/* A device controller ioctl tunnelling device. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.8 2008/04/09 05:47:19 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.9 2009/05/07 12:15:33 cegger Exp $");
#include "opt_compat_netbsd.h"
@@ -48,8 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.8 2008/04/09 05:47:19 cegger Exp $");
struct bio_mapping {
LIST_ENTRY(bio_mapping) bm_link;
- struct device *bm_dev;
- int (*bm_ioctl)(struct device *, u_long, void *);
+ device_t bm_dev;
+ int (*bm_ioctl)(device_t, u_long, void *);
};
static LIST_HEAD(, bio_mapping) bios = LIST_HEAD_INITIALIZER(bios);
@@ -222,7 +222,7 @@ bioioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l)
}
int
-bio_register(struct device *dev, int (*ioctl)(struct device *, u_long, void *))
+bio_register(device_t dev, int (*ioctl)(device_t, u_long, void *))
{
struct bio_mapping *bm;
@@ -241,7 +241,7 @@ bio_register(struct device *dev, int (*ioctl)(struct device *, u_long, void *))
}
void
-bio_unregister(struct device *dev)
+bio_unregister(device_t dev)
{
struct bio_mapping *bm, *next;
diff --git a/sys/dev/biovar.h b/sys/dev/biovar.h
index 253ccbfadec..980ff4f6f70 100644
--- a/sys/dev/biovar.h
+++ b/sys/dev/biovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: biovar.h,v 1.7 2008/03/03 13:43:19 xtraeme Exp $ */
+/* $NetBSD: biovar.h,v 1.8 2009/05/07 12:15:33 cegger Exp $ */
/* $OpenBSD: biovar.h,v 1.26 2007/03/19 03:02:08 marco Exp $ */
/*
@@ -37,6 +37,7 @@
#define _DEV_BIOVAR_H_
#include <sys/types.h>
+#include <sys/device.h>
#ifndef _KERNEL
#include <stdbool.h>
@@ -54,8 +55,8 @@ struct bio_locate {
};
#ifdef _KERNEL
-int bio_register(struct device *, int (*)(struct device *, u_long, void *));
-void bio_unregister(struct device *);
+int bio_register(device_t, int (*)(device_t, u_long, void *));
+void bio_unregister(device_t);
#endif
#define BIOCINQ _IOWR('B', 32, struct bioc_inq)