[src/trunk]: src/sys/arch/xen/xen Localify.

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

details:   https://anonhg.NetBSD.org/src/rev/720fd103c1a8
branches:  trunk
changeset: 971892:720fd103c1a8
user:      maxv <maxv%NetBSD.org@localhost>
date:      Thu May 07 19:25:57 2020 +0000

description:
Localify.

diffstat:

 sys/arch/xen/xen/xbd_xenbus.c |  36 ++++++++++----------
 sys/arch/xen/xen/xencons.c    |  76 ++++++++++++++++++++----------------------
 2 files changed, 54 insertions(+), 58 deletions(-)

diffs (truncated from 350 to 300 lines):

diff -r 14b2eff30cc2 -r 720fd103c1a8 sys/arch/xen/xen/xbd_xenbus.c
--- a/sys/arch/xen/xen/xbd_xenbus.c     Thu May 07 19:13:38 2020 +0000
+++ b/sys/arch/xen/xen/xbd_xenbus.c     Thu May 07 19:25:57 2020 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: xbd_xenbus.c,v 1.124 2020/05/03 17:54:28 jdolecek Exp $      */
+/*      $NetBSD: xbd_xenbus.c,v 1.125 2020/05/07 19:25:57 maxv Exp $      */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.124 2020/05/03 17:54:28 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.125 2020/05/07 19:25:57 maxv Exp $");
 
 #include "opt_xen.h"
 
@@ -214,14 +214,14 @@
     xbd_xenbus_match, xbd_xenbus_attach, xbd_xenbus_detach, NULL, NULL, NULL,
     DVF_DETACH_SHUTDOWN);
 
-dev_type_open(xbdopen);
-dev_type_close(xbdclose);
-dev_type_read(xbdread);
-dev_type_write(xbdwrite);
-dev_type_ioctl(xbdioctl);
-dev_type_strategy(xbdstrategy);
-dev_type_dump(xbddump);
-dev_type_size(xbdsize);
+static dev_type_open(xbdopen);
+static dev_type_close(xbdclose);
+static dev_type_read(xbdread);
+static dev_type_write(xbdwrite);
+static dev_type_ioctl(xbdioctl);
+static dev_type_strategy(xbdstrategy);
+static dev_type_dump(xbddump);
+static dev_type_size(xbdsize);
 
 const struct bdevsw xbd_bdevsw = {
        .d_open = xbdopen,
@@ -924,7 +924,7 @@
                *maxxfer = XBD_MAX_XFER;
 }
 
-int
+static int
 xbdopen(dev_t dev, int flags, int fmt, struct lwp *l)
 {
        struct  xbd_xenbus_softc *sc;
@@ -939,7 +939,7 @@
        return dk_open(&sc->sc_dksc, dev, flags, fmt, l);
 }
 
-int
+static int
 xbdclose(dev_t dev, int flags, int fmt, struct lwp *l)
 {
        struct xbd_xenbus_softc *sc;
@@ -950,7 +950,7 @@
        return dk_close(&sc->sc_dksc, dev, flags, fmt, l);
 }
 
-void
+static void
 xbdstrategy(struct buf *bp)
 {
        struct xbd_xenbus_softc *sc;
@@ -976,7 +976,7 @@
        return;
 }
 
-int
+static int
 xbdsize(dev_t dev)
 {
        struct  xbd_xenbus_softc *sc;
@@ -989,7 +989,7 @@
        return dk_size(&sc->sc_dksc, dev);
 }
 
-int
+static int
 xbdread(dev_t dev, struct uio *uio, int flags)
 {
        struct xbd_xenbus_softc *sc = 
@@ -1001,7 +1001,7 @@
        return physio(xbdstrategy, NULL, dev, B_READ, xbdminphys, uio);
 }
 
-int
+static int
 xbdwrite(dev_t dev, struct uio *uio, int flags)
 {
        struct xbd_xenbus_softc *sc =
@@ -1015,7 +1015,7 @@
        return physio(xbdstrategy, NULL, dev, B_WRITE, xbdminphys, uio);
 }
 
-int
+static int
 xbdioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 {
        struct xbd_xenbus_softc *sc =
@@ -1087,7 +1087,7 @@
        return error;
 }
 
