Rename remove_dev() to destroy_dev().

Nagged about by:        msmith

6 files changed, 16 insertions, 16 deletions

diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index 78997fe..f4c89e0 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -164,16 +164,16 @@ streams_modevent(module_t mod, int type, void *unused)
 		return 0;
 	case MOD_UNLOAD:
 	  	/* XXX should check to see if it's busy first */
-		remove_dev(dt_ptm);
-		remove_dev(dt_arp);
-		remove_dev(dt_icmp);
-		remove_dev(dt_ip);
-		remove_dev(dt_tcp);
-		remove_dev(dt_udp);
-		remove_dev(dt_rawip);
-		remove_dev(dt_unix_dgram);
-		remove_dev(dt_unix_stream);
-		remove_dev(dt_unix_ord_stream);
+		destroy_dev(dt_ptm);
+		destroy_dev(dt_arp);
+		destroy_dev(dt_icmp);
+		destroy_dev(dt_ip);
+		destroy_dev(dt_tcp);
+		destroy_dev(dt_udp);
+		destroy_dev(dt_rawip);
+		destroy_dev(dt_unix_dgram);
+		destroy_dev(dt_unix_stream);
+		destroy_dev(dt_unix_ord_stream);
 
 		return 0;
 	default:
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 4b3febd..f2cd741 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -330,8 +330,8 @@ USB_DETACH(ulpt)
 #elif defined(__FreeBSD__)
 	/* XXX not implemented yet */
 
-	remove_dev(sc->dev);
-	remove_dev(sc->dev_noprime);
+	destroy_dev(sc->dev);
+	destroy_dev(sc->dev_noprime);
 #endif
 
 	return (0);
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index b5ba640..c9723a1 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -372,7 +372,7 @@ ums_detach(device_t self)
 	}
 #endif
 
-	remove_dev(sc->dev);
+	destroy_dev(sc->dev);
 
 	return 0;
 }
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index a5229ec..a50a103 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -341,7 +341,7 @@ make_dev(struct cdevsw *devsw, int minor, uid_t uid, gid_t gid, int perms, char
 }
 
 void
-remove_dev(dev_t dev)
+destroy_dev(dev_t dev)
 {
 	if (devfs_remove_hook)
 		devfs_remove_hook(dev);
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index ef3f29a..d276d8d 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -258,6 +258,7 @@ DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE)
 int	cdevsw_add __P((struct cdevsw *new));
 int	cdevsw_remove __P((struct cdevsw *old));
 dev_t	chrtoblk __P((dev_t dev));
+void	destroy_dev __P((dev_t dev));
 struct cdevsw *devsw __P((dev_t dev));
 int	devsw_module_handler __P((struct module *mod, int what, void *arg));
 const char *devtoname __P((dev_t dev));
@@ -266,7 +267,6 @@ int	iszerodev __P((dev_t dev));
 dev_t	makebdev __P((int maj, int min));
 dev_t	make_dev __P((struct cdevsw *devsw, int minor, uid_t uid, gid_t gid, int perms, char *fmt, ...)) __printflike(6, 7);
 int	lminor __P((dev_t dev));
-void	remove_dev __P((dev_t dev));
 void	setconf __P((void));
 
 extern devfs_create_t *devfs_create_hook;
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index ef3f29a..d276d8d 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -258,6 +258,7 @@ DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE)
 int	cdevsw_add __P((struct cdevsw *new));
 int	cdevsw_remove __P((struct cdevsw *old));
 dev_t	chrtoblk __P((dev_t dev));
+void	destroy_dev __P((dev_t dev));
 struct cdevsw *devsw __P((dev_t dev));
 int	devsw_module_handler __P((struct module *mod, int what, void *arg));
 const char *devtoname __P((dev_t dev));
@@ -266,7 +267,6 @@ int	iszerodev __P((dev_t dev));
 dev_t	makebdev __P((int maj, int min));
 dev_t	make_dev __P((struct cdevsw *devsw, int minor, uid_t uid, gid_t gid, int perms, char *fmt, ...)) __printflike(6, 7);
 int	lminor __P((dev_t dev));
-void	remove_dev __P((dev_t dev));
 void	setconf __P((void));
 
 extern devfs_create_t *devfs_create_hook;