Originally when DEVFS was added, a global variable "devfs_present"

was used to control code which were conditional on DEVFS' precense
since this avoided the need for large-scale source pollution with
#include "opt_geom.h"

Now that we approach making DEVFS standard, replace these tests
with an #ifdef to facilitate mechanical removal once DEVFS becomes
non-optional.

No functional change by this commit.

2 files changed, 18 insertions, 16 deletions

diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c
index d84d2b4..0648200 100644
--- a/sys/net/if_tap.c
+++ b/sys/net/if_tap.c
@@ -178,13 +178,13 @@ tapmodevent(mod, type, data)
 			goto bail2;
 		}
 
-		if (!devfs_present) {
-			error = cdevsw_add(&tap_cdevsw);
-			if (error != 0) {
-				EVENTHANDLER_DEREGISTER(dev_clone, eh_tag);
-				goto bail2;
-			}
+#ifdef NODEVFS
+		error = cdevsw_add(&tap_cdevsw);
+		if (error != 0) {
+			EVENTHANDLER_DEREGISTER(dev_clone, eh_tag);
+			goto bail2;
 		}
+#endif
 
 		return (0);
 bail2:
@@ -229,8 +229,9 @@ bail:
  		if (tapbasedev != NOUDEV)
 			destroy_dev(udev2dev(tapbasedev, 0));
 
-                if (!devfs_present)
-                        cdevsw_remove(&tap_cdevsw);
+#ifdef NODEVFS
+		cdevsw_remove(&tap_cdevsw);
+#endif
 
 		break;
 
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 719191b..ce39d1f 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -147,13 +147,13 @@ tunmodevent(module_t mod, int type, void *data)
 		tag = EVENTHANDLER_REGISTER(dev_clone, tunclone, 0, 1000);
 		if (tag == NULL)
 			return (ENOMEM);
-		if (!devfs_present) {
-			err = cdevsw_add(&tun_cdevsw);
-			if (err != 0) {
-				EVENTHANDLER_DEREGISTER(dev_clone, tag);
-				return (err);
-			}
+#ifdef NODEVFS
+		err = cdevsw_add(&tun_cdevsw);
+		if (err != 0) {
+			EVENTHANDLER_DEREGISTER(dev_clone, tag);
+			return (err);
 		}
+#endif
 		tununits.rm_type = RMAN_ARRAY;
 		tununits.rm_descr = "open if_tun units";
 		err = rman_init(&tununits);
@@ -200,8 +200,9 @@ tunmodevent(module_t mod, int type, void *data)
 		if (tunbasedev != NOUDEV)
 			destroy_dev(udev2dev(tunbasedev, 0));
 
-		if (!devfs_present)
-			cdevsw_remove(&tun_cdevsw);
+#ifdef NODEVFS
+		cdevsw_remove(&tun_cdevsw);
+#endif
 		break;
 	} 
 	return 0;