[src/trunk]: src/sys/dev localify

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

details:   https://anonhg.NetBSD.org/src/rev/410f074b369f
branches:  trunk
changeset: 846980:410f074b369f
user:      maxv <maxv%NetBSD.org@localhost>
date:      Fri Dec 06 07:12:38 2019 +0000

description:
localify

diffstat:

 sys/dev/gpio/gpioow.c      |   48 ++++++++--------
 sys/dev/ic/smc91cxx.c      |   80 ++++++++++++++-------------
 sys/dev/ic/smc91cxxvar.h   |    4 +-
 sys/dev/pci/if_txp.c       |  131 ++++++++++++++++++++++----------------------
 sys/dev/pcmcia/if_cnw.c    |   69 +++++++++++------------
 sys/dev/usb/uhidev.c       |   24 ++++----
 sys/dev/usb/uirda.c        |   18 +++---
 sys/dev/usb/umass.c        |   24 ++++----
 sys/dev/wscons/wsdisplay.c |   20 +++---
 9 files changed, 209 insertions(+), 209 deletions(-)

diffs (truncated from 1314 to 300 lines):

diff -r 29660cbbd83d -r 410f074b369f sys/dev/gpio/gpioow.c
--- a/sys/dev/gpio/gpioow.c     Fri Dec 06 06:38:39 2019 +0000
+++ b/sys/dev/gpio/gpioow.c     Fri Dec 06 07:12:38 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gpioow.c,v 1.16 2019/11/30 23:04:12 ad Exp $ */
+/* $NetBSD: gpioow.c,v 1.17 2019/12/06 07:12:38 maxv Exp $ */
 /*     $OpenBSD: gpioow.c,v 1.1 2006/03/04 16:27:03 grange Exp $       */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpioow.c,v 1.16 2019/11/30 23:04:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpioow.c,v 1.17 2019/12/06 07:12:38 maxv Exp $");
 
 /*
  * 1-Wire bus bit-banging through GPIO pin.
@@ -51,19 +51,19 @@
        int                     sc_dying;
 };
 
-int    gpioow_match(device_t, cfdata_t, void *);
-void   gpioow_attach(device_t, device_t, void *);
-int    gpioow_detach(device_t, int);
-int    gpioow_activate(device_t, enum devact);
+static int     gpioow_match(device_t, cfdata_t, void *);
+static void    gpioow_attach(device_t, device_t, void *);
+static int     gpioow_detach(device_t, int);
+static int     gpioow_activate(device_t, enum devact);
 
-int    gpioow_ow_reset(void *);
-int    gpioow_ow_read_bit(void *);
-void   gpioow_ow_write_bit(void *, int);
+static int     gpioow_ow_reset(void *);
+static int     gpioow_ow_read_bit(void *);
+static void    gpioow_ow_write_bit(void *, int);
 
-void   gpioow_bb_rx(void *);
-void   gpioow_bb_tx(void *);
-int    gpioow_bb_get(void *);
-void   gpioow_bb_set(void *, int);
+static void    gpioow_bb_rx(void *);
+static void    gpioow_bb_tx(void *);
+static int     gpioow_bb_get(void *);
+static void    gpioow_bb_set(void *, int);
 
 CFATTACH_DECL_NEW(gpioow, sizeof(struct gpioow_softc),
        gpioow_match, gpioow_attach, gpioow_detach, gpioow_activate);
@@ -75,7 +75,7 @@
        gpioow_bb_set
 };
 
-int
+static int
 gpioow_match(device_t parent, cfdata_t cf, void *aux)
 {
        struct gpio_attach_args *ga = aux;
@@ -95,7 +95,7 @@
        return 1;
 }
 
-void
+static void
 gpioow_attach(device_t parent, device_t self, void *aux)
 {
        struct gpioow_softc *sc = device_private(self);
@@ -158,7 +158,7 @@
        return;
 }
 
-int
+static int
 gpioow_detach(device_t self, int flags)
 {
        struct gpioow_softc *sc = device_private(self);
@@ -174,7 +174,7 @@
        return rv;
 }
 
-int
+static int
 gpioow_activate(device_t self, enum devact act)
 {
        struct gpioow_softc *sc = device_private(self);
@@ -188,25 +188,25 @@
        }
 }
 
-int
+static int
 gpioow_ow_reset(void *arg)
 {
        return (onewire_bb_reset(&gpioow_bbops, arg));
 }
 
-int
+static int
 gpioow_ow_read_bit(void *arg)
 {
        return (onewire_bb_read_bit(&gpioow_bbops, arg));
 }
 
-void
+static void
 gpioow_ow_write_bit(void *arg, int value)
 {
        onewire_bb_write_bit(&gpioow_bbops, arg, value);
 }
 
-void
+static void
 gpioow_bb_rx(void *arg)
 {
        struct gpioow_softc *sc = arg;
@@ -223,7 +223,7 @@
        }
 }
 
-void
+static void
 gpioow_bb_tx(void *arg)
 {
        struct gpioow_softc *sc = arg;
@@ -238,7 +238,7 @@
        }
 }
 
-int
+static int
 gpioow_bb_get(void *arg)
 {
        struct gpioow_softc *sc = arg;
@@ -247,7 +247,7 @@
            GPIO_PIN_HIGH ? 1 : 0);
 }
 
-void
+static void
 gpioow_bb_set(void *arg, int value)
 {
        struct gpioow_softc *sc = arg;
diff -r 29660cbbd83d -r 410f074b369f sys/dev/ic/smc91cxx.c
--- a/sys/dev/ic/smc91cxx.c     Fri Dec 06 06:38:39 2019 +0000
+++ b/sys/dev/ic/smc91cxx.c     Fri Dec 06 07:12:38 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smc91cxx.c,v 1.102 2019/05/30 02:32:18 msaitoh Exp $   */
+/*     $NetBSD: smc91cxx.c,v 1.103 2019/12/06 07:12:38 maxv Exp $      */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.102 2019/05/30 02:32:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.103 2019/12/06 07:12:38 maxv Exp $");
 
 #include "opt_inet.h"
 
