Turn dev2unit(), minor(), unit2minor() and minor2unit() into macro's.

Now that we got rid of the minor-to-unit conversion and the constraints
on device minor numbers, we can convert the functions that operate on
minor and unit numbers to simple macro's. The unit2minor() and
minor2unit() macro's are now no-ops.

The ZFS code als defined a macro named `minor'. Change the ZFS code to
use umajor() and uminor() here, as it is the correct approach to do
this. Also add $FreeBSD$ to keep SVN happy.

Approved by:	philip (mentor), pjd

1 files changed, 0 insertions, 35 deletions

diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index 0cff9eaff722..c9eac628796a 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -492,41 +492,6 @@ giant_mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot)
 }
 
 
-/*
- * struct cdev * and u_dev_t primitives
- */
-
-int
-minor(struct cdev *x)
-{
-	if (x == NULL)
-		return NODEV;
-	return (x->si_drv0);
-}
-
-int
-dev2unit(struct cdev *x)
-{
-
-	if (x == NULL)
-		return NODEV;
-	return (x->si_drv0);
-}
-
-u_int
-minor2unit(u_int _minor)
-{
-
-	return (_minor);
-}
-
-int
-unit2minor(int unit)
-{
-
-	return (unit);
-}
-
 static void
 notify(struct cdev *dev, const char *ev)
 {