CVS commit: src/sys/dev

[Izumi Tsutsui]

Module Name:    src
Committed By:   tsutsui
Date:           Tue Sep 22 13:20:36 UTC 2009

Modified Files:
        src/sys/dev/isapnp: aic_isapnp.c
        src/sys/dev/pcmcia: aic_pcmcia.c

Log Message:
- make local functions/variables static
- use __arraycount()


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/isapnp/aic_isapnp.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/pcmcia/aic_pcmcia.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/isapnp/aic_isapnp.c
diff -u src/sys/dev/isapnp/aic_isapnp.c:1.20 src/sys/dev/isapnp/aic_isapnp.c:1.21
--- src/sys/dev/isapnp/aic_isapnp.c:1.20	Tue Sep 22 12:56:06 2009
+++ src/sys/dev/isapnp/aic_isapnp.c	Tue Sep 22 13:20:36 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic_isapnp.c,v 1.20 2009/09/22 12:56:06 tsutsui Exp $	*/
+/*	$NetBSD: aic_isapnp.c,v 1.21 2009/09/22 13:20:36 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.20 2009/09/22 12:56:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.21 2009/09/22 13:20:36 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -57,8 +57,8 @@
 	void	*sc_ih;			/* interrupt handler */
 };
 
-int	aic_isapnp_match(device_t, cfdata_t, void *);
-void	aic_isapnp_attach(device_t, device_t, void *);
+static int	aic_isapnp_match(device_t, cfdata_t, void *);
+static void	aic_isapnp_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(aic_isapnp, sizeof(struct aic_isapnp_softc),
     aic_isapnp_match, aic_isapnp_attach, NULL, NULL);

Index: src/sys/dev/pcmcia/aic_pcmcia.c
diff -u src/sys/dev/pcmcia/aic_pcmcia.c:1.41 src/sys/dev/pcmcia/aic_pcmcia.c:1.42
--- src/sys/dev/pcmcia/aic_pcmcia.c:1.41	Tue Sep 22 12:56:06 2009
+++ src/sys/dev/pcmcia/aic_pcmcia.c	Tue Sep 22 13:20:36 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic_pcmcia.c,v 1.41 2009/09/22 12:56:06 tsutsui Exp $	*/
+/*	$NetBSD: aic_pcmcia.c,v 1.42 2009/09/22 13:20:36 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.41 2009/09/22 12:56:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.42 2009/09/22 13:20:36 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -62,16 +62,16 @@
 #define	AIC_PCMCIA_ATTACHED	3
 };
 
-int	aic_pcmcia_match(device_t, cfdata_t, void *);
-int	aic_pcmcia_validate_config(struct pcmcia_config_entry *);
-void	aic_pcmcia_attach(device_t, device_t, void *);
-int	aic_pcmcia_detach(device_t, int);
-int	aic_pcmcia_enable(device_t, int);
+static int	aic_pcmcia_match(device_t, cfdata_t, void *);
+static int	aic_pcmcia_validate_config(struct pcmcia_config_entry *);
+static void	aic_pcmcia_attach(device_t, device_t, void *);
+static int	aic_pcmcia_detach(device_t, int);
+static int	aic_pcmcia_enable(device_t, int);
 
 CFATTACH_DECL_NEW(aic_pcmcia, sizeof(struct aic_pcmcia_softc),
     aic_pcmcia_match, aic_pcmcia_attach, aic_pcmcia_detach, aic_activate);
 
-const struct pcmcia_product aic_pcmcia_products[] = {
+static const struct pcmcia_product aic_pcmcia_products[] = {
 	{ PCMCIA_VENDOR_ADAPTEC, PCMCIA_PRODUCT_ADAPTEC_APA1460,
 	  PCMCIA_CIS_INVALID },
 
@@ -81,8 +81,7 @@
 	{ PCMCIA_VENDOR_NEWMEDIA, PCMCIA_PRODUCT_NEWMEDIA_BUSTOASTER,
 	  PCMCIA_CIS_INVALID },
 };
-const size_t aic_pcmcia_nproducts =
-    sizeof(aic_pcmcia_products) / sizeof(aic_pcmcia_products[0]);
+static const size_t aic_pcmcia_nproducts = __arraycount(aic_pcmcia_products);
 
 int
 aic_pcmcia_match(device_t parent, cfdata_t match, void *aux)