[src/trunk]: src/sys/dev Kill some more extern struct cfdriver declarations.

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

details:   https://anonhg.NetBSD.org/src/rev/1c20792f8f01
branches:  trunk
changeset: 827429:1c20792f8f01
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Oct 28 04:53:54 2017 +0000

description:
Kill some more extern struct cfdriver declarations.

Down with externs in .c!

diffstat:

 sys/dev/acpi/acpi.c        |   7 ++++---
 sys/dev/acpi/pckbc_acpi.c  |   8 ++++----
 sys/dev/acpi/tpm_acpi.c    |   8 ++++----
 sys/dev/adb/adb_bt.c       |   8 ++++----
 sys/dev/adb/adb_kbd.c      |   8 ++++----
 sys/dev/altmem/altmem.c    |   7 ++++---
 sys/dev/apm/apm.c          |   8 ++++----
 sys/dev/ata/ata.c          |   7 +++----
 sys/dev/dec/vsxxx.c        |   8 ++++----
 sys/dev/dm/device-mapper.c |   4 +---
 sys/dev/dtv/dtv_device.c   |   8 ++++----
 sys/dev/flash/flash.c      |   8 ++++----
 sys/dev/gpib/ct.c          |   8 ++++----
 sys/dev/gpib/mt.c          |   8 ++++----
 sys/dev/gpib/ppi.c         |   8 ++++----
 sys/dev/gpib/rd.c          |   8 ++++----
 sys/dev/gpio/gpio.c        |   7 +++----
 sys/dev/gpio/gpioiic.c     |   8 ++++----
 sys/dev/gpio/gpiolock.c    |   6 +++---
 sys/dev/gpio/gpioow.c      |   8 ++++----
 sys/dev/gpio/gpiopwm.c     |   6 +++---
 sys/dev/gpio/gpiosim.c     |   4 +---
 sys/dev/hdmicec/hdmicec.c  |   8 ++++----
 sys/dev/hpc/hpcapm.c       |   8 ++++----
 sys/dev/hpc/hpf1275a_tty.c |   7 +++----
 sys/dev/i2c/at24cxx.c      |   7 ++++---
 sys/dev/i2c/ds1307.c       |   7 ++++---
 sys/dev/i2c/i2c.c          |   7 +++----
 sys/dev/i2c/m41st84.c      |   8 ++++----
 sys/dev/i2c/m41t00.c       |   7 ++++---
 sys/dev/i2c/pcf8583.c      |   7 ++++---
 sys/dev/i2c/x1226.c        |   7 ++++---
 sys/dev/i2o/dpti.c         |   8 ++++----
 sys/dev/i2o/iop.c          |   7 +++----
 sys/dev/ic/aac.c           |   6 ++----
 sys/dev/ic/aic6360.c       |   7 ++++---
 sys/dev/ic/attimer.c       |   6 +++---
 sys/dev/ic/cac.c           |   6 +++---
 sys/dev/ic/clmpcc.c        |   7 +++----
 sys/dev/ic/com.c           |   8 ++++----
 sys/dev/ic/cy.c            |   8 ++++----
 sys/dev/ic/dpt.c           |   8 ++++----
 sys/dev/ic/icp_ioctl.c     |   8 ++++----
 sys/dev/ic/joy.c           |   8 ++++----
 sys/dev/ic/lpt.c           |   8 ++++----
 sys/dev/ic/mb89352.c       |   8 ++++----
 sys/dev/ic/mfi.c           |   8 ++++----
 sys/dev/ic/midway.c        |  11 +++--------
 sys/dev/ic/mlx.c           |   7 +++----
 sys/dev/ic/nvme.c          |   8 ++++----
 sys/dev/ic/rrunner.c       |   9 ++++-----
 sys/dev/ic/tpm.c           |   7 ++++---
 52 files changed, 188 insertions(+), 198 deletions(-)

diffs (truncated from 1783 to 300 lines):

