Module Name: src
Committed By: pgoyette
Date: Sun Jul 17 00:27:03 UTC 2016
Modified Files:
src/sys/netsmb: smb_dev.c
Log Message:
Finish previous - now that we're not calling devsw_attach unnecessarily,
we can enclose some additional variables in #ifdef _MODULE / #endif
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/netsmb/smb_dev.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/netsmb/smb_dev.c
diff -u src/sys/netsmb/smb_dev.c:1.45 src/sys/netsmb/smb_dev.c:1.46
--- src/sys/netsmb/smb_dev.c:1.45 Sun Jul 17 00:17:14 2016
+++ src/sys/netsmb/smb_dev.c Sun Jul 17 00:27:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_dev.c,v 1.45 2016/07/17 00:17:14 pgoyette Exp $ */
+/* $NetBSD: smb_dev.c,v 1.46 2016/07/17 00:27:03 pgoyette Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.45 2016/07/17 00:17:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.46 2016/07/17 00:27:03 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -86,6 +86,7 @@ dev_type_open(nsmb_dev_open);
dev_type_close(nsmb_dev_close);
dev_type_ioctl(nsmb_dev_ioctl);
+#ifdef _MODULE
const struct cdevsw nsmb_cdevsw = {
.d_open = nsmb_dev_open,
.d_close = nsmb_dev_close,
@@ -100,7 +101,7 @@ const struct cdevsw nsmb_cdevsw = {
.d_discard = nodiscard,
.d_flag = D_OTHER,
};
-
+#endif
static bool nsmb_inited = false;
@@ -372,7 +373,9 @@ MODULE(MODULE_CLASS_DRIVER, nsmb, NULL);
static int
nsmb_modcmd(modcmd_t cmd, void *arg)
{
+#ifdef _MODULE
devmajor_t cmajor = NODEVMAJOR, bmajor = NODEVMAJOR;
+#endif
int error = 0;
switch (cmd) {
