Remove unit2minor() use from kernel code.

When I changed kern_conf.c three months ago I made device unit numbers
equal to (unneeded) device minor numbers. We used to require
bitshifting, because there were eight bits in the middle that were
reserved for a device major number. Not very long after I turned
dev2unit(), minor(), unit2minor() and minor2unit() into macro's.
The unit2minor() and minor2unit() macro's were no-ops.

We'd better not remove these four macro's from the kernel, because there
is a lot of (external) code that may still depend on them. For now it's
harmless to remove all invocations of unit2minor() and minor2unit().

Reviewed by:	kib

4 files changed, 6 insertions, 6 deletions

diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index 17084e6..1f5f089 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -265,7 +265,7 @@ passregister(struct cam_periph *periph, void *arg)
 	mtx_unlock(periph->sim->mtx);
 	no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0;
 	softc->device_stats = devstat_new_entry("pass",
-			  unit2minor(periph->unit_number), 0,
+			  periph->unit_number, 0,
 			  DEVSTAT_NO_BLOCKSIZE
 			  | (no_tags ? DEVSTAT_NO_ORDERED_TAGS : 0),
 			  softc->pd_type |
@@ -274,7 +274,7 @@ passregister(struct cam_periph *periph, void *arg)
 			  DEVSTAT_PRIORITY_PASS);
 
 	/* Register the device */
-	softc->dev = make_dev(&pass_cdevsw, unit2minor(periph->unit_number),
+	softc->dev = make_dev(&pass_cdevsw, periph->unit_number,
 			      UID_ROOT, GID_OPERATOR, 0600, "%s%d",
 			      periph->periph_name, periph->unit_number);
 	mtx_lock(periph->sim->mtx);
diff --git a/sys/cam/scsi/scsi_ses.c b/sys/cam/scsi/scsi_ses.c
index 67f3bdc..efccf09 100644
--- a/sys/cam/scsi/scsi_ses.c
+++ b/sys/cam/scsi/scsi_ses.c
@@ -343,7 +343,7 @@ sesregister(struct cam_periph *periph, void *arg)
 	}
 
 	cam_periph_unlock(periph);
-	softc->ses_dev = make_dev(&ses_cdevsw, unit2minor(periph->unit_number),
+	softc->ses_dev = make_dev(&ses_cdevsw, periph->unit_number,
 	    UID_ROOT, GID_OPERATOR, 0600, "%s%d",
 	    periph->periph_name, periph->unit_number);
 	cam_periph_lock(periph);
diff --git a/sys/cam/scsi/scsi_sg.c b/sys/cam/scsi/scsi_sg.c
index f636c7d..af2ab6e 100644
--- a/sys/cam/scsi/scsi_sg.c
+++ b/sys/cam/scsi/scsi_sg.c
@@ -287,7 +287,7 @@ sgregister(struct cam_periph *periph, void *arg)
 	cam_periph_unlock(periph);
 	no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0;
 	softc->device_stats = devstat_new_entry("sg",
-			unit2minor(periph->unit_number), 0,
+			periph->unit_number, 0,
 			DEVSTAT_NO_BLOCKSIZE
 			| (no_tags ? DEVSTAT_NO_ORDERED_TAGS : 0),
 			softc->pd_type |
@@ -296,7 +296,7 @@ sgregister(struct cam_periph *periph, void *arg)
 			DEVSTAT_PRIORITY_PASS);
 
 	/* Register the device */
-	softc->dev = make_dev(&sg_cdevsw, unit2minor(periph->unit_number),
+	softc->dev = make_dev(&sg_cdevsw, periph->unit_number,
 			      UID_ROOT, GID_OPERATOR, 0600, "%s%d",
 			      periph->periph_name, periph->unit_number);
 	(void)make_dev_alias(softc->dev, "sg%c", 'a' + periph->unit_number);
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index c6086f9..140da9b 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -1031,7 +1031,7 @@ targclone(void *arg, struct ucred *cred, char *name, int namelen,
 		return;
 	if (dev_stdclone(name, NULL, "targ", &u) != 1)
 		return;
-	*dev = make_dev(&targ_cdevsw, unit2minor(u), UID_ROOT, GID_WHEEL,
+	*dev = make_dev(&targ_cdevsw, u, UID_ROOT, GID_WHEEL,
 			0600, "targ%d", u);
 	dev_ref(*dev);
 	(*dev)->si_flags |= SI_CHEAPCLONE;