From 5dc6c3a38af26ef5624c3561422a8311afe12d81 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Thu, 19 Jan 2012 09:51:07 +0000 Subject: [PATCH] Remove remnants of dev_t. These functions take a `struct cdev *' -- not a dev_t. Inside the kernel, dev_t has the same use as in userspace, namely to store a device identifier. MFC after: 2 weeks --- share/man/man9/DEV_MODULE.9 | 4 ++-- share/man/man9/devtoname.9 | 6 +++--- share/man/man9/physio.9 | 4 ++-- share/man/man9/uio.9 | 4 ++-- share/man/man9/vcount.9 | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/share/man/man9/DEV_MODULE.9 b/share/man/man9/DEV_MODULE.9 index 13a81c198636..28465b3f8dac 100644 --- a/share/man/man9/DEV_MODULE.9 +++ b/share/man/man9/DEV_MODULE.9 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 11, 2001 +.Dd January 19, 2012 .Dt DEV_MODULE 9 .Os .Sh NAME @@ -68,7 +68,7 @@ on load and to destroy it when it is unloaded using static struct cdevsw foo_devsw = { ... }; -static dev_t sdev; +static struct cdev *sdev; static int foo_load(module_t mod, int cmd, void *arg) diff --git a/share/man/man9/devtoname.9 b/share/man/man9/devtoname.9 index f93e77bccc08..0e6e0db655e2 100644 --- a/share/man/man9/devtoname.9 +++ b/share/man/man9/devtoname.9 @@ -24,17 +24,17 @@ .\" .\" $FreeBSD$ .\" -.Dd September 25, 1999 +.Dd January 19, 2012 .Dt DEVTONAME 9 .Os .Sh NAME .Nm devtoname -.Nd "converts dev_t data into a string indicating the device name" +.Nd "converts character device into a string indicating the device name" .Sh SYNOPSIS .In sys/param.h .In sys/conf.h .Ft const char * -.Fn devtoname "dev_t dev" +.Fn devtoname "struct cdev *dev" .Sh DESCRIPTION The .Fn devtoname diff --git a/share/man/man9/physio.9 b/share/man/man9/physio.9 index 7d7174ee3f90..977c4677df84 100644 --- a/share/man/man9/physio.9 +++ b/share/man/man9/physio.9 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 8, 2004 +.Dd January 19, 2012 .Dt PHYSIO 9 .Os .Sh NAME @@ -41,7 +41,7 @@ .In sys/bio.h .In sys/buf.h .Ft int -.Fn physio "dev_t dev" "struct uio *uio" "int ioflag" +.Fn physio "struct cdev *dev" "struct uio *uio" "int ioflag" .Sh DESCRIPTION The .Fn physio diff --git a/share/man/man9/uio.9 b/share/man/man9/uio.9 index 9d569b735d02..fd66e3dae55c 100644 --- a/share/man/man9/uio.9 +++ b/share/man/man9/uio.9 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 9, 2011 +.Dd January 19, 2012 .Dt UIO 9 .Os .Sh NAME @@ -154,7 +154,7 @@ static char buffer[BUFSIZE]; static int data_available; /* amount of data that can be read */ static int -fooread(dev_t dev, struct uio *uio, int flag) +fooread(struct cdev *dev, struct uio *uio, int flag) { int rv, amnt; diff --git a/share/man/man9/vcount.9 b/share/man/man9/vcount.9 index 41263b9a1a3c..186a350ac56b 100644 --- a/share/man/man9/vcount.9 +++ b/share/man/man9/vcount.9 @@ -32,7 +32,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 6, 2001 +.Dd January 19, 2012 .Dt VCOUNT 9 .Os .Sh NAME @@ -47,7 +47,7 @@ .Ft int .Fn vcount "struct vnode *vp" .Ft int -.Fn count_dev "dev_t dev" +.Fn count_dev "struct cdev *dev" .Sh DESCRIPTION .Fn vcount is used to get the number of references to a particular device. @@ -56,7 +56,7 @@ It allows for the fact that multiple vnodes may reference the same device. does the same thing as .Fn vcount , but takes a -.Vt dev_t +.Vt "struct cdev" rather than a .Vt "struct vnode" pointer as an argument.