-int
+static int
 xbddump(dev_t dev, daddr_t blkno, void *va, size_t size)
 {
        struct xbd_xenbus_softc *sc;
diff -r 14b2eff30cc2 -r 720fd103c1a8 sys/arch/xen/xen/xencons.c
--- a/sys/arch/xen/xen/xencons.c        Thu May 07 19:13:38 2020 +0000
+++ b/sys/arch/xen/xen/xencons.c        Thu May 07 19:25:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xencons.c,v 1.49 2020/04/25 15:26:18 bouyer Exp $      */
+/*     $NetBSD: xencons.c,v 1.50 2020/05/07 19:25:57 maxv Exp $        */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -53,7 +53,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.49 2020/04/25 15:26:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.50 2020/05/07 19:25:57 maxv Exp $");
 
 #include "opt_xen.h"
 
@@ -96,11 +96,10 @@
 #define        XENCONS_UNIT(x) (minor(x))
 #define XENCONS_BURST 128
 
-int xencons_match(device_t, cfdata_t, void *);
-void xencons_attach(device_t, device_t, void *);
-int xencons_intr(void *);
-void xencons_tty_input(struct xencons_softc *, char*, int);
-
+static int xencons_match(device_t, cfdata_t, void *);
+static void xencons_attach(device_t, device_t, void *);
+static int xencons_intr(void *);
+static void xencons_tty_input(struct xencons_softc *, char*, int);
 
 struct xencons_softc {
        device_t sc_dev;
@@ -114,14 +113,14 @@
 
 extern struct cfdriver xencons_cd;
 
-dev_type_open(xencons_open);
-dev_type_close(xencons_close);
-dev_type_read(xencons_read);
-dev_type_write(xencons_write);
-dev_type_ioctl(xencons_ioctl);
-dev_type_stop(xencons_stop);
-dev_type_tty(xencons_tty);
-dev_type_poll(xencons_poll);
+static dev_type_open(xencons_open);
+static dev_type_close(xencons_close);
+static dev_type_read(xencons_read);
+static dev_type_write(xencons_write);
+static dev_type_ioctl(xencons_ioctl);
+static dev_type_stop(xencons_stop);
+static dev_type_tty(xencons_tty);
+static dev_type_poll(xencons_poll);
 
 const struct cdevsw xencons_cdevsw = {
        .d_open = xencons_open,
@@ -138,11 +137,10 @@
        .d_flag = D_TTY
 };
 
-
 static int xencons_handler(void *);
-int xenconscn_getc(dev_t);
-void xenconscn_putc(dev_t, int);
-void xenconscn_pollc(dev_t, int);
+static int xenconscn_getc(dev_t);
+static void xenconscn_putc(dev_t, int);
+static void xenconscn_pollc(dev_t, int);
 
 static bool xencons_suspend(device_t, const pmf_qual_t *);
 static bool xencons_resume(device_t, const pmf_qual_t *);
@@ -154,10 +152,10 @@
 
 static struct cnm_state xencons_cnm_state;
 
-void   xencons_start (struct tty *);
-int    xencons_param (struct tty *, struct termios *);
+static void xencons_start(struct tty *);
+static int xencons_param(struct tty *, struct termios *);
 
-int
+static int
 xencons_match(device_t parent, cfdata_t match, void *aux)
 {
        struct xencons_attach_args *xa = (struct xencons_attach_args *)aux;
@@ -167,7 +165,7 @@
        return 0;
 }
 
-void
+static void
 xencons_attach(device_t parent, device_t self, void *aux)
 {
        struct xencons_softc *sc = device_private(self);
@@ -256,7 +254,7 @@
        return true;
 }
 
-int
+static int
 xencons_open(dev_t dev, int flag, int mode, struct lwp *l)
 {
        struct xencons_softc *sc;
@@ -287,7 +285,7 @@
        return ((*tp->t_linesw->l_open)(dev, tp));
 }
 
-int
+static int
 xencons_close(dev_t dev, int flag, int mode, struct lwp *l)
 {
        struct xencons_softc *sc = device_lookup_private(&xencons_cd,
@@ -304,7 +302,7 @@
        return (0);
 }
 
-int
+static int
 xencons_read(dev_t dev, struct uio *uio, int flag)
 {
        struct xencons_softc *sc = device_lookup_private(&xencons_cd,
@@ -314,7 +312,7 @@
        return ((*tp->t_linesw->l_read)(tp, uio, flag));
 }
 
-int
+static int
 xencons_write(dev_t dev, struct uio *uio, int flag)
 {
        struct xencons_softc *sc = device_lookup_private(&xencons_cd,
@@ -324,7 +322,7 @@
        return ((*tp->t_linesw->l_write)(tp, uio, flag));
 }
 
-int
+static int
 xencons_poll(dev_t dev, int events, struct lwp *l)
 {
        struct xencons_softc *sc = device_lookup_private(&xencons_cd,
@@ -334,7 +332,7 @@
        return ((*tp->t_linesw->l_poll)(tp, events, l));
 }
 
-struct tty *
+static struct tty *
 xencons_tty(dev_t dev)
 {
        struct xencons_softc *sc = device_lookup_private(&xencons_cd,
@@ -344,7 +342,7 @@
        return (tp);
 }
 
-int
+static int
 xencons_ioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 {
        struct xencons_softc *sc = device_lookup_private(&xencons_cd,
@@ -370,7 +368,7 @@
 #endif
 }
 
-void
+static void
 xencons_start(struct tty *tp)
 {
        struct clist *cl;
@@ -437,13 +435,12 @@
        splx(s);
 }
 
-void
+static void
 xencons_stop(struct tty *tp, int flag)
 {
 
 }
 
-
 /* Non-privileged console interrupt routine */
 static int 
 xencons_handler(void *arg)
@@ -491,8 +488,7 @@
 #undef XNC_IN
 }
 
-