diff -r c374cc697d75 -r 1c20792f8f01 sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c       Sat Oct 28 04:50:38 2017 +0000
+++ b/sys/dev/acpi/acpi.c       Sat Oct 28 04:53:54 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi.c,v 1.263 2017/06/01 02:45:09 chs Exp $   */
+/*     $NetBSD: acpi.c,v 1.264 2017/10/28 04:53:55 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.263 2017/06/01 02:45:09 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.264 2017/10/28 04:53:55 riastradh Exp $");
 
 #include "opt_acpi.h"
 #include "opt_pcifixup.h"
@@ -127,6 +127,8 @@
 
 #include <machine/acpi_machdep.h>
 
+#include "ioconf.h"
+
 #define _COMPONENT     ACPI_BUS_COMPONENT
 ACPI_MODULE_NAME       ("acpi")
 
@@ -143,7 +145,6 @@
 struct acpi_softc      *acpi_softc = NULL;
 static uint64_t                 acpi_root_pointer;
 extern kmutex_t                 acpi_interrupt_list_mtx;
-extern struct           cfdriver acpi_cd;
 static ACPI_HANDLE      acpi_scopes[4];
 ACPI_TABLE_HEADER      *madt_header;
 
diff -r c374cc697d75 -r 1c20792f8f01 sys/dev/acpi/pckbc_acpi.c
--- a/sys/dev/acpi/pckbc_acpi.c Sat Oct 28 04:50:38 2017 +0000
+++ b/sys/dev/acpi/pckbc_acpi.c Sat Oct 28 04:53:54 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pckbc_acpi.c,v 1.35 2016/10/18 22:08:30 jdolecek Exp $ */
+/*     $NetBSD: pckbc_acpi.c,v 1.36 2017/10/28 04:53:55 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.35 2016/10/18 22:08:30 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.36 2017/10/28 04:53:55 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -57,6 +57,8 @@
 #include <dev/ic/i8042reg.h>
 #include <dev/ic/pckbcvar.h>
 
+#include "ioconf.h"
+
 static int     pckbc_acpi_match(device_t, cfdata_t, void *);
 static void    pckbc_acpi_attach(device_t, device_t, void *);
 
@@ -72,8 +74,6 @@
 /* Save first port: */
 static struct pckbc_acpi_softc *first;
 
-extern struct cfdriver pckbc_cd;
-
 CFATTACH_DECL_NEW(pckbc_acpi, sizeof(struct pckbc_acpi_softc),
     pckbc_acpi_match, pckbc_acpi_attach, NULL, NULL);
 