@@ -153,8 +153,8 @@
 /*
  * MII bit-bang glue.
  */
-uint32_t smc91cxx_mii_bitbang_read(device_t);
-void smc91cxx_mii_bitbang_write(device_t, uint32_t);
+static uint32_t smc91cxx_mii_bitbang_read(device_t);
+static void smc91cxx_mii_bitbang_write(device_t, uint32_t);
 
 static const struct mii_bitbang_ops smc91cxx_mii_bitbang_ops = {
        smc91cxx_mii_bitbang_read,
@@ -169,25 +169,27 @@
 };
 
 /* MII callbacks */
-int    smc91cxx_mii_readreg(device_t, int, int, uint16_t *);
-int    smc91cxx_mii_writereg(device_t, int, int, uint16_t);
-void   smc91cxx_statchg(struct ifnet *);
-void   smc91cxx_tick(void *);
+static int     smc91cxx_mii_readreg(device_t, int, int, uint16_t *);
+static int     smc91cxx_mii_writereg(device_t, int, int, uint16_t);
+static void    smc91cxx_statchg(struct ifnet *);
+static void    smc91cxx_tick(void *);
 
-int    smc91cxx_mediachange(struct ifnet *);
-void   smc91cxx_mediastatus(struct ifnet *, struct ifmediareq *);
+static int     smc91cxx_mediachange(struct ifnet *);
+static void    smc91cxx_mediastatus(struct ifnet *, struct ifmediareq *);
 
-int    smc91cxx_set_media(struct smc91cxx_softc *, int);
+static int     smc91cxx_set_media(struct smc91cxx_softc *, int);
 
