[src/trunk]: src/sys/arch/alpha/pci Sprinkle some static.

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

details:   https://anonhg.NetBSD.org/src/rev/42e5badc3c6d
branches:  trunk
changeset: 1021796:42e5badc3c6d
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Jun 18 22:17:53 2021 +0000

description:
Sprinkle some static.

diffstat:

 sys/arch/alpha/pci/apecs.c    |   9 +++++----
 sys/arch/alpha/pci/cia.c      |  22 ++++++++++++----------
 sys/arch/alpha/pci/irongate.c |  19 ++++++++++---------
 sys/arch/alpha/pci/lca.c      |  24 ++++++++++++------------
 sys/arch/alpha/pci/mcpcia.c   |  13 +++++++------
 5 files changed, 46 insertions(+), 41 deletions(-)

diffs (295 lines):

diff -r b7252bff1512 -r 42e5badc3c6d sys/arch/alpha/pci/apecs.c
--- a/sys/arch/alpha/pci/apecs.c        Fri Jun 18 22:12:02 2021 +0000
+++ b/sys/arch/alpha/pci/apecs.c        Fri Jun 18 22:17:53 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs.c,v 1.55 2021/04/24 23:36:23 thorpej Exp $ */
+/* $NetBSD: apecs.c,v 1.56 2021/06/18 22:17:53 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.55 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.56 2021/06/18 22:17:53 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -106,7 +106,7 @@
     struct alpha_bus_space_translation *);
 
 /* There can be only one. */
-int apecsfound;
+static int apecsfound;
 struct apecs_config apecs_configuration;
 
 static int
@@ -234,7 +234,8 @@
 }
 
 static int
