[src/trunk]: src/sys/dev/pci Register as built-in module when not compiled as...

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

details:   https://anonhg.NetBSD.org/src/rev/189b27ec14a2
branches:  trunk
changeset: 768970:189b27ec14a2
user:      mbalmer <mbalmer%NetBSD.org@localhost>
date:      Mon Aug 29 15:06:49 2011 +0000

description:
Register as built-in module when not compiled as a module.  Reminded by
jmcneill.

diffstat:

 sys/dev/pci/pwdog.c |  23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diffs (55 lines):

diff -r bc2fd880a7a3 -r 189b27ec14a2 sys/dev/pci/pwdog.c
--- a/sys/dev/pci/pwdog.c       Mon Aug 29 14:59:09 2011 +0000
+++ b/sys/dev/pci/pwdog.c       Mon Aug 29 15:06:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $$NetBSD: pwdog.c,v 1.5 2011/08/29 14:47:08 jmcneill Exp $ */
+/*     $$NetBSD: pwdog.c,v 1.6 2011/08/29 15:06:49 mbalmer Exp $ */
 /*     $OpenBSD: pwdog.c,v 1.7 2010/04/08 00:23:53 tedu Exp $ */
 
 /*
@@ -193,33 +193,36 @@
        return 0;
 }
 
-#ifdef _MODULE
 MODULE(MODULE_CLASS_DRIVER, pwdog, "pci");
 
+#ifdef _MODULE
 #include "ioconf.c"
+#endif
 
 static int
 pwdog_modcmd(modcmd_t cmd, void *opaque)
 {
        int error;
 
+       error = 0;
        switch (cmd) {
        case MODULE_CMD_INIT:
+#ifdef _MODULE
                error = config_init_component(cfdriver_ioconf_pwdog,
                    cfattach_ioconf_pwdog, cfdata_ioconf_pwdog);
-               if (error) {
+               if (error)
                        aprint_error("%s: unable to init component\n",
                            pwdog_cd.cd_name);
-                       return error;
-               }
-               return 0;
+#endif
+               break;
        case MODULE_CMD_FINI:
+#ifdef _MODULE
                config_fini_component(cfdriver_ioconf_pwdog,
                    cfattach_ioconf_pwdog, cfdata_ioconf_pwdog);
-               return 0;
+#endif
+               break;
        default:
-               return ENOTTY;
+               error = ENOTTY;
        }
+       return error;
 }
-
-#endif /* _MODULE */