diff -r c374cc697d75 -r 1c20792f8f01 sys/dev/acpi/tpm_acpi.c
--- a/sys/dev/acpi/tpm_acpi.c   Sat Oct 28 04:50:38 2017 +0000
+++ b/sys/dev/acpi/tpm_acpi.c   Sat Oct 28 04:53:54 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tpm_acpi.c,v 1.4 2014/03/01 16:59:41 maxv Exp $ */
+/* $NetBSD: tpm_acpi.c,v 1.5 2017/10/28 04:53:55 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tpm_acpi.c,v 1.4 2014/03/01 16:59:41 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpm_acpi.c,v 1.5 2017/10/28 04:53:55 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -69,6 +69,8 @@
 
 #include <dev/isa/isavar.h>
 
+#include "ioconf.h"
+
 #define _COMPONENT          ACPI_RESOURCE_COMPONENT
 ACPI_MODULE_NAME            ("tpm_acpi")
 
@@ -89,8 +91,6 @@
        NULL
 };
 
-extern struct cfdriver tpm_cd;
-
 static int
 tpm_acpi_match(device_t parent, cfdata_t match, void *aux)
 {
diff -r c374cc697d75 -r 1c20792f8f01 sys/dev/adb/adb_bt.c
--- a/sys/dev/adb/adb_bt.c      Sat Oct 28 04:50:38 2017 +0000
+++ b/sys/dev/adb/adb_bt.c      Sat Oct 28 04:53:54 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: adb_bt.c,v 1.6 2010/09/08 04:48:03 macallan Exp $ */
+/*     $NetBSD: adb_bt.c,v 1.7 2017/10/28 04:53:55 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2006 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb_bt.c,v 1.6 2010/09/08 04:48:03 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_bt.c,v 1.7 2017/10/28 04:53:55 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,6 +41,8 @@
 
 #include <dev/adb/adbvar.h>
 
+#include "ioconf.h"
+
 #include "opt_wsdisplay_compat.h"
 #include "adbdebug.h"
 
@@ -76,8 +78,6 @@
 CFATTACH_DECL_NEW(adbbt, sizeof(struct adbbt_softc),
     adbbt_match, adbbt_attach, NULL, NULL);
 
-extern struct cfdriver adbbt_cd;
-
 static void adbbt_handler(void *, int, uint8_t *);
 
 static int
diff -r c374cc697d75 -r 1c20792f8f01 sys/dev/adb/adb_kbd.c
--- a/sys/dev/adb/adb_kbd.c     Sat Oct 28 04:50:38 2017 +0000
+++ b/sys/dev/adb/adb_kbd.c     Sat Oct 28 04:53:54 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: adb_kbd.c,v 1.26 2015/07/29 08:45:28 christos Exp $    */
+/*     $NetBSD: adb_kbd.c,v 1.27 2017/10/28 04:53:55 riastradh Exp $   */
 
 /*
  * Copyright (C) 1998  Colin Wood
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.26 2015/07/29 08:45:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.27 2017/10/28 04:53:55 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -60,6 +60,8 @@
 #include <dev/adb/adbvar.h>
 #include <dev/adb/adb_keymap.h>
 
+#include "ioconf.h"
+
 #include "opt_wsdisplay_compat.h"
 #include "opt_adbkbd.h"
 #include "adbdebug.h"
@@ -111,8 +113,6 @@
 CFATTACH_DECL_NEW(adbkbd, sizeof(struct adbkbd_softc),
     adbkbd_match, adbkbd_attach, NULL, NULL);
 
-extern struct cfdriver adbkbd_cd;
-
 static int adbkbd_enable(void *, int);
 static int adbkbd_ioctl(void *, u_long, void *, int, struct lwp *);
 static void adbkbd_set_leds(void *, int);
diff -r c374cc697d75 -r 1c20792f8f01 sys/dev/altmem/altmem.c
--- a/sys/dev/altmem/altmem.c   Sat Oct 28 04:50:38 2017 +0000
+++ b/sys/dev/altmem/altmem.c   Sat Oct 28 04:53:54 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altmem.c,v 1.5 2015/04/26 15:15:20 mlelstv Exp $ */
+/* $NetBSD: altmem.c,v 1.6 2017/10/28 04:53:55 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2009 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altmem.c,v 1.5 2015/04/26 15:15:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altmem.c,v 1.6 2017/10/28 04:53:55 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/device.h>
@@ -37,6 +37,8 @@
 
 #include <dev/altmem/altmemvar.h>
 
+#include "ioconf.h"
+
 struct altmem_softc {
        device_t        sc_dev;
 
@@ -87,7 +89,6 @@
        .d_strategy = altmemstrategy,
        .d_minphys = minphys
 };
-extern struct cfdriver altmem_cd;
 
 CFATTACH_DECL_NEW(altmem, sizeof(struct altmem_softc), altmem_match,
     altmem_attach, NULL, NULL);
diff -r c374cc697d75 -r 1c20792f8f01 sys/dev/apm/apm.c
--- a/sys/dev/apm/apm.c Sat Oct 28 04:50:38 2017 +0000
+++ b/sys/dev/apm/apm.c Sat Oct 28 04:53:54 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: apm.c,v 1.32 2017/10/25 08:12:38 maya Exp $ */
+/*     $NetBSD: apm.c,v 1.33 2017/10/28 04:53:54 riastradh Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.32 2017/10/25 08:12:38 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.33 2017/10/28 04:53:54 riastradh Exp $");
 
 #include "opt_apm.h"
 
@@ -57,6 +57,8 @@
 
 #include <dev/apm/apmvar.h>
 
+#include "ioconf.h"
+
 #ifdef APMDEBUG
 #define DPRINTF(f, x)          do { if (apmdebug & (f)) printf x; } while (0)
 
@@ -105,8 +107,6 @@
 static void    apm_suspend(struct apm_softc *);
 static void    apm_resume(struct apm_softc *, u_int, u_int);
 
-extern struct cfdriver apm_cd;
-
 dev_type_open(apmopen);
 dev_type_close(apmclose);
 dev_type_ioctl(apmioctl);
diff -r c374cc697d75 -r 1c20792f8f01 sys/dev/ata/ata.c
--- a/sys/dev/ata/ata.c Sat Oct 28 04:50:38 2017 +0000
+++ b/sys/dev/ata/ata.c Sat Oct 28 04:53:54 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ata.c,v 1.140 2017/10/20 07:06:07 jdolecek Exp $       */
+/*     $NetBSD: ata.c,v 1.141 2017/10/28 04:53:54 riastradh Exp $      */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.140 2017/10/20 07:06:07 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.141 2017/10/28 04:53:54 riastradh Exp $");
 
 #include "opt_ata.h"
 
@@ -53,6 +53,7 @@
 #include <dev/ata/atavar.h>
 #include <dev/ic/wdcvar.h>     /* for PIOBM */
 
+#include "ioconf.h"
 #include "locators.h"
 
 #include "atapibus.h"
@@ -121,8 +122,6 @@
        .d_flag = D_OTHER
 };
 
-extern struct cfdriver atabus_cd;
-
 static void atabus_childdetached(device_t, device_t);
 static int atabus_rescan(device_t, const char *, const int *);
 static bool atabus_resume(device_t, const pmf_qual_t *);
diff -r c374cc697d75 -r 1c20792f8f01 sys/dev/dec/vsxxx.c
--- a/sys/dev/dec/vsxxx.c       Sat Oct 28 04:50:38 2017 +0000
+++ b/sys/dev/dec/vsxxx.c       Sat Oct 28 04:53:54 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vsxxx.c,v 1.11 2009/03/14 21:04:19 dsl Exp $ */
+/* $NetBSD: vsxxx.c,v 1.12 2017/10/28 04:53:54 riastradh Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vsxxx.c,v 1.11 2009/03/14 21:04:19 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vsxxx.c,v 1.12 2017/10/28 04:53:54 riastradh Exp $");