-void   smc91cxx_init(struct smc91cxx_softc *);
-void   smc91cxx_read(struct smc91cxx_softc *);
-void   smc91cxx_reset(struct smc91cxx_softc *);
-void   smc91cxx_start(struct ifnet *);
-uint8_t        smc91cxx_copy_tx_frame(struct smc91cxx_softc *, struct mbuf *);
-void   smc91cxx_resume(struct smc91cxx_softc *);
-void   smc91cxx_stop(struct smc91cxx_softc *);
-void   smc91cxx_watchdog(struct ifnet *);
-int    smc91cxx_ioctl(struct ifnet *, u_long, void *);
+static void    smc91cxx_init(struct smc91cxx_softc *);
+static void    smc91cxx_read(struct smc91cxx_softc *);
+static void    smc91cxx_reset(struct smc91cxx_softc *);
+static void    smc91cxx_start(struct ifnet *);
+static uint8_t smc91cxx_copy_tx_frame(struct smc91cxx_softc *, struct mbuf *);
+static void    smc91cxx_stop(struct smc91cxx_softc *);
+static void    smc91cxx_watchdog(struct ifnet *);
+static int     smc91cxx_ioctl(struct ifnet *, u_long, void *);
+
+static int     smc91cxx_enable(struct smc91cxx_softc *);
+static void    smc91cxx_disable(struct smc91cxx_softc *);
 
 static inline int ether_cmp(const void *, const void *);
 static inline int
@@ -387,7 +389,7 @@
 /*
  * Change media according to request.
  */
-int
+static int
 smc91cxx_mediachange(struct ifnet *ifp)
 {
        struct smc91cxx_softc *sc = ifp->if_softc;
@@ -395,7 +397,7 @@
        return smc91cxx_set_media(sc, sc->sc_mii.mii_media.ifm_media);
 }
 
-int
+static int
 smc91cxx_set_media(struct smc91cxx_softc *sc, int media)
 {
        bus_space_tag_t bst = sc->sc_bst;
@@ -441,7 +443,7 @@
 /*
  * Notify the world which media we're using.
  */
-void
+static void
 smc91cxx_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr)
 {
        struct smc91cxx_softc *sc = ifp->if_softc;
@@ -472,7 +474,7 @@
 /*
  * Reset and initialize the chip.
  */
-void
+static void
 smc91cxx_init(struct smc91cxx_softc *sc)
 {
        struct ifnet *ifp = &sc->sc_ec.ec_if;
@@ -604,7 +606,7 @@
  * Start output on an interface.
  * Must be called at splnet or interrupt level.
  */
-void
+static void
 smc91cxx_start(struct ifnet *ifp)
 {
        struct smc91cxx_softc *sc = ifp->if_softc;
@@ -776,7 +778,7 @@
 /*
  * Squirt a (possibly misaligned) mbuf to the device
  */
-uint8_t
+static uint8_t
 smc91cxx_copy_tx_frame(struct smc91cxx_softc *sc, struct mbuf *m0)
 {
        bus_space_tag_t bst = sc->sc_bst;
@@ -1038,7 +1040,7 @@
  * Read a packet from the card and pass it up to the kernel.
  * NOTE!  WE EXPECT TO BE IN REGISTER WINDOW 2!
  */
-void
+static void
 smc91cxx_read(struct smc91cxx_softc *sc)
 {
        struct ifnet *ifp = &sc->sc_ec.ec_if;
@@ -1184,7 +1186,7 @@
 /*
  * Process an ioctl request.
  */
-int
+static int
 smc91cxx_ioctl(struct ifnet *ifp, u_long cmd, void *data)
 {
        struct smc91cxx_softc *sc = ifp->if_softc;
@@ -1274,7 +1276,7 @@
 /*
  * Reset the interface.
  */
-void
+static void
 smc91cxx_reset(struct smc91cxx_softc *sc)
 {
        int s;
@@ -1288,7 +1290,7 @@
 /*
  * Watchdog timer.
  */