[src/trunk]: src/sys minor mostly cosmetical fixes: use designated type for d...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3d78083fab60
branches:  trunk
changeset: 779041:3d78083fab60
user:      drochner <drochner%NetBSD.org@localhost>
date:      Fri Apr 27 18:15:55 2012 +0000

description:
minor mostly cosmetical fixes: use designated type for device major
numbers, typo in comment, misuse of minor()
(the latter one is not cosmetical, but would only affect systems
with more than 256 disk wedges)

diffstat:

 sys/dev/dkwedge/dk.c      |   9 +++++----
 sys/kern/subr_disk_open.c |  13 +++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diffs (82 lines):

diff -r cefb035bc97d -r 3d78083fab60 sys/dev/dkwedge/dk.c
--- a/sys/dev/dkwedge/dk.c      Fri Apr 27 18:12:01 2012 +0000
+++ b/sys/dev/dkwedge/dk.c      Fri Apr 27 18:15:55 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dk.c,v 1.62 2011/07/30 12:08:36 jmcneill Exp $ */
+/*     $NetBSD: dk.c,v 1.63 2012/04/27 18:15:55 drochner Exp $ */
 
 /*-
  * Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.62 2011/07/30 12:08:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.63 2012/04/27 18:15:55 drochner Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_dkwedge.h"
@@ -183,7 +183,8 @@
 dkwedge_compute_pdev(const char *pname, dev_t *pdevp)
 {
        const char *name, *cp;
-       int punit, pmaj;
+       devmajor_t pmaj;
+       int punit;
        char devname[16];
 
        name = pname;
@@ -320,7 +321,7 @@
 
                        if (sc->sc_offset >= lsc->sc_offset &&
                            sc->sc_offset <= llastblk) {
-                               /* Overlaps the tail of the exsiting wedge. */
+                               /* Overlaps the tail of the existing wedge. */
                                break;
                        }
                        if (lastblk >= lsc->sc_offset &&
diff -r cefb035bc97d -r 3d78083fab60 sys/kern/subr_disk_open.c
--- a/sys/kern/subr_disk_open.c Fri Apr 27 18:12:01 2012 +0000
+++ b/sys/kern/subr_disk_open.c Fri Apr 27 18:15:55 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_disk_open.c,v 1.7 2012/04/07 05:38:07 christos Exp $      */
+/*     $NetBSD: subr_disk_open.c,v 1.8 2012/04/27 18:15:55 drochner Exp $      */
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_disk_open.c,v 1.7 2012/04/07 05:38:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk_open.c,v 1.8 2012/04/27 18:15:55 drochner Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -42,7 +42,8 @@
 struct vnode *
 opendisk(struct device *dv)
 {
-       int bmajor, bminor;
+       devmajor_t bmajor;
+       int unit;
        struct vnode *tmpvn;
        int error;
        dev_t dev;
@@ -54,13 +55,13 @@
        if (bmajor == -1)
                return NULL;
        
-       bminor = minor(device_unit(dv));
+       unit = device_unit(dv);
        /*
         * Fake a temporary vnode for the disk, open it, and read
         * and hash the sectors.
         */
-       dev = device_is_a(dv, "dk") ? makedev(bmajor, bminor) :
-           MAKEDISKDEV(bmajor, bminor, RAW_PART);
+       dev = device_is_a(dv, "dk") ? makedev(bmajor, unit) :
+           MAKEDISKDEV(bmajor, unit, RAW_PART);
        if (bdevvp(dev, &tmpvn))
                panic("%s: can't alloc vnode for %s", __func__,
                    device_xname(dv));