-apecs_bus_get_window(int type, int window, struct alpha_bus_space_translation *abst)
+apecs_bus_get_window(int type, int window,
+    struct alpha_bus_space_translation *abst)
 {
        struct apecs_config *acp = &apecs_configuration;
        bus_space_tag_t st;
diff -r b7252bff1512 -r 42e5badc3c6d sys/arch/alpha/pci/cia.c
--- a/sys/arch/alpha/pci/cia.c  Fri Jun 18 22:12:02 2021 +0000
+++ b/sys/arch/alpha/pci/cia.c  Fri Jun 18 22:17:53 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cia.c,v 1.75 2021/04/24 23:36:23 thorpej Exp $ */
+/* $NetBSD: cia.c,v 1.76 2021/06/18 22:17:53 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.75 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.76 2021/06/18 22:17:53 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -102,18 +102,19 @@
 #include <alpha/pci/pci_1000.h>
 #endif
 
-int    ciamatch(device_t, cfdata_t, void *);
-void   ciaattach(device_t, device_t, void *);
+static int     ciamatch(device_t, cfdata_t, void *);
+static void    ciaattach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(cia, sizeof(struct cia_softc),
     ciamatch, ciaattach, NULL, NULL);
 
 extern struct cfdriver cia_cd;
 
-int    cia_bus_get_window(int, int, struct alpha_bus_space_translation *);
+static int     cia_bus_get_window(int, int,
+                   struct alpha_bus_space_translation *);
 
 /* There can be only one. */
-int ciafound;
+static int ciafound;
 struct cia_config cia_configuration;
 
 /*
@@ -147,7 +148,7 @@
 int    cia_bus_use_bwx = CIA_BUS_USE_BWX;
 int    cia_pyxis_force_bwx = CIA_PYXIS_FORCE_BWX;
 
-int
+static int
 ciamatch(device_t parent, cfdata_t match, void *aux)
 {
        struct mainbus_attach_args *ma = aux;
@@ -260,7 +261,7 @@
        ccp->cc_initted = 1;
 }
 
-void
+static void
 ciaattach(device_t parent, device_t self, void *aux)
 {
        struct cia_softc *sc = device_private(self);
@@ -404,8 +405,9 @@
        config_found(self, &pba, pcibusprint, CFARG_EOL);
 }
 
-int
-cia_bus_get_window(int type, int window, struct alpha_bus_space_translation *abst)
+static int
+cia_bus_get_window(int type, int window,
+    struct alpha_bus_space_translation *abst)
 {
        struct cia_config *ccp = &cia_configuration;
        bus_space_tag_t st;
diff -r b7252bff1512 -r 42e5badc3c6d sys/arch/alpha/pci/irongate.c
--- a/sys/arch/alpha/pci/irongate.c     Fri Jun 18 22:12:02 2021 +0000
+++ b/sys/arch/alpha/pci/irongate.c     Fri Jun 18 22:17:53 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: irongate.c,v 1.17 2021/04/24 23:36:23 thorpej Exp $ */
+/* $NetBSD: irongate.c,v 1.18 2021/06/18 22:17:53 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: irongate.c,v 1.17 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irongate.c,v 1.18 2021/06/18 22:17:53 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -57,8 +57,8 @@
 #include <alpha/pci/pci_up1000.h>
 #endif
 
-int    irongate_match(device_t, cfdata_t, void *);
-void   irongate_attach(device_t, device_t, void *);
+static int     irongate_match(device_t, cfdata_t, void *);
+static void    irongate_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(irongate, sizeof(struct irongate_softc),
     irongate_match, irongate_attach, NULL, NULL);
@@ -67,9 +67,10 @@
 
 /* There can be only one. */
 struct irongate_config irongate_configuration;
-int    irongate_found;
+static int irongate_found;
 
-int    irongate_bus_get_window(int, int, struct alpha_bus_space_translation *);
+static int     irongate_bus_get_window(int, int,
+                   struct alpha_bus_space_translation *);
 
 /*
  * Set up the chipset's function pointers.
@@ -110,7 +111,7 @@
        icp->ic_initted = 1;
 }
 
-int
+static int
 irongate_match(device_t parent, cfdata_t match, void *aux)
 {
        struct mainbus_attach_args *ma = aux;
@@ -125,7 +126,7 @@
        return (1);
 }
 
-void
+static void
 irongate_attach(device_t parent, device_t self, void *aux)
 {
        struct irongate_softc *sc = device_private(self);
@@ -206,7 +207,7 @@
            CFARG_EOL);
 }
 
-int
+static int
 irongate_bus_get_window(int type, int window,
     struct alpha_bus_space_translation *abst)
 {
diff -r b7252bff1512 -r 42e5badc3c6d sys/arch/alpha/pci/lca.c
--- a/sys/arch/alpha/pci/lca.c  Fri Jun 18 22:12:02 2021 +0000
+++ b/sys/arch/alpha/pci/lca.c  Fri Jun 18 22:17:53 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lca.c,v 1.52 2021/04/24 23:36:23 thorpej Exp $ */
+/* $NetBSD: lca.c,v 1.53 2021/06/18 22:17:53 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: lca.c,v 1.52 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lca.c,v 1.53 2021/06/18 22:17:53 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -91,22 +91,22 @@
 #include <alpha/pci/pci_eb66.h>
 #endif
 
-int    lcamatch(device_t, cfdata_t, void *);
-void   lcaattach(device_t, device_t, void *);
+static int     lcamatch(device_t, cfdata_t, void *);
+static void    lcaattach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(lca, sizeof(struct lca_softc),
     lcamatch, lcaattach, NULL, NULL);
 
 extern struct cfdriver lca_cd;
 
-int    lca_bus_get_window(int, int,
-           struct alpha_bus_space_translation *);
+static int     lca_bus_get_window(int, int,
+                   struct alpha_bus_space_translation *);
 
 /* There can be only one. */
-int lcafound;
 struct lca_config lca_configuration;
+static int lcafound;
 
-int
+static int
 lcamatch(device_t parent, cfdata_t match, void *aux)
 {
        struct mainbus_attach_args *ma = aux;
@@ -181,7 +181,7 @@
        lcp->lc_initted = 1;
 }
 
-void
+static void
 lcaattach(device_t parent, device_t self, void *aux)
 {
        struct lca_softc *sc = device_private(self);
@@ -189,7 +189,6 @@
        struct pcibus_attach_args pba;
 
        /* note that we've attached the chipset; can't have 2 LCAs. */
-       /* Um, not sure about this.  XXX JH */
        lcafound = 1;
        sc->sc_dev = self;
 
@@ -240,8 +239,9 @@
        config_found(self, &pba, pcibusprint, CFARG_EOL);
 }
 
-int
-lca_bus_get_window(int type, int window, struct alpha_bus_space_translation *abst)
+static int
+lca_bus_get_window(int type, int window,
+    struct alpha_bus_space_translation *abst)
 {
        struct lca_config *lcp = &lca_configuration;
        bus_space_tag_t st;
diff -r b7252bff1512 -r 42e5badc3c6d sys/arch/alpha/pci/mcpcia.c
--- a/sys/arch/alpha/pci/mcpcia.c       Fri Jun 18 22:12:02 2021 +0000
+++ b/sys/arch/alpha/pci/mcpcia.c       Fri Jun 18 22:17:53 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia.c,v 1.31 2021/04/24 23:36:23 thorpej Exp $ */
+/* $NetBSD: mcpcia.c,v 1.32 2021/06/18 22:17:53 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mcpcia.c,v 1.31 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcpcia.c,v 1.32 2021/06/18 22:17:53 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -111,8 +111,8 @@
  */
 struct mcpcia_config mcpcia_console_configuration;
 
-int    mcpcia_bus_get_window(int, int,
-           struct alpha_bus_space_translation *abst);
+static int     mcpcia_bus_get_window(int, int,
+                   struct alpha_bus_space_translation *abst);
 
 static int
 mcpciamatch(device_t parent, cfdata_t cf, void *aux)
@@ -332,8 +332,9 @@
 #endif
 }
 
-int
-mcpcia_bus_get_window(int type, int window, struct alpha_bus_space_translation *abst)
+static int
+mcpcia_bus_get_window(int type, int window,
+    struct alpha_bus_space_translation *abst)
 {
        struct mcpcia_config *ccp = &mcpcia_console_configuration;
        bus_space_tag_t st;