[src/trunk]: src/sys/dev/iscsi Revert and add comment that this dance is for ...

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

details:   https://anonhg.NetBSD.org/src/rev/8c350d1dadbf
branches:  trunk
changeset: 806394:8c350d1dadbf
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Feb 21 17:14:37 2015 +0000

description:
Revert and add comment that this dance is for the sake of builtin module
registration.

diffstat:

 sys/dev/iscsi/iscsi_main.c |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (65 lines):

diff -r 72055916c9da -r 8c350d1dadbf sys/dev/iscsi/iscsi_main.c
--- a/sys/dev/iscsi/iscsi_main.c        Sat Feb 21 15:13:20 2015 +0000
+++ b/sys/dev/iscsi/iscsi_main.c        Sat Feb 21 17:14:37 2015 +0000
@@ -501,13 +501,13 @@
        }
 }
 
-#ifdef _MODULE
 /* Kernel Module support */
 
 #include <sys/module.h>
 
-MODULE(MODULE_CLASS_DRIVER, iscsi, NULL);
+MODULE(MODULE_CLASS_DRIVER, iscsi, NULL); /* Possibly a builtin module */
 
+#ifdef _MODULE
 static const struct cfiattrdata ibescsi_info = { "scsi", 1,
        {{"channel", "-1", -1},}
 };
@@ -528,15 +528,19 @@
        },
        { NULL, NULL, 0, 0, NULL, 0, NULL }
 };
+#endif
 
 static int
 iscsi_modcmd(modcmd_t cmd, void *arg)
 {
+#ifdef _MODULE
        devmajor_t cmajor = NODEVMAJOR, bmajor = NODEVMAJOR;
        int error;
+#endif
 
        switch (cmd) {
        case MODULE_CMD_INIT:
+#ifdef _MODULE
                error = config_cfdriver_attach(&iscsi_cd);
                if (error) {
                        return error;
@@ -577,10 +581,12 @@
                        config_cfdriver_detach(&iscsi_cd);
                        return ENXIO;
                }
+#endif
                return 0;
                break;
 
        case MODULE_CMD_FINI:
+#ifdef _MODULE
                error = config_cfdata_detach(iscsi_cfdata);
                if (error)
                        return error;
@@ -588,6 +594,7 @@
                config_cfattach_detach(iscsi_cd.cd_name, &iscsi_ca);
                config_cfdriver_detach(&iscsi_cd);
                devsw_detach(NULL, &iscsi_cdevsw);
+#endif
                return 0;
                break;
 
@@ -600,4 +607,3 @@
                break;
        }
 }
-#endif /* _MODULE */