From 2b64426519feea07bf03a986dddbca2cb221c88f Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Sat, 28 Dec 2002 21:39:04 +0000
Subject: [PATCH] Remove calls to cdevsw_add(), they are dreprecated on this
 branch now.

---
 sys/dev/fdc/fdc.c | 6 ------
 sys/isa/fd.c      | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 507daa91019e..1fc50a30c7b6 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -1323,13 +1323,8 @@ static int
 fd_attach(device_t dev)
 {
 	struct	fd_data *fd;
-	static	int cdevsw_add_done;
 	int i;
 
-	if (!cdevsw_add_done) {
-		cdevsw_add(&fd_cdevsw);	/* XXX */
-		cdevsw_add_done = 1;
-	}
 	fd = device_get_softc(dev);
 	fd->clonetag = EVENTHANDLER_REGISTER(dev_clone, fd_clone, fd, 1000);
 	fd->masterdev = make_dev(&fd_cdevsw, fd->fdu << 6,
@@ -1356,7 +1351,6 @@ fd_detach(device_t dev)
 	for (i = 0; i < NUMDENS - 1; i++)
 		if (fd->clonedevs[i] != NODEV)
 			destroy_dev(fd->clonedevs[i]);
-	cdevsw_remove(&fd_cdevsw);
 	EVENTHANDLER_DEREGISTER(dev_clone, fd->clonetag);
 
 	return (0);
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index 507daa91019e..1fc50a30c7b6 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -1323,13 +1323,8 @@ static int
 fd_attach(device_t dev)
 {
 	struct	fd_data *fd;
-	static	int cdevsw_add_done;
 	int i;
 
-	if (!cdevsw_add_done) {
-		cdevsw_add(&fd_cdevsw);	/* XXX */
-		cdevsw_add_done = 1;
-	}
 	fd = device_get_softc(dev);
 	fd->clonetag = EVENTHANDLER_REGISTER(dev_clone, fd_clone, fd, 1000);
 	fd->masterdev = make_dev(&fd_cdevsw, fd->fdu << 6,
@@ -1356,7 +1351,6 @@ fd_detach(device_t dev)
 	for (i = 0; i < NUMDENS - 1; i++)
 		if (fd->clonedevs[i] != NODEV)
 			destroy_dev(fd->clonedevs[i]);
-	cdevsw_remove(&fd_cdevsw);
 	EVENTHANDLER_DEREGISTER(dev_clone, fd->clonetag);
 
 	return (0);