[src/trunk]: src/sys/dev/dm dm: u_{int,long} -> unsigned {int,long}

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

details:   https://anonhg.NetBSD.org/src/rev/e965d513bd6d
branches:  trunk
changeset: 1005752:e965d513bd6d
user:      tkusumi <tkusumi%NetBSD.org@localhost>
date:      Thu Dec 19 15:34:54 2019 +0000

description:
dm: u_{int,long} -> unsigned {int,long}

diffstat:

 sys/dev/dm/device-mapper.c |  13 ++++++-------
 sys/dev/dm/dm_target.c     |   6 +++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diffs (76 lines):

diff -r 8c846dc5a0a6 -r e965d513bd6d sys/dev/dm/device-mapper.c
--- a/sys/dev/dm/device-mapper.c        Thu Dec 19 15:27:07 2019 +0000
+++ b/sys/dev/dm/device-mapper.c        Thu Dec 19 15:34:54 2019 +0000
@@ -1,4 +1,4 @@
-/*        $NetBSD: device-mapper.c,v 1.55 2019/12/15 16:14:27 tkusumi Exp $ */
+/*        $NetBSD: device-mapper.c,v 1.56 2019/12/19 15:34:54 tkusumi Exp $ */
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -66,8 +66,8 @@
 static void dm_doinit(void);
 
 static int dm_cmd_to_fun(prop_dictionary_t);
-static int disk_ioctl_switch(dev_t, u_long, void *);
-static int dm_ioctl_switch(u_long);
+static int disk_ioctl_switch(dev_t, unsigned long, void *);
+static int dm_ioctl_switch(unsigned long);
 static void dmminphys(struct buf *);
 
 /* CF attach/detach functions used for power management */
@@ -413,7 +413,7 @@
 
 /* Call apropriate ioctl handler function. */
 static int
-dm_ioctl_switch(u_long cmd)
+dm_ioctl_switch(unsigned long cmd)
 {
 
        switch(cmd) {
@@ -433,7 +433,7 @@
  * Check for disk specific ioctls.
  */
 static int
-disk_ioctl_switch(dev_t dev, u_long cmd, void *data)
+disk_ioctl_switch(dev_t dev, unsigned long cmd, void *data)
 {
        dm_dev_t *dmv;
 
@@ -504,9 +504,8 @@
        }
        case DIOCGSECTORSIZE:
        {
-               u_int *valp = data;
                uint64_t numsec;
-               unsigned int secsize;
+               unsigned int secsize, *valp = data;
 
                if ((dmv = dm_dev_lookup(NULL, NULL, minor(dev))) == NULL)
                        return ENODEV;
diff -r 8c846dc5a0a6 -r e965d513bd6d sys/dev/dm/dm_target.c
--- a/sys/dev/dm/dm_target.c    Thu Dec 19 15:27:07 2019 +0000
+++ b/sys/dev/dm/dm_target.c    Thu Dec 19 15:34:54 2019 +0000
@@ -1,4 +1,4 @@
-/*        $NetBSD: dm_target.c,v 1.33 2019/12/16 14:26:23 tkusumi Exp $      */
+/*        $NetBSD: dm_target.c,v 1.34 2019/12/19 15:34:54 tkusumi Exp $      */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.33 2019/12/16 14:26:23 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.34 2019/12/19 15:34:54 tkusumi Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -77,7 +77,7 @@
 dm_target_autoload(const char *dm_target_name)
 {
        char name[30];
-       u_int gen;
+       unsigned int gen;
        dm_target_t *dmt;
 
        snprintf(name, sizeof(name), "dm_target_%s", dm_target_name);