From 88abd8b5763f2e5d4b4db5c5dc1b5bb4c489698b Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sun, 31 Oct 2010 11:16:26 +0100
Subject: [PATCH] kernel: Remove most definitions of CDEV_MAJOR.

These are no longer needed since we have devfs.

A few are left in because they are added to the order in SYSINIT()s.
This needs further investigation.
---
 sys/bus/cam/cam_xpt.c                     | 5 +----
 sys/bus/cam/scsi/scsi_ch.c                | 4 +---
 sys/bus/cam/scsi/scsi_pass.c              | 5 +----
 sys/bus/cam/scsi/scsi_pt.c                | 5 +----
 sys/bus/cam/scsi/scsi_sa.c                | 5 +----
 sys/bus/cam/scsi/scsi_ses.c               | 4 +---
 sys/bus/cam/scsi/scsi_target.c            | 4 +---
 sys/bus/firewire/fwdev.c                  | 4 +---
 sys/bus/smbus/smb.c                       | 4 +---
 sys/bus/usb/usb.c                         | 3 +--
 sys/bus/usb/usbdi.h                       | 3 ---
 sys/dev/acpica5/acpi.c                    | 3 +--
 sys/dev/agp/agp.c                         | 5 +----
 sys/dev/disk/ahci/ahci_dragonfly.h        | 2 --
 sys/dev/disk/ccd/ccd.c                    | 6 +-----
 sys/dev/disk/iscsi/initiator/iscsi.c      | 2 +-
 sys/dev/disk/iscsi/initiator/iscsi.h      | 2 --
 sys/dev/disk/isp/isp_freebsd.c            | 5 +----
 sys/dev/disk/md/md.c                      | 5 +----
 sys/dev/disk/sili/sili_dragonfly.h        | 2 --
 sys/dev/disk/vn/vn.c                      | 5 +----
 sys/dev/disk/wt/wt.c                      | 5 +----
 sys/dev/drm/drm.h                         | 1 -
 sys/dev/misc/cmx/cmx.c                    | 4 +---
 sys/dev/misc/dcons/dcons_os.c             | 5 +----
 sys/dev/misc/gpib/gpib.c                  | 4 +---
 sys/dev/misc/hotplug/hotplug.c            | 4 +---
 sys/dev/misc/joy/joy.c                    | 4 +---
 sys/dev/misc/kbd/kbd.c                    | 5 +----
 sys/dev/misc/labpc/labpc.c                | 4 +---
 sys/dev/misc/lpt/lpt.c                    | 4 +---
 sys/dev/misc/mse/mse.c                    | 4 +---
 sys/dev/misc/nmdm/nmdm.c                  | 3 +--
 sys/dev/misc/pcfclock/pcfclock.c          | 4 +---
 sys/dev/misc/ppi/ppi.c                    | 4 +---
 sys/dev/misc/pps/pps.c                    | 4 +---
 sys/dev/misc/psm/psm.c                    | 4 +---
 sys/dev/misc/snp/snp.c                    | 6 ++----
 sys/dev/misc/spic/spic.c                  | 3 +--
 sys/dev/misc/spic/spicreg.h               | 3 ---
 sys/dev/misc/spigot/spigot.c              | 4 +---
 sys/dev/misc/syscons/syscons.c            | 5 +----
 sys/dev/misc/syscons/sysmouse.c           | 3 +--
 sys/dev/misc/tw/tw.c                      | 4 +---
 sys/dev/raid/aac/aac.c                    | 6 +-----
 sys/dev/raid/aac/aacvar.h                 | 6 ------
 sys/dev/raid/amr/amr.c                    | 5 +----
 sys/dev/raid/amr/amr_disk.c               | 5 +----
 sys/dev/raid/ciss/ciss.c                  | 5 +----
 sys/dev/raid/dpt/dpt.h                    | 2 --
 sys/dev/raid/ida/ida_disk.c               | 6 +-----
 sys/dev/raid/iir/iir.h                    | 3 ---
 sys/dev/raid/iir/iir_ctrl.c               | 6 +-----
 sys/dev/raid/ips/ips.c                    | 3 +--
 sys/dev/raid/ips/ips.h                    | 4 ----
 sys/dev/raid/ips/ips_disk.c               | 3 +--
 sys/dev/raid/mlx/mlx.c                    | 5 +----
 sys/dev/raid/mlx/mlx_disk.c               | 5 +----
 sys/dev/raid/mly/mly.c                    | 5 +----
 sys/dev/raid/twe/twe_freebsd.c            | 5 ++---
 sys/dev/raid/twe/twevar.h                 | 4 ----
 sys/dev/serial/cy/cy.c                    | 4 +---
 sys/dev/serial/dgb/dgm.c                  | 4 +---
 sys/dev/serial/digi/digi.c                | 5 +----
 sys/dev/serial/rc/rc.c                    | 4 +---
 sys/dev/serial/rp/rp.c                    | 4 +---
 sys/dev/serial/si/si.c                    | 4 +---
 sys/dev/serial/sio/sio.c                  | 4 +---
 sys/dev/serial/stl/stallion.c             | 3 +--
 sys/dev/serial/stli/istallion.c           | 4 +---
 sys/dev/sound/pcm/dsp.c                   | 4 +---
 sys/dev/sound/pcm/mixer.c                 | 4 +---
 sys/dev/sound/pcm/sndstat.c               | 4 +---
 sys/dev/sound/pcm/sound.h                 | 6 ------
 sys/dev/usbmisc/ucom/ucom.c               | 5 +----
 sys/dev/usbmisc/ufm/ufm.c                 | 5 +----
 sys/dev/usbmisc/ugen/ugen.c               | 5 +----
 sys/dev/usbmisc/uhid/uhid.c               | 5 +----
 sys/dev/usbmisc/ulpt/ulpt.c               | 5 +----
 sys/dev/usbmisc/ums/ums.c                 | 5 +----
 sys/dev/usbmisc/urio/urio.c               | 5 +----
 sys/dev/usbmisc/uscanner/uscanner.c       | 5 +----
 sys/dev/video/bktr/bktr_os.c              | 4 +---
 sys/dev/video/ctx/ctx.c                   | 4 +---
 sys/dev/video/cxm/cxm.c                   | 4 +---
 sys/dev/video/fb/fb.c                     | 5 +----
 sys/dev/video/gsc/gsc.c                   | 4 +---
 sys/dev/video/meteor/meteor.c             | 4 +---
 sys/dev/virtual/cdrom/vcd.c               | 5 +----
 sys/dev/virtual/disk/vdisk.c              | 5 +----
 sys/kern/kern_descrip.c                   | 3 +--
 sys/kern/kern_memio.c                     | 3 +--
 sys/kern/subr_bus.c                       | 5 +----
 sys/kern/subr_log.c                       | 3 +--
 sys/kern/tty_cons.c                       | 5 ++---
 sys/kern/tty_pty.c                        | 6 ++----
 sys/kern/tty_tty.c                        | 3 +--
 sys/net/bpf.c                             | 3 +--
 sys/net/i4b/driver/i4b_ctl.c              | 5 +----
 sys/net/i4b/driver/i4b_rbch.c             | 5 +----
 sys/net/i4b/driver/i4b_tel.c              | 5 +----
 sys/net/i4b/driver/i4b_trace.c            | 5 +----
 sys/net/i4b/layer4/i4b_i4bdrv.c           | 5 +----
 sys/net/tap/if_tap.c                      | 4 +---
 sys/net/tun/if_tun.c                      | 4 +---
 sys/netproto/smb/smb_dev.c                | 3 +--
 sys/netproto/smb/smb_dev.h                | 2 --
 sys/platform/pc32/acpica5/acpi_machdep.c  | 4 +---
 sys/platform/pc32/apm/apm.c               | 4 +---
 sys/platform/pc32/i386/elan-mmcr.c        | 3 +--
 sys/platform/pc32/i386/perfmon.c          | 4 +---
 sys/platform/pc32/isa/asc.c               | 5 +----
 sys/platform/pc64/acpica5/acpi_machdep.c  | 4 +---
 sys/platform/pc64/apm/apm.c               | 4 +---
 sys/platform/pc64/isa/asc.c               | 5 +----
 sys/platform/vkernel/platform/console.c   | 5 +----
 sys/platform/vkernel64/platform/console.c | 5 +----
 117 files changed, 108 insertions(+), 385 deletions(-)

diff --git a/sys/bus/cam/cam_xpt.c b/sys/bus/cam/cam_xpt.c
index badb9c5697..92b4e3799c 100644
--- a/sys/bus/cam/cam_xpt.c
+++ b/sys/bus/cam/cam_xpt.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.80.2.18 2002/12/09 17:31:55 gibbs Exp $
- * $DragonFly: src/sys/bus/cam/cam_xpt.c,v 1.68 2008/08/23 17:13:31 pavalos Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -683,14 +682,12 @@ static struct periph_driver probe_driver =
 PERIPHDRIVER_DECLARE(xpt, xpt_driver);
 PERIPHDRIVER_DECLARE(probe, probe_driver);
 
-#define XPT_CDEV_MAJOR 104
-
 static d_open_t xptopen;
 static d_close_t xptclose;
 static d_ioctl_t xptioctl;
 
 static struct dev_ops xpt_ops = {
-	{ "xpt", XPT_CDEV_MAJOR, 0 },
+	{ "xpt", 0, 0 },
 	.d_open = xptopen,
 	.d_close = xptclose,
 	.d_ioctl = xptioctl
diff --git a/sys/bus/cam/scsi/scsi_ch.c b/sys/bus/cam/scsi/scsi_ch.c
index a32745e691..1f7a725661 100644
--- a/sys/bus/cam/scsi/scsi_ch.c
+++ b/sys/bus/cam/scsi/scsi_ch.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.20.2.2 2000/10/31 08:09:49 dwmalone Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_ch.c,v 1.28 2008/07/18 00:07:23 dillon Exp $
  */
 /*
  * Derived from the NetBSD SCSI changer driver.
@@ -176,7 +175,6 @@ struct ch_softc {
 };
 
 #define CHUNIT(x)       (minor((x)))
-#define CH_CDEV_MAJOR	17
 
 static	d_open_t	chopen;
 static	d_close_t	chclose;
@@ -215,7 +213,7 @@ static struct periph_driver chdriver =
 PERIPHDRIVER_DECLARE(ch, chdriver);
 
 static struct dev_ops ch_ops = {
-	{ "ch", CH_CDEV_MAJOR, 0 },
+	{ "ch", 0, 0 },
 	.d_open = chopen,
 	.d_close = chclose,
 	.d_ioctl = chioctl
diff --git a/sys/bus/cam/scsi/scsi_pass.c b/sys/bus/cam/scsi/scsi_pass.c
index 23b9771832..eee5c7ea05 100644
--- a/sys/bus/cam/scsi/scsi_pass.c
+++ b/sys/bus/cam/scsi/scsi_pass.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.19 2000/01/17 06:27:37 mjacob Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_pass.c,v 1.27 2008/05/18 20:30:20 pavalos Exp $
  */
 
 #include <sys/param.h>
@@ -82,8 +81,6 @@ struct pass_softc {
 	struct devstat	device_stats;
 };
 
-#define PASS_CDEV_MAJOR 31
-
 static	d_open_t	passopen;
 static	d_close_t	passclose;
 static	d_ioctl_t	passioctl;
@@ -111,7 +108,7 @@ static struct periph_driver passdriver =
 PERIPHDRIVER_DECLARE(pass, passdriver);
 
 static struct dev_ops pass_ops = {
-	{ "pass", PASS_CDEV_MAJOR, 0 },
+	{ "pass", 0, 0 },
 	.d_open =	passopen,
 	.d_close =	passclose,
 	.d_read =	noread,
diff --git a/sys/bus/cam/scsi/scsi_pt.c b/sys/bus/cam/scsi/scsi_pt.c
index 4e98e253fb..4d2be67df2 100644
--- a/sys/bus/cam/scsi/scsi_pt.c
+++ b/sys/bus/cam/scsi/scsi_pt.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.17 2000/01/17 06:27:37 mjacob Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_pt.c,v 1.23 2008/05/18 20:30:20 pavalos Exp $
  */
 
 #include <sys/param.h>
@@ -119,10 +118,8 @@ static struct periph_driver ptdriver =
 
 PERIPHDRIVER_DECLARE(pt, ptdriver);
 
-#define PT_CDEV_MAJOR 61
-
 static struct dev_ops pt_ops = {
-	{ "pt", PT_CDEV_MAJOR, 0 },
+	{ "pt", 0, 0 },
 	.d_open =	ptopen,
 	.d_close =	ptclose,
 	.d_read =	physread,
diff --git a/sys/bus/cam/scsi/scsi_sa.c b/sys/bus/cam/scsi/scsi_sa.c
index 29cbbea127..18c1776a69 100644
--- a/sys/bus/cam/scsi/scsi_sa.c
+++ b/sys/bus/cam/scsi/scsi_sa.c
@@ -1,6 +1,5 @@
 /*
  * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.45.2.13 2002/12/17 17:08:50 trhodes Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_sa.c,v 1.36 2008/07/18 00:07:23 dillon Exp $
  *
  * Implementation of SCSI Sequential Access Peripheral driver for CAM.
  *
@@ -427,10 +426,8 @@ PERIPHDRIVER_DECLARE(sa, sadriver);
 #define D_TAPE 0
 #endif
 
-#define SA_CDEV_MAJOR 14
-
 static struct dev_ops sa_ops = {
-	{ "sa", SA_CDEV_MAJOR, D_TAPE },
+	{ "sa", 0, D_TAPE },
 	.d_open =	saopen,
 	.d_close =	saclose,
 	.d_read =	physread,
diff --git a/sys/bus/cam/scsi/scsi_ses.c b/sys/bus/cam/scsi/scsi_ses.c
index 8700a2715f..34edf17cca 100644
--- a/sys/bus/cam/scsi/scsi_ses.c
+++ b/sys/bus/cam/scsi/scsi_ses.c
@@ -1,5 +1,4 @@
 /* $FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.8.2.2 2000/08/08 23:19:21 mjacob Exp $ */
-/* $DragonFly: src/sys/bus/cam/scsi/scsi_ses.c,v 1.29 2008/05/18 20:30:20 pavalos Exp $ */
 /*
  * Copyright (c) 2000 Matthew Jacob
  * All rights reserved.
@@ -157,7 +156,6 @@ struct ses_softc {
 #define	SES_FLAG_INITIALIZED	0x04
 
 #define SESUNIT(x)       (minor((x)))
-#define SES_CDEV_MAJOR	110
 
 static	d_open_t	sesopen;
 static	d_close_t	sesclose;
@@ -180,7 +178,7 @@ static struct periph_driver sesdriver = {
 PERIPHDRIVER_DECLARE(ses, sesdriver);
 
 static struct dev_ops ses_ops = {
-	{ "ses", SES_CDEV_MAJOR, 0 }, 
+	{ "ses", 0, 0 },
 	.d_open =	sesopen,
 	.d_close =	sesclose,
 	.d_ioctl =	sesioctl,
diff --git a/sys/bus/cam/scsi/scsi_target.c b/sys/bus/cam/scsi/scsi_target.c
index eb8c2108df..bfba721912 100644
--- a/sys/bus/cam/scsi/scsi_target.c
+++ b/sys/bus/cam/scsi/scsi_target.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.22.2.7 2003/02/18 22:07:10 njl Exp $
- * $DragonFly: src/sys/bus/cam/scsi/scsi_target.c,v 1.20 2008/07/18 00:07:23 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -109,9 +108,8 @@ static struct filterops targread_filtops =
 static struct filterops targwrite_filtops =
 	{ FILTEROP_ISFD, NULL, targfiltdetach, targwritefilt };
 
-#define TARG_CDEV_MAJOR 65
 static struct dev_ops targ_ops = {
-	{ "targ", TARG_CDEV_MAJOR, 0 },
+	{ "targ", 0, 0 },
 	.d_open = targopen,
 	.d_close = targclose,
 	.d_read = targread,
diff --git a/sys/bus/firewire/fwdev.c b/sys/bus/firewire/fwdev.c
index 9363c1a9b8..c607044e7d 100644
--- a/sys/bus/firewire/fwdev.c
+++ b/sys/bus/firewire/fwdev.c
@@ -32,7 +32,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.36 2004/01/22 14:41:17 simokawa Exp $
- * $DragonFly: src/sys/bus/firewire/fwdev.c,v 1.20 2008/01/06 16:55:49 swildner Exp $
  *
  */
 
@@ -70,7 +69,6 @@
 #include <dev/firewire/iec68113.h>
 #endif
 
-#define CDEV_MAJOR 127
 #define	FWNODE_INVAL 0xffff
 
 static	d_open_t	fw_open;
@@ -88,7 +86,7 @@ static int fwfilt_write(struct knote *, long);
 
 struct dev_ops firewire_ops = 
 {
-	{ "fw", CDEV_MAJOR, D_MEM },
+	{ "fw", 0, D_MEM },
 	.d_open =	fw_open,
 	.d_close =	fw_close,
 	.d_read =	fw_read,
diff --git a/sys/bus/smbus/smb.c b/sys/bus/smbus/smb.c
index 97e0edc874..d416b7a760 100644
--- a/sys/bus/smbus/smb.c
+++ b/sys/bus/smbus/smb.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/smbus/smb.c,v 1.34.8.2 2006/09/22 19:19:16 jhb Exp $
- * $DragonFly: src/sys/bus/smbus/smb.c,v 1.9 2006/09/10 01:26:33 dillon Exp $
  *
  */
 
@@ -88,9 +87,8 @@ static	d_open_t	smbopen;
 static	d_close_t	smbclose;
 static	d_ioctl_t	smbioctl;
 
-#define CDEV_MAJOR 106
 static struct dev_ops smb_ops = {
-	{ "smb", CDEV_MAJOR, 0 },
+	{ "smb", 0, 0 },
 	.d_open =	smbopen,
 	.d_close =	smbclose,
 	.d_ioctl =	smbioctl,
diff --git a/sys/bus/usb/usb.c b/sys/bus/usb/usb.c
index 2f6db14c6a..b2937ab119 100644
--- a/sys/bus/usb/usb.c
+++ b/sys/bus/usb/usb.c
@@ -1,7 +1,6 @@
 /*
  * $NetBSD: usb.c,v 1.68 2002/02/20 20:30:12 christos Exp $
  * $FreeBSD: src/sys/dev/usb/usb.c,v 1.106 2005/03/27 15:31:23 iedowse Exp $
- * $DragonFly: src/sys/bus/usb/usb.c,v 1.50 2008/09/26 08:21:22 hasso Exp $
  */
 
 /* Also already merged from NetBSD:
@@ -154,7 +153,7 @@ static void usbfilt_detach(struct knote *);
 static int usbfilt(struct knote *, long);
 
 static struct dev_ops usb_ops = {
-	{ "usb", USB_CDEV_MAJOR, 0 },
+	{ "usb", 0, 0 },
 	.d_open =	usbopen,
 	.d_close =	usbclose,
 	.d_read =	usbread,
diff --git a/sys/bus/usb/usbdi.h b/sys/bus/usb/usbdi.h
index d348a055e8..5d8a8ce95e 100644
--- a/sys/bus/usb/usbdi.h
+++ b/sys/bus/usb/usbdi.h
@@ -1,6 +1,5 @@
 /*	$NetBSD: usbdi.h,v 1.64 2004/10/23 13:26:34 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdi.h,v 1.59 2005/05/16 06:58:43 imp Exp $	*/
-/*	$DragonFly: src/sys/bus/usb/usbdi.h,v 1.10 2007/11/05 13:32:27 hasso Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -93,8 +92,6 @@ typedef void (*usbd_callback)(usbd_xfer_handle, usbd_private_handle,
 #define USBD_NO_TIMEOUT 0
 #define USBD_DEFAULT_TIMEOUT 5000 /* ms = 5 s */
 
-#define USB_CDEV_MAJOR 108
-
 usbd_status usbd_open_pipe(usbd_interface_handle, u_int8_t,
 			   u_int8_t, usbd_pipe_handle *);
 usbd_status usbd_close_pipe(usbd_pipe_handle);
diff --git a/sys/dev/acpica5/acpi.c b/sys/dev/acpica5/acpi.c
index b39c2b1ca0..8317871206 100644
--- a/sys/dev/acpica5/acpi.c
+++ b/sys/dev/acpica5/acpi.c
@@ -80,9 +80,8 @@ static d_open_t		acpiopen;
 static d_close_t	acpiclose;
 static d_ioctl_t	acpiioctl;
 
-#define CDEV_MAJOR 152
 static struct dev_ops acpi_ops = {
-        { "acpi", CDEV_MAJOR, 0 },
+        { "acpi", 0, 0 },
         .d_open = acpiopen,
         .d_close = acpiclose,
         .d_ioctl = acpiioctl
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c
index 1f284c70e2..c2c453f92f 100644
--- a/sys/dev/agp/agp.c
+++ b/sys/dev/agp/agp.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/agp/agp.c,v 1.58 2007/11/12 21:51:36 jhb Exp $
- *	$DragonFly: src/sys/dev/agp/agp.c,v 1.30 2008/01/07 01:34:58 corecode Exp $
  */
 
 #include "opt_bus.h"
@@ -59,15 +58,13 @@ MODULE_VERSION(agp, 1);
 
 MALLOC_DEFINE(M_AGP, "agp", "AGP data structures");
 
-#define CDEV_MAJOR	148
-				/* agp_drv.c */
 static d_open_t agp_open;
 static d_close_t agp_close;
 static d_ioctl_t agp_ioctl;
 static d_mmap_t agp_mmap;
 
 static struct dev_ops agp_ops = {
-	{ "agp", CDEV_MAJOR, D_TTY },
+	{ "agp", 0, D_TTY },
 	.d_open =	agp_open,
 	.d_close =	agp_close,
 	.d_ioctl =	agp_ioctl,
diff --git a/sys/dev/disk/ahci/ahci_dragonfly.h b/sys/dev/disk/ahci/ahci_dragonfly.h
index 8545d56edd..56e9bb12ee 100644
--- a/sys/dev/disk/ahci/ahci_dragonfly.h
+++ b/sys/dev/disk/ahci/ahci_dragonfly.h
@@ -70,6 +70,4 @@
 #include <sys/thread2.h>
 #include <sys/mplock2.h>
 
-#define AHCI_CDEV_MAJOR		188
-
 #define AHCI_IRQ_RID		0
diff --git a/sys/dev/disk/ccd/ccd.c b/sys/dev/disk/ccd/ccd.c
index fc6b6f412f..aafa6735ca 100644
--- a/sys/dev/disk/ccd/ccd.c
+++ b/sys/dev/disk/ccd/ccd.c
@@ -31,7 +31,6 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $DragonFly: src/sys/dev/disk/ccd/ccd.c,v 1.50 2007/11/06 03:50:02 dillon Exp $
  */
 /*
  * Copyright (c) 1995 Jason R. Thorpe.
@@ -108,7 +107,6 @@
  * @(#)cd.c	8.2 (Berkeley) 11/16/93
  * $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.73.2.1 2001/09/11 09:49:52 kris Exp $
  * $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $
- * $DragonFly: src/sys/dev/disk/ccd/ccd.c,v 1.50 2007/11/06 03:50:02 dillon Exp $
  */
 
 /*
@@ -207,10 +205,8 @@ static d_dump_t ccddump;
 
 #define NCCDFREEHIWAT	16
 
-#define CDEV_MAJOR 74
-
 static struct dev_ops ccd_ops = {
-	{ "ccd", CDEV_MAJOR, D_DISK },
+	{ "ccd", 0, D_DISK },
 	.d_open =	ccdopen,
 	.d_close =	ccdclose,
 	.d_read =	physread,
diff --git a/sys/dev/disk/iscsi/initiator/iscsi.c b/sys/dev/disk/iscsi/initiator/iscsi.c
index 7dfe3c9f86..3ea7aa8be7 100644
--- a/sys/dev/disk/iscsi/initiator/iscsi.c
+++ b/sys/dev/disk/iscsi/initiator/iscsi.c
@@ -107,7 +107,7 @@ static d_read_t iscsi_read;
 #endif
 
 static struct dev_ops iscsi_ops = {
-     .head	= { "iscsi", ISCSI_CDEV_MAJOR, D_DISK},
+     .head	= { "iscsi", 0, D_DISK},
      .d_open	= iscsi_open,
      .d_close	= iscsi_close,
      .d_ioctl	= iscsi_ioctl,
diff --git a/sys/dev/disk/iscsi/initiator/iscsi.h b/sys/dev/disk/iscsi/initiator/iscsi.h
index ee9e4fc44c..c964413ec7 100644
--- a/sys/dev/disk/iscsi/initiator/iscsi.h
+++ b/sys/dev/disk/iscsi/initiator/iscsi.h
@@ -41,8 +41,6 @@ typedef int boolean_t;
 
 #define ISCSIDEV	"iscsi"
 
-#define ISCSI_CDEV_MAJOR	115
-
 #define ISCSI_MAX_TARGETS	4 //64
 
 #define ISCSI_MAX_LUNS		4
diff --git a/sys/dev/disk/isp/isp_freebsd.c b/sys/dev/disk/isp/isp_freebsd.c
index bfdb45a216..513ae37202 100644
--- a/sys/dev/disk/isp/isp_freebsd.c
+++ b/sys/dev/disk/isp/isp_freebsd.c
@@ -1,5 +1,4 @@
 /* $FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.32.2.20 2002/10/11 18:49:25 mjacob Exp $ */
-/* $DragonFly: src/sys/dev/disk/isp/isp_freebsd.c,v 1.21 2008/05/18 20:30:22 pavalos Exp $ */
 /*
  * Platform (FreeBSD) dependent common attachment code for Qlogic adapters.
  *
@@ -43,10 +42,8 @@ static timeout_t isp_watchdog;
 static void isp_kthread(void *);
 static void isp_action(struct cam_sim *, union ccb *);
 
-
-#define ISP_CDEV_MAJOR	248
 static struct dev_ops isp_ops = {
-	{ "isp", ISP_CDEV_MAJOR, D_TAPE },
+	{ "isp", 0, D_TAPE },
 	.d_open =	nullopen,
 	.d_close =	nullclose,
 	.d_ioctl =	ispioctl,
diff --git a/sys/dev/disk/md/md.c b/sys/dev/disk/md/md.c
index 4c06382b13..762598aa45 100644
--- a/sys/dev/disk/md/md.c
+++ b/sys/dev/disk/md/md.c
@@ -7,7 +7,6 @@
  * ----------------------------------------------------------------------------
  *
  * $FreeBSD: src/sys/dev/md/md.c,v 1.8.2.2 2002/08/19 17:43:34 jdp Exp $
- * $DragonFly: src/sys/dev/disk/md/md.c,v 1.20 2008/09/07 08:09:39 swildner Exp $
  *
  */
 
@@ -47,8 +46,6 @@ static u_char end_mfs_root[] __unused = "MFS Filesystem had better STOP here";
 
 static int mdrootready;
 
-#define CDEV_MAJOR	95
-
 static d_strategy_t mdstrategy;
 static d_strategy_t mdstrategy_preload;
 static d_strategy_t mdstrategy_malloc;
@@ -57,7 +54,7 @@ static d_close_t mdclose;
 static d_ioctl_t mdioctl;
 
 static struct dev_ops md_ops = {
-	{ "md", CDEV_MAJOR, D_DISK | D_CANFREE | D_MEMDISK | D_TRACKCLOSE},
+	{ "md", 0, D_DISK | D_CANFREE | D_MEMDISK | D_TRACKCLOSE},
         .d_open =	mdopen,
         .d_close =	mdclose,
         .d_read =	physread,
diff --git a/sys/dev/disk/sili/sili_dragonfly.h b/sys/dev/disk/sili/sili_dragonfly.h
index 30a68800a3..9a4f2c981f 100644
--- a/sys/dev/disk/sili/sili_dragonfly.h
+++ b/sys/dev/disk/sili/sili_dragonfly.h
@@ -70,6 +70,4 @@
 #include <sys/thread2.h>
 #include <sys/mplock2.h>
 
-#define SILI_CDEV_MAJOR		188
-
 #define SILI_IRQ_RID		0
diff --git a/sys/dev/disk/vn/vn.c b/sys/dev/disk/vn/vn.c
index 4cf0a19fc5..e4ab6cf441 100644
--- a/sys/dev/disk/vn/vn.c
+++ b/sys/dev/disk/vn/vn.c
@@ -39,7 +39,6 @@
  *
  *	from: @(#)vn.c	8.6 (Berkeley) 4/1/94
  * $FreeBSD: src/sys/dev/vn/vn.c,v 1.105.2.4 2001/11/18 07:11:00 dillon Exp $
- * $DragonFly: src/sys/dev/disk/vn/vn.c,v 1.38 2008/07/01 02:02:53 dillon Exp $
  */
 
 /*
@@ -101,8 +100,6 @@ DEVFS_DECLARE_CLONE_BITMAP(vn);
 #define VN_PREALLOCATED_UNITS	NVN
 #endif
 
-#define CDEV_MAJOR 43
-
 #define VN_BSIZE_BEST	8192
 
 /*
@@ -112,7 +109,7 @@ DEVFS_DECLARE_CLONE_BITMAP(vn);
  */
 
 static struct dev_ops vn_ops = {
-	{ "vn", CDEV_MAJOR, D_DISK | D_CANFREE },
+	{ "vn", 0, D_DISK | D_CANFREE },
 	.d_open =	vnopen,
 	.d_close =	vnclose,
 	.d_read =	physread,
diff --git a/sys/dev/disk/wt/wt.c b/sys/dev/disk/wt/wt.c
index b989599e21..230610f944 100644
--- a/sys/dev/disk/wt/wt.c
+++ b/sys/dev/disk/wt/wt.c
@@ -21,7 +21,6 @@
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
  * $FreeBSD: src/sys/i386/isa/wt.c,v 1.57.2.1 2000/08/08 19:49:53 peter Exp $
- * $DragonFly: src/sys/dev/disk/wt/wt.c,v 1.21 2008/08/02 01:14:42 dillon Exp $
  *
  */
 
@@ -183,10 +182,8 @@ static	d_close_t	wtclose;
 static	d_ioctl_t	wtioctl;
 static	d_strategy_t	wtstrategy;
 
-#define CDEV_MAJOR 10
-
 static struct dev_ops wt_ops = {
-	{ "wt", CDEV_MAJOR, 0 },
+	{ "wt", 0, 0 },
 	.d_open =	wtopen,
 	.d_close =	wtclose,
 	.d_read =	physread,
diff --git a/sys/dev/drm/drm.h b/sys/dev/drm/drm.h
index d4e8c9041e..942a9aed02 100644
--- a/sys/dev/drm/drm.h
+++ b/sys/dev/drm/drm.h
@@ -95,7 +95,6 @@
 #if defined(__linux__) || defined(__NetBSD__)
 #define DRM_MAJOR       226
 #endif
-#define DRM_MAX_MINOR   15
 
 #define DRM_NAME	"drm"	  /**< Name in kernel, /dev, and /proc */
 #define DRM_MIN_ORDER	5	  /**< At least 2^5 bytes = 32 bytes */
diff --git a/sys/dev/misc/cmx/cmx.c b/sys/dev/misc/cmx/cmx.c
index 0d5c9fd037..9174fae457 100644
--- a/sys/dev/misc/cmx/cmx.c
+++ b/sys/dev/misc/cmx/cmx.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/cmx/cmx.c,v 1.1 2008/03/06 08:09:45 rink Exp $
- * $DragonFly: src/sys/dev/misc/cmx/cmx.c,v 1.2 2008/08/08 18:33:11 hasso Exp $
  */
 
 /*
@@ -138,9 +137,8 @@ static void cmx_filter_detach(struct knote *);
 static int cmx_filter_read(struct knote *, long);
 static int cmx_filter_write(struct knote *, long);
 
-#define CDEV_MAJOR	185
 static struct dev_ops cmx_ops = {
-	{ "cmx", CDEV_MAJOR, 0 },
+	{ "cmx", 0, 0 },
 	.d_open =	cmx_open,
 	.d_close =	cmx_close,
 	.d_read =	cmx_read,
diff --git a/sys/dev/misc/dcons/dcons_os.c b/sys/dev/misc/dcons/dcons_os.c
index 55304c9ddd..261a39f7b2 100644
--- a/sys/dev/misc/dcons/dcons_os.c
+++ b/sys/dev/misc/dcons/dcons_os.c
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  * 
  * $FreeBSD: src/sys/dev/dcons/dcons_os.c,v 1.4 2004/10/24 12:41:04 simokawa Exp $
- * $DragonFly: src/sys/dev/misc/dcons/dcons_os.c,v 1.13 2007/08/07 13:14:11 hasso Exp $
  */
 
 #include <sys/param.h>
@@ -89,14 +88,12 @@
 #define DCONS_FORCE_GDB	1
 #endif
 
-#define CDEV_MAJOR      184
-
 static d_open_t		dcons_open;
 static d_close_t	dcons_close;
 static d_ioctl_t	dcons_ioctl;
 
 static struct dev_ops dcons_ops = {
-	{ "dcons", CDEV_MAJOR, D_TTY },
+	{ "dcons", 0, D_TTY },
 	.d_open =	dcons_open,
 	.d_close =	dcons_close,
 	.d_read =	ttyread,
diff --git a/sys/dev/misc/gpib/gpib.c b/sys/dev/misc/gpib/gpib.c
index b3149f7dba..a90aebbcb8 100644
--- a/sys/dev/misc/gpib/gpib.c
+++ b/sys/dev/misc/gpib/gpib.c
@@ -17,7 +17,6 @@
  * all derivative works or modified versions.
  *
  * $FreeBSD: src/sys/i386/isa/gpib.c,v 1.29 2000/01/29 16:17:32 peter Exp $
- * $DragonFly: src/sys/dev/misc/gpib/gpib.c,v 1.16 2008/08/02 01:14:42 dillon Exp $
  *
  */
 /*Please read the README file for usage information*/
@@ -64,9 +63,8 @@ static	d_close_t	gpclose;
 static	d_write_t	gpwrite;
 static	d_ioctl_t	gpioctl;
 
-#define CDEV_MAJOR 44
 static struct dev_ops gp_ops = {
-	{ "gp", CDEV_MAJOR, 0 },
+	{ "gp", 0, 0 },
 	.d_open =	gpopen,
 	.d_close =	gpclose,
 	.d_write =	gpwrite,
diff --git a/sys/dev/misc/hotplug/hotplug.c b/sys/dev/misc/hotplug/hotplug.c
index fae5d79d2c..a1f9e3793c 100644
--- a/sys/dev/misc/hotplug/hotplug.c
+++ b/sys/dev/misc/hotplug/hotplug.c
@@ -35,8 +35,6 @@
 
 #define HOTPLUG_MAXEVENTS	16
 
-#define CDEV_MAJOR		82
-
 static d_open_t		hotplugopen;
 static d_close_t	hotplugclose;
 static d_read_t		hotplugread;
@@ -46,7 +44,7 @@ static void hotplugfiltdetach(struct knote *);
 static int hotplugfilt(struct knote *, long);
 
 static struct dev_ops hotplug_ops = {
-	{ "hotplug", CDEV_MAJOR, 0 },
+	{ "hotplug", 0, 0 },
 	.d_open =	hotplugopen,
 	.d_close =	hotplugclose,
 	.d_read =	hotplugread,
diff --git a/sys/dev/misc/joy/joy.c b/sys/dev/misc/joy/joy.c
index 583aa323ab..164fd6d9e9 100644
--- a/sys/dev/misc/joy/joy.c
+++ b/sys/dev/misc/joy/joy.c
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/isa/joy.c,v 1.38.2.1 2001/09/01 05:55:31 murray Exp $
- * $DragonFly: src/sys/dev/misc/joy/joy.c,v 1.12 2007/10/23 03:04:49 y0netan1 Exp $
  */
 
 #include <sys/param.h>
@@ -74,14 +73,13 @@ struct joy_softc {
 static int joy_probe (device_t);
 static int joy_attach (device_t);
 
-#define CDEV_MAJOR 51
 static	d_open_t	joyopen;
 static	d_close_t	joyclose;
 static	d_read_t	joyread;
 static	d_ioctl_t	joyioctl;
 
 static struct dev_ops joy_ops = {
-	{ "joy", CDEV_MAJOR, 0 },
+	{ "joy", 0, 0 },
 	.d_open =	joyopen,
 	.d_close =	joyclose,
 	.d_read =	joyread,
diff --git a/sys/dev/misc/kbd/kbd.c b/sys/dev/misc/kbd/kbd.c
index f9001197ee..bf0c6582cb 100644
--- a/sys/dev/misc/kbd/kbd.c
+++ b/sys/dev/misc/kbd/kbd.c
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/kbd/kbd.c,v 1.17.2.2 2001/07/30 16:46:43 yokota Exp $
- * $DragonFly: src/sys/dev/misc/kbd/kbd.c,v 1.23 2007/05/08 02:31:39 dillon Exp $
  */
 /*
  * Generic keyboard driver.
@@ -581,10 +580,8 @@ static d_kqfilter_t	genkbdkqfilter;
 static void genkbdfiltdetach(struct knote *);
 static int genkbdfilter(struct knote *, long);
 
-#define CDEV_MAJOR	112
-
 static struct dev_ops kbd_ops = {
-	{ "kbd", CDEV_MAJOR, 0 },
+	{ "kbd", 0, 0 },
 	.d_open =	genkbdopen,
 	.d_close =	genkbdclose,
 	.d_read =	genkbdread,
diff --git a/sys/dev/misc/labpc/labpc.c b/sys/dev/misc/labpc/labpc.c
index b27247f462..f52849eb17 100644
--- a/sys/dev/misc/labpc/labpc.c
+++ b/sys/dev/misc/labpc/labpc.c
@@ -39,7 +39,6 @@
  * dufault@hda.com
  *
  * $FreeBSD: src/sys/i386/isa/labpc.c,v 1.35 1999/09/25 18:24:08 phk Exp $
- * $DragonFly: src/sys/dev/misc/labpc/labpc.c,v 1.23 2008/08/02 01:14:42 dillon Exp $
  *
  */
 
@@ -289,9 +288,8 @@ static	d_close_t	labpcclose;
 static	d_ioctl_t	labpcioctl;
 static	d_strategy_t	labpcstrategy;
 
-#define CDEV_MAJOR 66
 static struct dev_ops labpc_ops = {
-	{ "labpc", CDEV_MAJOR, 0 },
+	{ "labpc", 0, 0 },
 	.d_open =	labpcopen,
 	.d_close =	labpcclose,
 	.d_read =	physread,
diff --git a/sys/dev/misc/lpt/lpt.c b/sys/dev/misc/lpt/lpt.c
index 7bc72dc036..8ce0ef27a3 100644
--- a/sys/dev/misc/lpt/lpt.c
+++ b/sys/dev/misc/lpt/lpt.c
@@ -49,7 +49,6 @@
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
  *	From Id: nlpt.c,v 1.14 1999/02/08 13:55:43 des Exp
  * $FreeBSD: src/sys/dev/ppbus/lpt.c,v 1.15.2.3 2000/07/07 00:30:40 obrien Exp $
- * $DragonFly: src/sys/dev/misc/lpt/lpt.c,v 1.19 2006/12/22 23:26:17 swildner Exp $
  */
 
 /*
@@ -190,9 +189,8 @@ static	d_write_t	lptwrite;
 static	d_read_t	lptread;
 static	d_ioctl_t	lptioctl;
 
-#define CDEV_MAJOR 16
 static struct dev_ops lpt_ops = {
-	{ LPT_NAME, CDEV_MAJOR, 0 },
+	{ LPT_NAME, 0, 0 },
 	.d_open =	lptopen,
 	.d_close =	lptclose,
 	.d_read =	lptread,
diff --git a/sys/dev/misc/mse/mse.c b/sys/dev/misc/mse/mse.c
index 310a909ed5..04ea32a07d 100644
--- a/sys/dev/misc/mse/mse.c
+++ b/sys/dev/misc/mse/mse.c
@@ -12,7 +12,6 @@
  * without express or implied warranty.
  *
  * $FreeBSD: src/sys/i386/isa/mse.c,v 1.49.2.1 2000/03/20 13:58:47 yokota Exp $
- * $DragonFly: src/sys/dev/misc/mse/mse.c,v 1.20 2006/12/22 23:26:17 swildner Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -138,9 +137,8 @@ static	d_kqfilter_t	msekqfilter;
 static void msefilter_detach(struct knote *);
 static int msefilter(struct knote *, long);
 
-#define CDEV_MAJOR 27
 static struct dev_ops mse_ops = {
-	{ "mse", CDEV_MAJOR, 0 },
+	{ "mse", 0, 0 },
 	.d_open =	mseopen,
 	.d_close =	mseclose,
 	.d_read =	mseread,
diff --git a/sys/dev/misc/nmdm/nmdm.c b/sys/dev/misc/nmdm/nmdm.c
index 42ba14d7a8..7810232d4f 100644
--- a/sys/dev/misc/nmdm/nmdm.c
+++ b/sys/dev/misc/nmdm/nmdm.c
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.5.2.1 2001/08/11 00:54:14 mp Exp $
- * $DragonFly: src/sys/dev/misc/nmdm/nmdm.c,v 1.16 2008/01/05 14:02:37 swildner Exp $
  */
 
 /*
@@ -76,7 +75,7 @@ static	d_ioctl_t	nmdmioctl;
 
 #define	CDEV_MAJOR	18
 static struct dev_ops nmdm_ops = {
-	{ "pts", CDEV_MAJOR, D_TTY },
+	{ "pts", 0, D_TTY },
 	.d_open =	nmdmopen,
 	.d_close =	nmdmclose,
 	.d_read =	nmdmread,
diff --git a/sys/dev/misc/pcfclock/pcfclock.c b/sys/dev/misc/pcfclock/pcfclock.c
index 190658aab6..de2ba129cf 100644
--- a/sys/dev/misc/pcfclock/pcfclock.c
+++ b/sys/dev/misc/pcfclock/pcfclock.c
@@ -22,7 +22,6 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ppbus/pcfclock.c,v 1.3.2.1 2000/05/24 00:20:57 n_hibma Exp $
- * $DragonFly: src/sys/dev/misc/pcfclock/pcfclock.c,v 1.12 2006/12/22 23:26:18 swildner Exp $
  *
  */
 
@@ -67,9 +66,8 @@ static	d_open_t		pcfclock_open;
 static	d_close_t		pcfclock_close;
 static	d_read_t		pcfclock_read;
 
-#define CDEV_MAJOR 140
 static struct dev_ops pcfclock_ops = {
-	{ PCFCLOCK_NAME, CDEV_MAJOR, 0 },
+	{ PCFCLOCK_NAME, 0, 0 },
 	.d_open =	pcfclock_open,
 	.d_close =	pcfclock_close,
 	.d_read =	pcfclock_read,
diff --git a/sys/dev/misc/ppi/ppi.c b/sys/dev/misc/ppi/ppi.c
index dcb40a5c67..6b193ed548 100644
--- a/sys/dev/misc/ppi/ppi.c
+++ b/sys/dev/misc/ppi/ppi.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ppbus/ppi.c,v 1.21.2.3 2000/08/07 18:24:43 peter Exp $
- * $DragonFly: src/sys/dev/misc/ppi/ppi.c,v 1.15 2006/12/22 23:26:18 swildner Exp $
  *
  */
 #include "opt_ppb_1284.h"
@@ -89,9 +88,8 @@ static	d_ioctl_t	ppiioctl;
 static	d_write_t	ppiwrite;
 static	d_read_t	ppiread;
 
-#define CDEV_MAJOR 82
 static struct dev_ops ppi_ops = {
-	{ "ppi", CDEV_MAJOR, 0 },
+	{ "ppi", 0, 0 },
 	.d_open =	ppiopen,
 	.d_close =	ppiclose,
 	.d_read =	ppiread,
diff --git a/sys/dev/misc/pps/pps.c b/sys/dev/misc/pps/pps.c
index 190e60daa2..30ec690882 100644
--- a/sys/dev/misc/pps/pps.c
+++ b/sys/dev/misc/pps/pps.c
@@ -7,7 +7,6 @@
  * ----------------------------------------------------------------------------
  *
  * $FreeBSD: src/sys/dev/ppbus/pps.c,v 1.24.2.1 2000/05/24 00:20:57 n_hibma Exp $
- * $DragonFly: src/sys/dev/misc/pps/pps.c,v 1.17 2006/10/25 20:55:55 dillon Exp $
  *
  * This driver implements a draft-mogul-pps-api-02.txt PPS source.
  *
@@ -59,9 +58,8 @@ static	d_open_t	ppsopen;
 static	d_close_t	ppsclose;
 static	d_ioctl_t	ppsioctl;
 
-#define CDEV_MAJOR 89
 static struct dev_ops pps_ops = {
-	{ PPS_NAME, CDEV_MAJOR, 0 },
+	{ PPS_NAME, 0, 0 },
 	.d_open =	ppsopen,
 	.d_close =	ppsclose,
 	.d_ioctl =	ppsioctl,
diff --git a/sys/dev/misc/psm/psm.c b/sys/dev/misc/psm/psm.c
index d7a85355e6..846560733d 100644
--- a/sys/dev/misc/psm/psm.c
+++ b/sys/dev/misc/psm/psm.c
@@ -488,10 +488,8 @@ static driver_t psm_driver = {
 	sizeof(struct psm_softc),
 };
 
-#define CDEV_MAJOR        21
-
 static struct dev_ops psm_ops = {
-	{ PSM_DRIVER_NAME, CDEV_MAJOR, 0 },
+	{ PSM_DRIVER_NAME, 0, 0 },
 	.d_open =   psmopen,
 	.d_close =  psmclose,
 	.d_read =   psmread,
diff --git a/sys/dev/misc/snp/snp.c b/sys/dev/misc/snp/snp.c
index 28e53c9496..ca078537c8 100644
--- a/sys/dev/misc/snp/snp.c
+++ b/sys/dev/misc/snp/snp.c
@@ -15,7 +15,6 @@
  * Snoop stuff.
  *
  * $FreeBSD: src/sys/dev/snp/snp.c,v 1.69.2.2 2002/05/06 07:30:02 dd Exp $
- * $DragonFly: src/sys/dev/misc/snp/snp.c,v 1.19 2007/05/08 02:31:41 dillon Exp $
  */
 
 #include "use_snp.h"
@@ -55,9 +54,8 @@ static int snpfilter_wr(struct knote *, long);
 #define SNP_PREALLOCATED_UNITS	NSNP
 #endif
 
-#define CDEV_MAJOR 53
 static struct dev_ops snp_ops = {
-	{ "snp", CDEV_MAJOR, 0 },
+	{ "snp", 0, 0 },
 	.d_open =	snpopen,
 	.d_close =	snpclose,
 	.d_read =	snpread,
@@ -739,4 +737,4 @@ static moduledata_t snp_mod = {
         snp_modevent,
         NULL
 };
-DECLARE_MODULE(snp, snp_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR);
+DECLARE_MODULE(snp, snp_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE);
diff --git a/sys/dev/misc/spic/spic.c b/sys/dev/misc/spic/spic.c
index dba3b9c870..fff999a156 100644
--- a/sys/dev/misc/spic/spic.c
+++ b/sys/dev/misc/spic/spic.c
@@ -48,7 +48,6 @@
  * also provided sample code upon which this driver was based.
  *
  * $FreeBSD: src/sys/i386/isa/spic.c,v 1.4.2.1 2002/04/15 00:52:12 will Exp $
- * $DragonFly: src/sys/dev/misc/spic/spic.c,v 1.17 2008/08/02 01:14:42 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -91,7 +90,7 @@ static void spicfilt_detach(struct knote *);
 static int spicfilt(struct knote *, long);
 
 static struct dev_ops spic_ops = {
-	{ "spic", CDEV_MAJOR, 0 },
+	{ "spic", 0, 0 },
         .d_open =	spicopen,
         .d_close =	spicclose,
         .d_read =	spicread,
diff --git a/sys/dev/misc/spic/spicreg.h b/sys/dev/misc/spic/spicreg.h
index 6832ba5ac8..8a73ee3733 100644
--- a/sys/dev/misc/spic/spicreg.h
+++ b/sys/dev/misc/spic/spicreg.h
@@ -24,12 +24,9 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/spicreg.h,v 1.2.2.1 2002/04/15 00:52:12 will Exp $
- * $DragonFly: src/sys/dev/misc/spic/spicreg.h,v 1.2 2003/06/17 04:28:37 dillon Exp $
  *
  */
 
-#define CDEV_MAJOR	160
-
 /*
  * Find the PCI device that holds the G10 register needed to map in the SPIC
  */
diff --git a/sys/dev/misc/spigot/spigot.c b/sys/dev/misc/spigot/spigot.c
index 6fd953afbb..59423fcde6 100644
--- a/sys/dev/misc/spigot/spigot.c
+++ b/sys/dev/misc/spigot/spigot.c
@@ -43,7 +43,6 @@
  * Version 1.7, December 1995.
  *
  * $FreeBSD: src/sys/i386/isa/spigot.c,v 1.44 2000/01/29 16:17:36 peter Exp $
- * $DragonFly: src/sys/dev/misc/spigot/spigot.c,v 1.16 2008/08/02 01:14:42 dillon Exp $
  *
  */
 
@@ -97,9 +96,8 @@ static	d_write_t	spigot_write;
 static	d_ioctl_t	spigot_ioctl;
 static	d_mmap_t	spigot_mmap;
 
-#define CDEV_MAJOR 11
 static struct dev_ops spigot_ops = {
-	{ "spigot", CDEV_MAJOR, 0 },
+	{ "spigot", 0, 0 },
 	.d_open =	spigot_open,
 	.d_close =	spigot_close,
 	.d_read =	spigot_read,
diff --git a/sys/dev/misc/syscons/syscons.c b/sys/dev/misc/syscons/syscons.c
index 20a779fd60..717552ebb0 100644
--- a/sys/dev/misc/syscons/syscons.c
+++ b/sys/dev/misc/syscons/syscons.c
@@ -29,7 +29,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/dev/syscons/syscons.c,v 1.336.2.17 2004/03/25 08:41:09 ru Exp $
- * $DragonFly: src/sys/dev/misc/syscons/syscons.c,v 1.35 2008/08/10 19:47:31 swildner Exp $
  */
 
 #include "use_splash.h"
@@ -217,8 +216,6 @@ syscons_unlock(void)
 /*
  * Console driver
  */
-#define	CDEV_MAJOR	12
-
 static cn_probe_t	sccnprobe;
 static cn_init_t	sccninit;
 static cn_init_t	sccninit_fini;
@@ -238,7 +235,7 @@ static	d_ioctl_t	scioctl;
 static	d_mmap_t	scmmap;
 
 static struct dev_ops sc_ops = {
-	{ "sc", CDEV_MAJOR, D_TTY },
+	{ "sc", 0, D_TTY },
 	.d_open =	scopen,
 	.d_close =	scclose,
 	.d_read =	scread,
diff --git a/sys/dev/misc/syscons/sysmouse.c b/sys/dev/misc/syscons/sysmouse.c
index b8e6825e42..5a30aba031 100644
--- a/sys/dev/misc/syscons/sysmouse.c
+++ b/sys/dev/misc/syscons/sysmouse.c
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/syscons/sysmouse.c,v 1.2.2.2 2001/07/16 05:21:24 yokota Exp $
- * $DragonFly: src/sys/dev/misc/syscons/sysmouse.c,v 1.12 2006/09/10 01:26:35 dillon Exp $
  */
 
 /* MPSAFE NOTE: This file uses the tty_token mostly for the linesw access and
@@ -59,7 +58,7 @@ static d_close_t	smclose;
 static d_ioctl_t	smioctl;
 
 static struct dev_ops sm_ops = {
-	{ "sysmouse", CDEV_MAJOR, D_TTY },
+	{ "sysmouse", 0, D_TTY },
 	.d_open =	smopen,
 	.d_close =	smclose,
 	.d_read =	ttyread,
diff --git a/sys/dev/misc/tw/tw.c b/sys/dev/misc/tw/tw.c
index ac2e31c049..ff5dec744d 100644
--- a/sys/dev/misc/tw/tw.c
+++ b/sys/dev/misc/tw/tw.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/tw.c,v 1.38 2000/01/29 16:00:32 peter Exp $
- * $DragonFly: src/sys/dev/misc/tw/tw.c,v 1.19 2008/08/02 01:14:42 dillon Exp $
  *
  */
 
@@ -219,9 +218,8 @@ static void twfilter_detach(struct knote *);
 static int twfilter_read(struct knote *, long);
 static int twfilter_write(struct knote *, long);
 
-#define CDEV_MAJOR 19
 static struct dev_ops tw_ops = {
-	{ "tw", CDEV_MAJOR, 0 },
+	{ "tw", 0, 0 },
 	.d_open	=	twopen,
 	.d_close =	twclose,
 	.d_read =	twread,
diff --git a/sys/dev/raid/aac/aac.c b/sys/dev/raid/aac/aac.c
index cd940b39ec..d9927bf2cb 100644
--- a/sys/dev/raid/aac/aac.c
+++ b/sys/dev/raid/aac/aac.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/aac/aac.c,v 1.9.2.14 2003/04/08 13:22:08 scottl Exp $
- *	$DragonFly: src/sys/dev/raid/aac/aac.c,v 1.34 2008/01/20 03:40:35 pavalos Exp $
  */
 
 /*
@@ -225,11 +224,8 @@ static int		aac_query_disk(struct aac_softc *sc, caddr_t uptr);
 static int		aac_get_pci_info(struct aac_softc *sc, caddr_t uptr);
 static void		aac_ioctl_event(struct aac_softc *sc,
 				        struct aac_event *event, void *arg);
-
-#define AAC_CDEV_MAJOR	150
-
 static struct dev_ops aac_ops = {
-	{ "aac", AAC_CDEV_MAJOR, 0 },
+	{ "aac", 0, 0 },
 	.d_open =	aac_open,
 	.d_close =	aac_close,
 	.d_ioctl =	aac_ioctl,
diff --git a/sys/dev/raid/aac/aacvar.h b/sys/dev/raid/aac/aacvar.h
index 8995c3c2e7..02e91266b0 100644
--- a/sys/dev/raid/aac/aacvar.h
+++ b/sys/dev/raid/aac/aacvar.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/aac/aacvar.h,v 1.4.2.7 2003/04/08 13:22:08 scottl Exp $
- *	$DragonFly: src/sys/dev/raid/aac/aacvar.h,v 1.22 2008/06/10 17:20:48 dillon Exp $
  */
 
 #include <sys/buf.h>
@@ -92,11 +91,6 @@
  */
 #define AAC_PERIODIC_INTERVAL	20		/* seconds */
 
-/*
- * Character device major numbers.
- */
-#define AAC_DISK_MAJOR	200
-
 /*
  * Per-container data structure
  */
diff --git a/sys/dev/raid/amr/amr.c b/sys/dev/raid/amr/amr.c
index 17bf79e4b3..d6072767f5 100644
--- a/sys/dev/raid/amr/amr.c
+++ b/sys/dev/raid/amr/amr.c
@@ -53,7 +53,6 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/amr/amr.c,v 1.7.2.13 2003/01/15 13:41:18 emoore Exp $
- *	$DragonFly: src/sys/dev/raid/amr/amr.c,v 1.28 2008/09/16 14:08:48 swildner Exp $
  */
 
 /*
@@ -82,14 +81,12 @@
 #define AMR_DEFINE_TABLES
 #include "amr_tables.h"
 
-#define AMR_CDEV_MAJOR	132
-
 static d_open_t         amr_open;
 static d_close_t        amr_close;
 static d_ioctl_t        amr_ioctl;
 
 static struct dev_ops amr_ops = {
-	{ "amr", AMR_CDEV_MAJOR, 0 },
+	{ "amr", 0, 0 },
 	.d_open =	amr_open,
 	.d_close =	amr_close,
 	.d_ioctl =	amr_ioctl
diff --git a/sys/dev/raid/amr/amr_disk.c b/sys/dev/raid/amr/amr_disk.c
index 96bec12e2b..999c0eae51 100644
--- a/sys/dev/raid/amr/amr_disk.c
+++ b/sys/dev/raid/amr/amr_disk.c
@@ -54,7 +54,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/amr/amr_disk.c,v 1.5.2.5 2002/12/20 15:12:04 emoore Exp $
- * $DragonFly: src/sys/dev/raid/amr/amr_disk.c,v 1.15 2007/06/17 23:50:16 dillon Exp $
  */
 
 /*
@@ -94,10 +93,8 @@ static	d_strategy_t	amrd_strategy;
 static	d_ioctl_t	amrd_ioctl;
 static	d_dump_t	amrd_dump;
 
-#define AMRD_CDEV_MAJOR	133
-
 static struct dev_ops amrd_ops = {
-	{ "amrd", AMRD_CDEV_MAJOR, D_DISK },
+	{ "amrd", 0, D_DISK },
 	.d_open = amrd_open,
 	.d_close = amrd_close,
 	.d_read = physread,
diff --git a/sys/dev/raid/ciss/ciss.c b/sys/dev/raid/ciss/ciss.c
index f3bc58437f..dd688cfb55 100644
--- a/sys/dev/raid/ciss/ciss.c
+++ b/sys/dev/raid/ciss/ciss.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/ciss/ciss.c,v 1.2.2.25 2008/06/10 18:51:05 ps Exp $
- *	$DragonFly: src/sys/dev/raid/ciss/ciss.c,v 1.28 2008/05/18 20:30:23 pavalos Exp $
  */
 
 /*
@@ -230,10 +229,8 @@ static d_open_t		ciss_open;
 static d_close_t	ciss_close;
 static d_ioctl_t	ciss_ioctl;
 
-#define CISS_CDEV_MAJOR  166
-
 static struct dev_ops ciss_ops = {
-    { "ciss", CISS_CDEV_MAJOR, 0 },
+    { "ciss", 0, 0 },
     .d_open =		ciss_open,
     .d_close =		ciss_close,
     .d_ioctl =		ciss_ioctl
diff --git a/sys/dev/raid/dpt/dpt.h b/sys/dev/raid/dpt/dpt.h
index 4fd2e1ea1a..cc5f9b1851 100644
--- a/sys/dev/raid/dpt/dpt.h
+++ b/sys/dev/raid/dpt/dpt.h
@@ -46,8 +46,6 @@
 
 #include <sys/ioccom.h>
 
-#define DPT_CDEV_MAJOR 88
-
 #undef DPT_USE_DLM_SWI
 
 extern u_long dpt_unit;
diff --git a/sys/dev/raid/ida/ida_disk.c b/sys/dev/raid/ida/ida_disk.c
index 9a01d585e2..dcee877410 100644
--- a/sys/dev/raid/ida/ida_disk.c
+++ b/sys/dev/raid/ida/ida_disk.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ida/ida_disk.c,v 1.12.2.6 2001/11/27 20:21:02 ps Exp $
- * $DragonFly: src/sys/dev/raid/ida/ida_disk.c,v 1.16 2007/06/17 23:50:16 dillon Exp $
  */
 
 /*
@@ -65,11 +64,8 @@ static	d_close_t	idad_close;
 static	d_strategy_t	idad_strategy;
 static	d_dump_t	idad_dump;
 
-#define IDAD_BDEV_MAJOR	29
-#define IDAD_CDEV_MAJOR	109
-
 static struct dev_ops id_ops = {
-	{ "idad", IDAD_CDEV_MAJOR, D_DISK },
+	{ "idad", 0, D_DISK },
 	.d_open =	idad_open,
 	.d_close =	idad_close,
 	.d_read =	physread,
diff --git a/sys/dev/raid/iir/iir.h b/sys/dev/raid/iir/iir.h
index bb2629df27..108019bbfc 100644
--- a/sys/dev/raid/iir/iir.h
+++ b/sys/dev/raid/iir/iir.h
@@ -1,5 +1,4 @@
 /* $FreeBSD: src/sys/dev/iir/iir.h,v 1.16 2007/06/17 05:55:50 scottl Exp $ */
-/* $DragonFly: src/sys/dev/raid/iir/iir.h,v 1.7 2006/12/22 23:26:23 swildner Exp $ */
 /*-
  *       Copyright (c) 2000-04 ICP vortex GmbH
  *       Copyright (c) 2002-04 Intel Corporation
@@ -53,8 +52,6 @@
 #define IIR_DRIVER_VERSION      1
 #define IIR_DRIVER_SUBVERSION   5
 
-#define IIR_CDEV_MAJOR          164
-
 /* OEM IDs */
 #define OEM_ID_ICP              0x941c
 #define OEM_ID_INTEL            0x8000
diff --git a/sys/dev/raid/iir/iir_ctrl.c b/sys/dev/raid/iir/iir_ctrl.c
index 2d06e715b6..b02f3a7aad 100644
--- a/sys/dev/raid/iir/iir_ctrl.c
+++ b/sys/dev/raid/iir/iir_ctrl.c
@@ -1,5 +1,4 @@
 /* $FreeBSD: src/sys/dev/iir/iir_ctrl.c,v 1.17 2005/05/06 02:32:34 cperciva Exp $ */
-/* $DragonFly: src/sys/dev/raid/iir/iir_ctrl.c,v 1.13 2007/05/17 21:08:49 dillon Exp $ */
 /*-
  *       Copyright (c) 2000-03 ICP vortex GmbH
  *       Copyright (c) 2002-03 Intel Corporation
@@ -69,11 +68,8 @@ static d_write_t	iir_write;
 static d_read_t		iir_read;
 static d_ioctl_t	iir_ioctl;
 
-#define CDEV_MAJOR          IIR_CDEV_MAJOR
-
-/* Normally, this is a static structure.  But we need it in pci/iir_pci.c */
 static struct dev_ops iir_ops = {
-	{ "iir", CDEV_MAJOR, 0 },
+	{ "iir", 0, 0 },
         .d_open =	iir_open,
         .d_close =	iir_close,
         .d_read =	iir_read,
diff --git a/sys/dev/raid/ips/ips.c b/sys/dev/raid/ips/ips.c
index 4dacc3dadf..3142cad507 100644
--- a/sys/dev/raid/ips/ips.c
+++ b/sys/dev/raid/ips/ips.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ips/ips.c,v 1.12 2004/05/30 04:01:29 scottl Exp $
- * $DragonFly: src/sys/dev/raid/ips/ips.c,v 1.19 2006/12/22 23:26:23 swildner Exp $
  */
 
 #include <dev/raid/ips/ips.h>
@@ -42,7 +41,7 @@ static d_ioctl_t ips_ioctl;
 MALLOC_DEFINE(M_IPSBUF, "ipsbuf", "IPS driver buffer");
 
 static struct dev_ops ips_ops = {
-	{ "ips", IPS_CDEV_MAJOR, D_DISK },
+	{ "ips", 0, D_DISK },
 	.d_open	= 	ips_open,
 	.d_close =	ips_close,
 	.d_ioctl =	ips_ioctl,
diff --git a/sys/dev/raid/ips/ips.h b/sys/dev/raid/ips/ips.h
index 770e484d6a..6d8fff5505 100644
--- a/sys/dev/raid/ips/ips.h
+++ b/sys/dev/raid/ips/ips.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ips/ips.h,v 1.10 2004/05/30 20:08:34 phk Exp $
- * $DragonFly: src/sys/dev/raid/ips/ips.h,v 1.13 2006/12/22 23:26:23 swildner Exp $
  */
 
 
@@ -484,6 +483,3 @@ extern void ips_copperhead_intr(void *sc);
 extern void ips_issue_copperhead_cmd(ips_command_t *command);
 extern void ips_copperhead_poll(ips_command_t *command);
 int ips_timed_wait(ips_command_t *, const char *, int);
-
-#define IPS_CDEV_MAJOR 175
-#define IPSD_CDEV_MAJOR 176
diff --git a/sys/dev/raid/ips/ips_disk.c b/sys/dev/raid/ips/ips_disk.c
index 68268fca0c..d5860e63dd 100644
--- a/sys/dev/raid/ips/ips_disk.c
+++ b/sys/dev/raid/ips/ips_disk.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ips/ips_disk.c,v 1.4 2003/09/22 04:59:07 njl Exp $
- * $DragonFly: src/sys/dev/raid/ips/ips_disk.c,v 1.14 2008/06/10 17:20:52 dillon Exp $
  */
 
 #include <sys/devicestat.h>
@@ -52,7 +51,7 @@ static d_strategy_t ipsd_strategy;
 static d_dump_t ipsd_dump;
 
 static struct dev_ops ipsd_ops = {
-	{ "ipsd", IPSD_CDEV_MAJOR, D_DISK },
+	{ "ipsd", 0, D_DISK },
 	.d_open	=	ipsd_open,
 	.d_close =	ipsd_close,
 	.d_strategy =	ipsd_strategy,
diff --git a/sys/dev/raid/mlx/mlx.c b/sys/dev/raid/mlx/mlx.c
index d9af989047..91be4c39a3 100644
--- a/sys/dev/raid/mlx/mlx.c
+++ b/sys/dev/raid/mlx/mlx.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/mlx/mlx.c,v 1.14.2.5 2001/09/11 09:49:53 kris Exp $
- *	$DragonFly: src/sys/dev/raid/mlx/mlx.c,v 1.25 2008/06/10 17:20:52 dillon Exp $
  */
 
 /*
@@ -50,10 +49,8 @@
 #include "mlxvar.h"
 #include "mlxreg.h"
 
-#define MLX_CDEV_MAJOR	130
-
 static struct dev_ops mlx_ops = {
-	{ "mlx", MLX_CDEV_MAJOR, 0 },
+	{ "mlx", 0, 0 },
 	.d_open =	mlx_open,
 	.d_close =	mlx_close,
 	.d_ioctl =	mlx_ioctl,
diff --git a/sys/dev/raid/mlx/mlx_disk.c b/sys/dev/raid/mlx/mlx_disk.c
index 6b41a55822..294a28413c 100644
--- a/sys/dev/raid/mlx/mlx_disk.c
+++ b/sys/dev/raid/mlx/mlx_disk.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/mlx/mlx_disk.c,v 1.8.2.4 2001/06/25 04:37:51 msmith Exp $
- * $DragonFly: src/sys/dev/raid/mlx/mlx_disk.c,v 1.13 2007/06/17 23:50:16 dillon Exp $
  */
 
 /*
@@ -57,10 +56,8 @@ static	d_close_t	mlxd_close;
 static	d_strategy_t	mlxd_strategy;
 static	d_ioctl_t	mlxd_ioctl;
 
-#define MLXD_CDEV_MAJOR	131
-
 static struct dev_ops mlxd_ops = {
-		{ "mlxd", MLXD_CDEV_MAJOR, D_DISK },
+		{ "mlxd", 0, D_DISK },
 		.d_open =	mlxd_open,
 		.d_close =	mlxd_close,
 		.d_read =	physread,
diff --git a/sys/dev/raid/mly/mly.c b/sys/dev/raid/mly/mly.c
index 5883830cff..9c7b07af48 100644
--- a/sys/dev/raid/mly/mly.c
+++ b/sys/dev/raid/mly/mly.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/mly/mly.c,v 1.3.2.3 2001/03/05 20:17:24 msmith Exp $
- *	$DragonFly: src/sys/dev/raid/mly/mly.c,v 1.21 2008/05/18 20:30:23 pavalos Exp $
  */
 
 #include <sys/param.h>
@@ -147,10 +146,8 @@ static driver_t mly_pci_driver = {
 static devclass_t	mly_devclass;
 DRIVER_MODULE(mly, pci, mly_pci_driver, mly_devclass, 0, 0);
 
-#define MLY_CDEV_MAJOR  158
-
 static struct dev_ops mly_ops = {
-    { "mly", MLY_CDEV_MAJOR, 0 },
+    { "mly", 0, 0 },
     .d_open =	mly_user_open,
     .d_close =	mly_user_close,
     .d_ioctl =	mly_user_ioctl,
diff --git a/sys/dev/raid/twe/twe_freebsd.c b/sys/dev/raid/twe/twe_freebsd.c
index 36f5f009a9..e9d747ccd7 100644
--- a/sys/dev/raid/twe/twe_freebsd.c
+++ b/sys/dev/raid/twe/twe_freebsd.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/twe/twe_freebsd.c,v 1.2.2.9 2004/06/11 18:57:31 vkashyap Exp $
- * $DragonFly: src/sys/dev/raid/twe/twe_freebsd.c,v 1.27 2007/06/17 23:50:16 dillon Exp $
  */
 
 /*
@@ -64,7 +63,7 @@ static	d_close_t		twe_close;
 static	d_ioctl_t		twe_ioctl_wrapper;
 
 static struct dev_ops twe_ops = {
-	{ "twe", TWE_CDEV_MAJOR, 0 },
+	{ "twe", 0, 0 },
 	.d_open =	twe_open,
 	.d_close =	twe_close,
 	.d_ioctl =	twe_ioctl_wrapper,
@@ -607,7 +606,7 @@ static	d_strategy_t	twed_strategy;
 static	d_dump_t	twed_dump;
 
 static struct dev_ops twed_ops = {
-	{ "twed", TWED_CDEV_MAJOR, D_DISK },
+	{ "twed", 0, D_DISK },
 	.d_open =	twed_open,
 	.d_close =	twed_close,
 	.d_read =	physread,
diff --git a/sys/dev/raid/twe/twevar.h b/sys/dev/raid/twe/twevar.h
index 671b4a3999..17866c4dac 100644
--- a/sys/dev/raid/twe/twevar.h
+++ b/sys/dev/raid/twe/twevar.h
@@ -27,13 +27,9 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/twe/twevar.h,v 1.1.2.8 2004/06/11 18:57:32 vkashyap Exp $
- *	$DragonFly: src/sys/dev/raid/twe/twevar.h,v 1.11 2008/06/10 17:20:52 dillon Exp $
  */
 
 #define TWE_DRIVER_VERSION_STRING	"1.40.01.002"
-#define TWE_CDEV_MAJOR			146
-#define TWED_CDEV_MAJOR			147
-
 
 #ifdef TWE_DEBUG
 #define debug(level, fmt, args...)							\
diff --git a/sys/dev/serial/cy/cy.c b/sys/dev/serial/cy/cy.c
index a78773c772..709c766b55 100644
--- a/sys/dev/serial/cy/cy.c
+++ b/sys/dev/serial/cy/cy.c
@@ -30,7 +30,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/cy.c,v 1.97.2.2 2001/08/22 13:04:58 bde Exp $
- * $DragonFly: src/sys/dev/serial/cy/cy.c,v 1.30 2008/10/20 13:16:58 sephe Exp $
  */
 
 #include "opt_compat.h"
@@ -384,9 +383,8 @@ static	d_close_t	sioclose;
 static	d_write_t	siowrite;
 static	d_ioctl_t	sioioctl;
 
-#define	CDEV_MAJOR	48
 static struct dev_ops sio_ops = {
-	{ driver_name, CDEV_MAJOR, D_TTY },
+	{ driver_name, 0, D_TTY },
 	.d_open =	sioopen,
 	.d_close =	sioclose,
 	.d_read =	ttyread,
diff --git a/sys/dev/serial/dgb/dgm.c b/sys/dev/serial/dgb/dgm.c
index 90e8dfc83e..37566046a7 100644
--- a/sys/dev/serial/dgb/dgm.c
+++ b/sys/dev/serial/dgb/dgm.c
@@ -1,6 +1,5 @@
 /*-
  * $FreeBSD: src/sys/dev/dgb/dgm.c,v 1.31.2.3 2001/10/07 09:02:25 brian Exp $
- * $DragonFly: src/sys/dev/serial/dgb/dgm.c,v 1.17 2008/04/30 17:28:16 dillon Exp $
  *
  *  This driver and the associated header files support the ISA PC/Xem
  *  Digiboards.  Its evolutionary roots are described below.
@@ -240,9 +239,8 @@ static driver_t dgmdriver = {
 
 static devclass_t dgmdevclass;
 
-#define	CDEV_MAJOR	101
 static struct dev_ops dgm_ops = {
-	{ "dgm", CDEV_MAJOR, D_TTY },
+	{ "dgm", 0, D_TTY },
 	.d_open =	dgmopen,
 	.d_close =	dgmclose,
 	.d_read =	ttyread,
diff --git a/sys/dev/serial/digi/digi.c b/sys/dev/serial/digi/digi.c
index eac99ce072..3c5b8fb105 100644
--- a/sys/dev/serial/digi/digi.c
+++ b/sys/dev/serial/digi/digi.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/digi/digi.c,v 1.36 2003/09/26 09:05:57 phk Exp $
- * $DragonFly: src/sys/dev/serial/digi/digi.c,v 1.11 2008/04/30 17:28:17 dillon Exp $
  */
 
 /*-
@@ -65,8 +64,6 @@
 #include <dev/serial/digi/digi_pci.h>
 #include <dev/serial/digi/digi_bios.h>
 
-#define	CDEV_MAJOR	162
-
 #define	CTRL_DEV		0x800000
 #define	CALLOUT_MASK		0x400000
 #define	CONTROL_INIT_STATE	0x100000
@@ -149,7 +146,7 @@ const struct digi_control_signals digi_normal_signals = {
 };
 
 static struct dev_ops digi_ops = {
-	{ "dgm", CDEV_MAJOR, D_TTY },
+	{ "dgm", 0, D_TTY },
 	.d_open =	digiopen,
 	.d_close =	digiclose,
 	.d_read =	digiread,
diff --git a/sys/dev/serial/rc/rc.c b/sys/dev/serial/rc/rc.c
index 3bdfdcd7e2..5538d94122 100644
--- a/sys/dev/serial/rc/rc.c
+++ b/sys/dev/serial/rc/rc.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/rc.c,v 1.53.2.1 2001/02/26 04:23:10 jlemon Exp $
- * $DragonFly: src/sys/dev/serial/rc/rc.c,v 1.24 2008/08/02 01:14:43 dillon Exp $
  *
  */
 
@@ -92,9 +91,8 @@ static	d_open_t	rcopen;
 static	d_close_t	rcclose;
 static	d_ioctl_t	rcioctl;
 
-#define	CDEV_MAJOR	63
 static struct dev_ops rc_ops = {
-	{ "rc", CDEV_MAJOR, D_TTY },
+	{ "rc", 0, D_TTY },
 	.d_open =	rcopen,
 	.d_close =	rcclose,
 	.d_read =	ttyread,
diff --git a/sys/dev/serial/rp/rp.c b/sys/dev/serial/rp/rp.c
index e888479089..818ba55e37 100644
--- a/sys/dev/serial/rp/rp.c
+++ b/sys/dev/serial/rp/rp.c
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/rp/rp.c,v 1.45.2.2 2002/11/07 22:26:59 tegge Exp $
- * $DragonFly: src/sys/dev/serial/rp/rp.c,v 1.21 2006/12/22 23:26:24 swildner Exp $
  */
 
 /* 
@@ -590,9 +589,8 @@ static	d_close_t	rpclose;
 static	d_write_t	rpwrite;
 static	d_ioctl_t	rpioctl;
 
-#define	CDEV_MAJOR	81
 static struct dev_ops rp_ops = {
-	{ "rp", CDEV_MAJOR, D_TTY },
+	{ "rp", 0, D_TTY },
 	.d_open =	rpopen,
 	.d_close =	rpclose,
 	.d_read =	ttyread,
diff --git a/sys/dev/serial/si/si.c b/sys/dev/serial/si/si.c
index 0eb174524c..7d15203d5a 100644
--- a/sys/dev/serial/si/si.c
+++ b/sys/dev/serial/si/si.c
@@ -33,7 +33,6 @@
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
  * $FreeBSD: src/sys/dev/si/si.c,v 1.101.2.1 2001/02/26 04:23:06 jlemon Exp $
- * $DragonFly: src/sys/dev/serial/si/si.c,v 1.23 2006/12/22 23:26:24 swildner Exp $
  */
 
 #ifndef lint
@@ -120,9 +119,8 @@ static	d_close_t	siclose;
 static	d_write_t	siwrite;
 static	d_ioctl_t	siioctl;
 
-#define	CDEV_MAJOR	68
 static struct dev_ops si_ops = {
-	{ "si", CDEV_MAJOR, D_TTY },
+	{ "si", 0, D_TTY },
 	.d_open =	siopen,
 	.d_close =	siclose,
 	.d_read =	ttyread,
diff --git a/sys/dev/serial/sio/sio.c b/sys/dev/serial/sio/sio.c
index 085d830e0f..8c375038c8 100644
--- a/sys/dev/serial/sio/sio.c
+++ b/sys/dev/serial/sio/sio.c
@@ -33,7 +33,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/isa/sio.c,v 1.291.2.35 2003/05/18 08:51:15 murray Exp $
- * $DragonFly: src/sys/dev/serial/sio/sio.c,v 1.44 2008/07/23 16:39:33 dillon Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
@@ -251,9 +250,8 @@ static	d_read_t	sioread;
 static	d_write_t	siowrite;
 static	d_ioctl_t	sioioctl;
 
-#define	CDEV_MAJOR	28
 static struct dev_ops sio_ops = {
-	{ driver_name, CDEV_MAJOR, D_TTY },
+	{ driver_name, 0, D_TTY },
 	.d_open =	sioopen,
 	.d_close =	sioclose,
 	.d_read =	sioread,
diff --git a/sys/dev/serial/stl/stallion.c b/sys/dev/serial/stl/stallion.c
index 0c27445430..c87ad40289 100644
--- a/sys/dev/serial/stl/stallion.c
+++ b/sys/dev/serial/stl/stallion.c
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/stallion.c,v 1.39.2.2 2001/08/30 12:29:57 murray Exp $
- * $DragonFly: src/sys/dev/serial/stl/stallion.c,v 1.27 2008/08/02 01:14:43 dillon Exp $
  */
 
 /*****************************************************************************/
@@ -750,7 +749,7 @@ COMPAT_PCI_DRIVER (stlpci, stlpcidriver);
 
 #define	CDEV_MAJOR	72
 static struct dev_ops stl_ops = {
-	{ "stl", CDEV_MAJOR, D_TTY },
+	{ "stl", 0, D_TTY },
 	.d_open =	stlopen,
 	.d_close =	stlclose,
 	.d_read =	ttyread,
diff --git a/sys/dev/serial/stli/istallion.c b/sys/dev/serial/stli/istallion.c
index da88508700..58ac68c9ce 100644
--- a/sys/dev/serial/stli/istallion.c
+++ b/sys/dev/serial/stli/istallion.c
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/istallion.c,v 1.36.2.2 2001/08/30 12:29:57 murray Exp $
- * $DragonFly: src/sys/dev/serial/stli/istallion.c,v 1.23 2008/08/02 01:14:43 dillon Exp $
  */
 
 /*****************************************************************************/
@@ -631,9 +630,8 @@ struct isa_driver	stlidriver = {
  *	FreeBSD-2.2+ kernel linkage.
  */
 
-#define	CDEV_MAJOR	75
 static struct dev_ops stli_ops = {
-	{ stli_drvname, CDEV_MAJOR, D_TTY },
+	{ stli_drvname, 0, D_TTY },
 	.d_open =	stliopen,
 	.d_close =	stliclose,
 	.d_read =	stliread,
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index dfcf83c380..3206a42135 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.80.2.6 2006/04/04 17:43:48 ariff Exp $
- * $DragonFly: src/sys/dev/sound/pcm/dsp.c,v 1.17 2008/02/28 17:19:11 tgen Exp $
  */
 
 #include <sys/param.h>
@@ -34,7 +33,6 @@
 #include <dev/sound/pcm/dsp.h>
 #include <dev/sound/pcm/sound.h>
 
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/dsp.c,v 1.17 2008/02/28 17:19:11 tgen Exp $");
 
 #define OLDPCM_IOCTL
 
@@ -51,7 +49,7 @@ static int dsp_filter_read(struct knote *, long);
 static int dsp_filter_write(struct knote *, long);
 
 struct dev_ops dsp_ops = {
-	{ "dsp", SND_CDEV_MAJOR, 0},
+	{ "dsp", 0, 0},
 	/*.d_flags =	D_NEEDGIANT,*/
 	.d_open =	dsp_open,
 	.d_close =	dsp_close,
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index bc462fee9f..3e7bb63be5 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.43.2.5 2007/05/13 20:53:39 ariff Exp $
- * $DragonFly: src/sys/dev/sound/pcm/mixer.c,v 1.18 2007/06/22 21:41:16 corecode Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
@@ -32,7 +31,6 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/mixer.c,v 1.18 2007/06/22 21:41:16 corecode Exp $");
 
 MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
 
@@ -82,7 +80,7 @@ static d_open_t mixer_open;
 static d_close_t mixer_close;
 
 static struct dev_ops mixer_cdevsw = {
-	{ "mixer", SND_CDEV_MAJOR, D_TRACKCLOSE },
+	{ "mixer", 0, D_TRACKCLOSE },
 	/* .d_flags =	D_TRACKCLOSE | D_NEEDGIANT, */
 	.d_open =	mixer_open,
 	.d_close =	mixer_close,
diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c
index bf13a77215..59f6a5f2b2 100644
--- a/sys/dev/sound/pcm/sndstat.c
+++ b/sys/dev/sound/pcm/sndstat.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sound/pcm/sndstat.c,v 1.20.2.2 2005/12/30 19:55:54 netchild Exp $
- * $DragonFly: src/sys/dev/sound/pcm/sndstat.c,v 1.13 2008/01/06 16:55:51 swildner Exp $
  */
 
 #include <dev/sound/pcm/sound.h>
@@ -33,7 +32,6 @@
 #include <sys/lock.h>
 #endif
 
-SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pcm/sndstat.c,v 1.13 2008/01/06 16:55:51 swildner Exp $");
 
 #define	SS_TYPE_MODULE		0
 #define	SS_TYPE_FIRST		1
@@ -47,7 +45,7 @@ static d_close_t sndstat_close;
 static d_read_t sndstat_read;
 
 static struct dev_ops sndstat_cdevsw = {
-	{ "sndstat", SND_CDEV_MAJOR, 0 },
+	{ "sndstat", 0, 0 },
 	/* .d_flags =	D_NEEDGIANT, */
 	.d_open =	sndstat_open,
 	.d_close =	sndstat_close,
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index ce0d9f4222..bf88310571 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.63.2.3 2007/05/13 20:53:39 ariff Exp $
- * $DragonFly: src/sys/dev/sound/pcm/sound.h,v 1.14 2008/01/05 13:34:22 corecode Exp $
  */
 
 /*
@@ -146,11 +145,6 @@ nomenclature:
 struct pcm_channel *fkchan_setup(device_t dev);
 int fkchan_kill(struct pcm_channel *c);
 
-/*
- * Major nuber for the sound driver.
- */
-#define SND_CDEV_MAJOR 30
-
 /* XXX Flawed definition. I'll fix it someday. */
 #define	SND_MAXVCHANS	PCMMAXCHAN
 
diff --git a/sys/dev/usbmisc/ucom/ucom.c b/sys/dev/usbmisc/ucom/ucom.c
index 66ccc538da..90c18b8e3d 100644
--- a/sys/dev/usbmisc/ucom/ucom.c
+++ b/sys/dev/usbmisc/ucom/ucom.c
@@ -4,7 +4,6 @@
  * $NetBSD: ucom.c,v 1.39 2001/08/16 22:31:24 augustss Exp $
  * $NetBSD: ucom.c,v 1.40 2001/11/13 06:24:54 lukem Exp $
  * $FreeBSD: src/sys/dev/usb/ucom.c,v 1.35 2003/11/16 11:58:21 akiyama Exp $
- * $DragonFly: src/sys/dev/usbmisc/ucom/ucom.c,v 1.32 2007/11/05 19:09:43 hasso Exp $
  */
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
@@ -118,10 +117,8 @@ static d_read_t  ucomread;
 static d_write_t ucomwrite;
 static d_ioctl_t ucomioctl;
 
-#define UCOM_CDEV_MAJOR  138
-
 static struct dev_ops ucom_ops = {
-	{ "ucom", UCOM_CDEV_MAJOR, D_TTY },
+	{ "ucom", 0, D_TTY },
 	.d_open =	ucomopen,
 	.d_close =	ucomclose,
 	.d_read =	ucomread,
diff --git a/sys/dev/usbmisc/ufm/ufm.c b/sys/dev/usbmisc/ufm/ufm.c
index 3ecb7ec8c7..fce886365c 100644
--- a/sys/dev/usbmisc/ufm/ufm.c
+++ b/sys/dev/usbmisc/ufm/ufm.c
@@ -30,7 +30,6 @@
 
 /*
  * $FreeBSD: src/sys/dev/usb/ufm.c,v 1.16 2003/10/04 21:41:01 joe Exp $
- * $DragonFly: src/sys/dev/usbmisc/ufm/ufm.c,v 1.24 2008/08/14 20:55:53 hasso Exp $
  */
 
 #include <sys/param.h>
@@ -72,10 +71,8 @@ d_open_t  ufmopen;
 d_close_t ufmclose;
 d_ioctl_t ufmioctl;
 
-#define UFM_CDEV_MAJOR	200
-
 static struct dev_ops ufm_ops = {
-	{ "ufm", UFM_CDEV_MAJOR, 0 },
+	{ "ufm", 0, 0 },
 	.d_open = ufmopen,
 	.d_close = ufmclose,
 	.d_ioctl = ufmioctl,
diff --git a/sys/dev/usbmisc/ugen/ugen.c b/sys/dev/usbmisc/ugen/ugen.c
index 3922b58685..ac466a4d7b 100644
--- a/sys/dev/usbmisc/ugen/ugen.c
+++ b/sys/dev/usbmisc/ugen/ugen.c
@@ -2,7 +2,6 @@
  * $NetBSD: ugen.c,v 1.27 1999/10/28 12:08:38 augustss Exp $
  * $NetBSD: ugen.c,v 1.59 2002/07/11 21:14:28 augustss Exp $
  * $FreeBSD: src/sys/dev/usb/ugen.c,v 1.81 2003/11/09 09:17:22 tanimura Exp $
- * $DragonFly: src/sys/dev/usbmisc/ugen/ugen.c,v 1.34 2008/05/13 08:35:12 hasso Exp $
  */
 
 /* 
@@ -144,10 +143,8 @@ static void ugen_filt_detach(struct knote *);
 static int ugen_filt_read(struct knote *, long);
 static int ugen_filt_write(struct knote *, long);
 
-#define UGEN_CDEV_MAJOR	114
-
 static struct dev_ops ugen_ops = {
-	{ "ugen", UGEN_CDEV_MAJOR, 0 },
+	{ "ugen", 0, 0 },
 	.d_open =	ugenopen,
 	.d_close =	ugenclose,
 	.d_read =	ugenread,
diff --git a/sys/dev/usbmisc/uhid/uhid.c b/sys/dev/usbmisc/uhid/uhid.c
index 011decf650..ecc4eb2515 100644
--- a/sys/dev/usbmisc/uhid/uhid.c
+++ b/sys/dev/usbmisc/uhid/uhid.c
@@ -1,7 +1,6 @@
 /*
  * $NetBSD: uhid.c,v 1.46 2001/11/13 06:24:55 lukem Exp $
  * $FreeBSD: src/sys/dev/usb/uhid.c,v 1.65 2003/11/09 09:17:22 tanimura Exp $
- * $DragonFly: src/sys/dev/usbmisc/uhid/uhid.c,v 1.33 2008/08/14 20:55:53 hasso Exp $
  */
 
 /* Also already merged from NetBSD:
@@ -136,10 +135,8 @@ static void uhidfilt_detach(struct knote *);
 static int uhidfilt_read(struct knote *, long);
 static int uhidfilt_write(struct knote *, long);
 
-#define		UHID_CDEV_MAJOR 122
-
 static struct dev_ops uhid_ops = {
-	{ "uhid", UHID_CDEV_MAJOR, 0 },
+	{ "uhid", 0, 0 },
 	.d_open =	uhidopen,
 	.d_close =	uhidclose,
 	.d_read =	uhidread,
diff --git a/sys/dev/usbmisc/ulpt/ulpt.c b/sys/dev/usbmisc/ulpt/ulpt.c
index 70b5eba524..488caf339b 100644
--- a/sys/dev/usbmisc/ulpt/ulpt.c
+++ b/sys/dev/usbmisc/ulpt/ulpt.c
@@ -1,7 +1,6 @@
 /*
  * $NetBSD: ulpt.c,v 1.55 2002/10/23 09:14:01 jdolecek Exp $
  * $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.59 2003/09/28 20:48:13 phk Exp $
- * $DragonFly: src/sys/dev/usbmisc/ulpt/ulpt.c,v 1.25 2008/02/11 16:56:53 dillon Exp $
  */
 
 /*
@@ -124,10 +123,8 @@ static d_close_t ulptclose;
 static d_write_t ulptwrite;
 static d_ioctl_t ulptioctl;
 
-#define ULPT_CDEV_MAJOR 113
-
 static struct dev_ops ulpt_ops = {
-	{ "ulpt", ULPT_CDEV_MAJOR, 0 },
+	{ "ulpt", 0, 0 },
 	.d_open =	ulptopen,
 	.d_close =	ulptclose,
 	.d_write =	ulptwrite,
diff --git a/sys/dev/usbmisc/ums/ums.c b/sys/dev/usbmisc/ums/ums.c
index d9c81c5348..6f00e76eaa 100644
--- a/sys/dev/usbmisc/ums/ums.c
+++ b/sys/dev/usbmisc/ums/ums.c
@@ -1,6 +1,5 @@
 /*
  * $FreeBSD: src/sys/dev/usb/ums.c,v 1.64 2003/11/09 09:17:22 tanimura Exp $
- * $DragonFly: src/sys/dev/usbmisc/ums/ums.c,v 1.31 2008/08/14 20:55:54 hasso Exp $
  */
 
 /*
@@ -145,10 +144,8 @@ static d_kqfilter_t ums_kqfilter;
 static void ums_filt_detach(struct knote *);
 static int ums_filt(struct knote *, long);
 
-#define UMS_CDEV_MAJOR	111
-
 static struct dev_ops ums_ops = {
-	{ "ums", UMS_CDEV_MAJOR, 0 },
+	{ "ums", 0, 0 },
 	.d_open =	ums_open,
 	.d_close =	ums_close,
 	.d_read =	ums_read,
diff --git a/sys/dev/usbmisc/urio/urio.c b/sys/dev/usbmisc/urio/urio.c
index 85349bc1ef..90baa9bf4d 100644
--- a/sys/dev/usbmisc/urio/urio.c
+++ b/sys/dev/usbmisc/urio/urio.c
@@ -30,7 +30,6 @@
 
 /*
  * $FreeBSD: src/sys/dev/usb/urio.c,v 1.28 2003/08/25 22:01:06 joe Exp $
- * $DragonFly: src/sys/dev/usbmisc/urio/urio.c,v 1.27 2008/08/14 20:55:54 hasso Exp $
  */
 
 /*
@@ -94,10 +93,8 @@ d_read_t  urioread;
 d_write_t uriowrite;
 d_ioctl_t urioioctl;
 
-#define URIO_CDEV_MAJOR	143
-
 static struct dev_ops urio_ops = {
-	{ "urio", URIO_CDEV_MAJOR, 0 },
+	{ "urio", 0, 0 },
 	.d_open =	urioopen,
 	.d_close =	urioclose,
 	.d_read =	urioread,
diff --git a/sys/dev/usbmisc/uscanner/uscanner.c b/sys/dev/usbmisc/uscanner/uscanner.c
index 87cf777850..708269ad12 100644
--- a/sys/dev/usbmisc/uscanner/uscanner.c
+++ b/sys/dev/usbmisc/uscanner/uscanner.c
@@ -1,7 +1,6 @@
 /* 
  * $NetBSD: uscanner.c,v 1.30 2002/07/11 21:14:36 augustss Exp $
  * $FreeBSD: src/sys/dev/usb/uscanner.c,v 1.48 2003/12/22 19:58:27 sanpei Exp $
- * $DragonFly: src/sys/dev/usbmisc/uscanner/uscanner.c,v 1.27 2008/01/16 12:25:36 matthias Exp $
  */
 
 /* Also already merged from NetBSD:
@@ -256,10 +255,8 @@ d_read_t  uscannerread;
 d_write_t uscannerwrite;
 d_kqfilter_t uscannerkqfilter;
 
-#define USCANNER_CDEV_MAJOR	156
-
 static struct dev_ops uscanner_ops = {
-	{ "uscanner", USCANNER_CDEV_MAJOR, 0 },
+	{ "uscanner", 0, 0 },
 	.d_open =	uscanneropen,
 	.d_close =	uscannerclose,
 	.d_read =	uscannerread,
diff --git a/sys/dev/video/bktr/bktr_os.c b/sys/dev/video/bktr/bktr_os.c
index e5e05b614b..16b2709ce6 100644
--- a/sys/dev/video/bktr/bktr_os.c
+++ b/sys/dev/video/bktr/bktr_os.c
@@ -31,7 +31,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.54 2007/02/23 12:18:34 piso Exp $
- * $DragonFly: src/sys/dev/video/bktr/bktr_os.c,v 1.21 2008/05/18 03:02:53 pavalos Exp $
  */
 
 /*
@@ -166,9 +165,8 @@ static	d_kqfilter_t	bktr_kqfilter;
 static void bktr_filter_detach(struct knote *);
 static int bktr_filter(struct knote *, long);
 
-#define CDEV_MAJOR 92 
 static struct dev_ops bktr_ops = {
-	{ "bktr", CDEV_MAJOR, 0 },
+	{ "bktr", 0, 0 },
 	.d_open =	bktr_open,
 	.d_close =	bktr_close,
 	.d_read =	bktr_read,
diff --git a/sys/dev/video/ctx/ctx.c b/sys/dev/video/ctx/ctx.c
index 0d1f9dc565..6b3b655a31 100644
--- a/sys/dev/video/ctx/ctx.c
+++ b/sys/dev/video/ctx/ctx.c
@@ -9,7 +9,6 @@
  *	for damages incurred with its use.
  *
  * $FreeBSD: src/sys/i386/isa/ctx.c,v 1.36 2000/01/29 16:17:31 peter Exp $
- * $DragonFly: src/sys/dev/video/ctx/ctx.c,v 1.13 2008/08/02 01:14:43 dillon Exp $
  */
 
 /*
@@ -139,10 +138,9 @@ static	d_close_t	ctxclose;
 static	d_read_t	ctxread;
 static	d_write_t	ctxwrite;
 static	d_ioctl_t	ctxioctl;
-#define CDEV_MAJOR 40
 
 static struct dev_ops ctx_ops = {
-	{ "ctx", CDEV_MAJOR, 0 },
+	{ "ctx", 0, 0 },
 	.d_open =	ctxopen,
 	.d_close =	ctxclose,
 	.d_read =	ctxread,
diff --git a/sys/dev/video/cxm/cxm.c b/sys/dev/video/cxm/cxm.c
index e2064e64e4..caeb73fb8c 100644
--- a/sys/dev/video/cxm/cxm.c
+++ b/sys/dev/video/cxm/cxm.c
@@ -125,10 +125,8 @@ static	d_kqfilter_t	cxm_kqfilter;
 static void cxm_filter_detach(struct knote *);
 static int cxm_filter(struct knote *, long);
 
-#define CDEV_MAJOR 93
-
 static struct dev_ops cxm_ops = {
-	{ "cxm", CDEV_MAJOR, 0 },
+	{ "cxm", 0, 0 },
 	.d_open =	cxm_open,
 	.d_close =	cxm_close,
 	.d_read =	cxm_read,
diff --git a/sys/dev/video/fb/fb.c b/sys/dev/video/fb/fb.c
index 7e91883aef..57deab969a 100644
--- a/sys/dev/video/fb/fb.c
+++ b/sys/dev/video/fb/fb.c
@@ -28,7 +28,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/fb/fb.c,v 1.11.2.2 2000/08/02 22:35:22 peter Exp $
- * $DragonFly: src/sys/dev/video/fb/fb.c,v 1.19 2008/01/09 21:29:11 swildner Exp $
  */
 
 #include "opt_fb.h"
@@ -370,10 +369,8 @@ fbattach(device_t dev)
 static d_default_t	fboperate;
 static d_open_t		fbopen;
 
-#define CDEV_MAJOR	123	/* XXX */
-
 static struct dev_ops fb_ops = {
-	{ FB_DRIVER_NAME, CDEV_MAJOR, 0 },
+	{ FB_DRIVER_NAME, 0, 0 },
 	.d_default =	fboperate,
 	.d_open =	fbopen
 };
diff --git a/sys/dev/video/gsc/gsc.c b/sys/dev/video/gsc/gsc.c
index d94e295665..786c925a06 100644
--- a/sys/dev/video/gsc/gsc.c
+++ b/sys/dev/video/gsc/gsc.c
@@ -32,7 +32,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/gsc.c,v 1.35.2.1 2000/08/08 19:49:53 peter Exp $
- * $DragonFly: src/sys/dev/video/gsc/gsc.c,v 1.17 2008/08/02 01:14:43 dillon Exp $
  *
  */
 
@@ -184,9 +183,8 @@ static	d_close_t	gscclose;
 static	d_read_t	gscread;
 static	d_ioctl_t	gscioctl;
 
-#define CDEV_MAJOR 47
 static struct dev_ops gsc_ops = {
-	{ "gsc", CDEV_MAJOR, 0 },
+	{ "gsc", 0, 0 },
 	.d_open =	gscopen,
 	.d_close =	gscclose,
 	.d_read =	gscread,
diff --git a/sys/dev/video/meteor/meteor.c b/sys/dev/video/meteor/meteor.c
index 9214a31bdd..261e713dd5 100644
--- a/sys/dev/video/meteor/meteor.c
+++ b/sys/dev/video/meteor/meteor.c
@@ -29,7 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/meteor.c,v 1.49 1999/09/25 18:24:41 phk Exp $
- * $DragonFly: src/sys/dev/video/meteor/meteor.c,v 1.22 2007/05/13 18:33:58 swildner Exp $
  */
 
 /*		Change History:
@@ -220,9 +219,8 @@ static	d_write_t	meteor_write;
 static	d_ioctl_t	meteor_ioctl;
 static	d_mmap_t	meteor_mmap;
 
-#define CDEV_MAJOR 67
 static struct dev_ops meteor_ops = {
-	{ "meteor", CDEV_MAJOR, 0 },
+	{ "meteor", 0, 0 },
 	.d_open =	meteor_open,
 	.d_close =	meteor_close,
 	.d_read =	meteor_read,
diff --git a/sys/dev/virtual/cdrom/vcd.c b/sys/dev/virtual/cdrom/vcd.c
index 849233eb6f..13c6790873 100644
--- a/sys/dev/virtual/cdrom/vcd.c
+++ b/sys/dev/virtual/cdrom/vcd.c
@@ -31,7 +31,6 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $DragonFly: src/sys/dev/virtual/cdrom/vcd.c,v 1.1 2007/05/25 02:21:13 dillon Exp $
  */
 
 /*
@@ -62,13 +61,11 @@ struct vcd_softc {
 	int fd;
 };
 
-#define CDEV_MAJOR	98
-
 static d_strategy_t	vcdstrategy;
 static d_open_t		vcdopen;
 
 static struct dev_ops vcd_ops = {
-	{ "vcd", CDEV_MAJOR, D_DISK },
+	{ "vcd", 0, D_DISK },
         .d_open =	vcdopen,
         .d_close =	nullclose,
         .d_read =	physread,
diff --git a/sys/dev/virtual/disk/vdisk.c b/sys/dev/virtual/disk/vdisk.c
index 47b3006db0..2b050e5238 100644
--- a/sys/dev/virtual/disk/vdisk.c
+++ b/sys/dev/virtual/disk/vdisk.c
@@ -31,7 +31,6 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $DragonFly: src/sys/dev/virtual/disk/vdisk.c,v 1.8 2008/03/20 02:14:56 dillon Exp $
  */
 
 /*
@@ -67,8 +66,6 @@ struct vkd_softc {
 	int fd;
 };
 
-#define CDEV_MAJOR	97
-
 static void vkd_io_thread(cothread_t cotd);
 static void vkd_io_intr(cothread_t cotd);
 static void vkd_doio(struct vkd_softc *sc, struct bio *bio);
@@ -77,7 +74,7 @@ static d_strategy_t	vkdstrategy;
 static d_open_t		vkdopen;
 
 static struct dev_ops vkd_ops = {
-	{ "vkd", CDEV_MAJOR, D_DISK },
+	{ "vkd", 0, D_DISK },
         .d_open =	vkdopen,
         .d_close =	nullclose,
         .d_read =	physread,
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index dc3738b858..e940313c2c 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -70,7 +70,6 @@
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
  * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.81.2.19 2004/02/28 00:43:31 tegge Exp $
- * $DragonFly: src/sys/kern/kern_descrip.c,v 1.79 2008/08/31 13:18:28 aggelos Exp $
  */
 
 #include "opt_compat.h"
@@ -125,7 +124,7 @@ static	 d_open_t  fdopen;
 
 #define CDEV_MAJOR 22
 static struct dev_ops fildesc_ops = {
-	{ "FD", CDEV_MAJOR, 0 },
+	{ "FD", 0, 0 },
 	.d_open =	fdopen,
 };
 
diff --git a/sys/kern/kern_memio.c b/sys/kern/kern_memio.c
index 294bf68957..9075e3f857 100644
--- a/sys/kern/kern_memio.c
+++ b/sys/kern/kern_memio.c
@@ -39,7 +39,6 @@
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/i386/i386/mem.c,v 1.79.2.9 2003/01/04 22:58:01 njl Exp $
- * $DragonFly: src/sys/kern/kern_memio.c,v 1.32 2008/07/23 16:39:28 dillon Exp $
  */
 
 /*
@@ -80,7 +79,7 @@ static	d_kqfilter_t	mmkqfilter;
 
 #define CDEV_MAJOR 2
 static struct dev_ops mem_ops = {
-	{ "mem", CDEV_MAJOR, D_MPSAFE },
+	{ "mem", 0, D_MPSAFE },
 	.d_open =	mmopen,
 	.d_close =	mmclose,
 	.d_read =	mmread,
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 26cdd6f38e..06f94f7d8d 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/subr_bus.c,v 1.54.2.9 2002/10/10 15:13:32 jhb Exp $
- * $DragonFly: src/sys/kern/subr_bus.c,v 1.46 2008/10/03 00:26:21 hasso Exp $
  */
 
 #include "opt_bus.h"
@@ -135,8 +134,6 @@ TUNABLE_INT("hw.bus.devctl_disable", &devctl_disable);
 SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_disable, CTLTYPE_INT | CTLFLAG_RW, 0, 0,
     sysctl_devctl_disable, "I", "devctl disable");
 
-#define	CDEV_MAJOR	188
-
 static d_open_t		devopen;
 static d_close_t	devclose;
 static d_read_t		devread;
@@ -144,7 +141,7 @@ static d_ioctl_t	devioctl;
 static d_kqfilter_t	devkqfilter;
 
 static struct dev_ops devctl_ops = {
-	{ "devctl", CDEV_MAJOR, 0 },
+	{ "devctl", 0, 0 },
 	.d_open =	devopen,
 	.d_close =	devclose,
 	.d_read =	devread,
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index b98b2b9b32..f3b738241a 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -32,7 +32,6 @@
  *
  *	@(#)subr_log.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/kern/subr_log.c,v 1.39.2.2 2001/06/02 08:11:25 phk Exp $
- * $DragonFly: src/sys/kern/subr_log.c,v 1.10 2006/07/28 02:17:40 dillon Exp $
  */
 
 /*
@@ -70,7 +69,7 @@ static	int  logfiltread(struct knote *kn, long hint);
 
 #define CDEV_MAJOR 7
 static struct dev_ops log_ops = {
-	{ "log", CDEV_MAJOR, 0 },
+	{ "log", 0, 0 },
 	.d_open =	logopen,
 	.d_close =	logclose,
 	.d_read =	logread,
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 409fc2e4df..1e3e9c0d04 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -37,7 +37,6 @@
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/kern/tty_cons.c,v 1.81.2.4 2001/12/17 18:44:41 guido Exp $
- * $DragonFly: src/sys/kern/tty_cons.c,v 1.21 2007/05/07 05:21:41 dillon Exp $
  */
 
 #include "opt_ddb.h"
@@ -72,7 +71,7 @@ static int cnintercept(struct dev_generic_args *ap);
 
 #define	CDEV_MAJOR	0
 static struct dev_ops cn_ops = {
-	{ "console", CDEV_MAJOR, D_TTY },
+	{ "console", 0, D_TTY },
 	.d_open =	cnopen,
 	.d_close =	cnclose,
 	.d_read =	cnread,
@@ -82,7 +81,7 @@ static struct dev_ops cn_ops = {
 };
 
 static struct dev_ops cn_iops = {
-	{ "intercept", CDEV_MAJOR, D_TTY },
+	{ "intercept", 0, D_TTY },
 	.d_default =    cnintercept
 };
 
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 8576b7ca70..9dc486b1bd 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -34,7 +34,6 @@
  *
  *	@(#)tty_pty.c	8.4 (Berkeley) 2/20/95
  * $FreeBSD: src/sys/kern/tty_pty.c,v 1.74.2.4 2002/02/20 19:58:13 dillon Exp $
- * $DragonFly: src/sys/kern/tty_pty.c,v 1.21 2008/08/13 10:29:38 swildner Exp $
  */
 
 /*
@@ -127,9 +126,8 @@ static struct dev_ops ptc98_ops = {
 };
 #endif
 
-#define	CDEV_MAJOR_S	5
 static struct dev_ops pts_ops = {
-	{ "pts", CDEV_MAJOR_S, D_TTY },
+	{ "pts", 0, D_TTY },
 	.d_open =	ptsopen,
 	.d_close =	ptsclose,
 	.d_read =	ptsread,
@@ -141,7 +139,7 @@ static struct dev_ops pts_ops = {
 
 #define	CDEV_MAJOR_C	6
 static struct dev_ops ptc_ops = {
-	{ "ptc", CDEV_MAJOR_C, D_TTY | D_MASTER },
+	{ "ptc", 0, D_TTY | D_MASTER },
 	.d_open =	ptcopen,
 	.d_close =	ptcclose,
 	.d_read =	ptcread,
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index efdeeb85d0..a0cab40037 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -34,7 +34,6 @@
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
  * $FreeBSD: src/sys/kern/tty_tty.c,v 1.30 1999/09/25 18:24:24 phk Exp $
- * $DragonFly: src/sys/kern/tty_tty.c,v 1.19 2007/07/03 17:22:14 dillon Exp $
  */
 
 /*
@@ -67,7 +66,7 @@ static int cttyfilt_write(struct knote *, long);
 
 #define	CDEV_MAJOR	1
 static struct dev_ops ctty_ops = {
-	{ "ctty", CDEV_MAJOR, D_TTY },
+	{ "ctty", 0, D_TTY },
 	.d_open =	cttyopen,
 	.d_close =	cttyclose,
 	.d_read =	cttyread,
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index f54e78c639..5d88214395 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -38,7 +38,6 @@
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
  * $FreeBSD: src/sys/net/bpf.c,v 1.59.2.12 2002/04/14 21:41:48 luigi Exp $
- * $DragonFly: src/sys/net/bpf.c,v 1.50 2008/09/23 11:28:49 sephe Exp $
  */
 
 #include "use_bpf.h"
@@ -141,7 +140,7 @@ static d_kqfilter_t	bpfkqfilter;
 
 #define CDEV_MAJOR 23
 static struct dev_ops bpf_ops = {
-	{ "bpf", CDEV_MAJOR, 0 },
+	{ "bpf", 0, 0 },
 	.d_open =	bpfopen,
 	.d_close =	bpfclose,
 	.d_read =	bpfread,
diff --git a/sys/net/i4b/driver/i4b_ctl.c b/sys/net/i4b/driver/i4b_ctl.c
index 5dff7ccf63..c16522be58 100644
--- a/sys/net/i4b/driver/i4b_ctl.c
+++ b/sys/net/i4b/driver/i4b_ctl.c
@@ -30,7 +30,6 @@
  *	$Id: i4b_ctl.c,v 1.37 2000/05/31 08:04:43 hm Exp $
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_ctl.c,v 1.10.2.3 2001/08/12 16:22:48 hm Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_ctl.c,v 1.14 2006/12/22 23:44:55 swildner Exp $
  *
  *	last edit-date: [Sat Aug 11 18:06:38 2001]
  *
@@ -66,10 +65,8 @@ static	d_open_t	i4bctlopen;
 static	d_close_t	i4bctlclose;
 static	d_ioctl_t	i4bctlioctl;
 
-#define CDEV_MAJOR 55
-
 static struct dev_ops i4bctl_ops = {
-	{ "i4bctl", CDEV_MAJOR, 0 },
+	{ "i4bctl", 0, 0 },
 	.d_open =      i4bctlopen,
 	.d_close =     i4bctlclose,
 	.d_ioctl =     i4bctlioctl,
diff --git a/sys/net/i4b/driver/i4b_rbch.c b/sys/net/i4b/driver/i4b_rbch.c
index c4ec9cf908..6736d96fa5 100644
--- a/sys/net/i4b/driver/i4b_rbch.c
+++ b/sys/net/i4b/driver/i4b_rbch.c
@@ -28,7 +28,6 @@
  *	---------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_rbch.c,v 1.10.2.3 2001/08/12 16:22:48 hm Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_rbch.c,v 1.22 2006/12/22 23:44:55 swildner Exp $
  *
  *	last edit-date: [Sat Aug 11 18:06:57 2001]
  *
@@ -124,10 +123,8 @@ PDEVSTATIC void i4brbchkfilt_detach(struct knote *);
 PDEVSTATIC int i4brbchkfilt_read(struct knote *, long);
 PDEVSTATIC int i4brbchkfilt_write(struct knote *, long);
 
-#define CDEV_MAJOR 57
-
 static struct dev_ops i4brbch_ops = {
-	{ "i4brbch", CDEV_MAJOR, 0 },
+	{ "i4brbch", 0, 0 },
 	.d_open =	i4brbchopen,
 	.d_close =	i4brbchclose,
 	.d_read =	i4brbchread,
diff --git a/sys/net/i4b/driver/i4b_tel.c b/sys/net/i4b/driver/i4b_tel.c
index 2b1638d0b1..54804f54dd 100644
--- a/sys/net/i4b/driver/i4b_tel.c
+++ b/sys/net/i4b/driver/i4b_tel.c
@@ -28,7 +28,6 @@
  *	--------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_tel.c,v 1.10.2.4 2001/12/16 15:12:57 hm Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_tel.c,v 1.15 2006/12/22 23:44:55 swildner Exp $
  *
  *	last edit-date: [Sat Aug 11 18:07:05 2001]
  *
@@ -147,10 +146,8 @@ PDEVSTATIC void i4btelfilt_detach(struct knote *);
 PDEVSTATIC int i4btelfilt_read(struct knote *, long);
 PDEVSTATIC int i4btelfilt_write(struct knote *, long);
 
-#define CDEV_MAJOR 56
-
 static struct dev_ops i4btel_ops = {
-	{ "i4btel", CDEV_MAJOR, 0 },
+	{ "i4btel", 0, 0 },
 	.d_open =	i4btelopen,
 	.d_close =	i4btelclose,
 	.d_read =	i4btelread,
diff --git a/sys/net/i4b/driver/i4b_trace.c b/sys/net/i4b/driver/i4b_trace.c
index dd14c2f668..b5a87a6035 100644
--- a/sys/net/i4b/driver/i4b_trace.c
+++ b/sys/net/i4b/driver/i4b_trace.c
@@ -30,7 +30,6 @@
  *	last edit-date: [Sat Aug 11 18:07:15 2001]
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_trace.c,v 1.9.2.3 2001/08/12 16:22:48 hm Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_trace.c,v 1.17 2006/12/22 23:44:55 swildner Exp $
  *
  *---------------------------------------------------------------------------*/
 
@@ -73,10 +72,8 @@ static d_close_t i4btrcclose;
 static d_read_t i4btrcread;
 static d_ioctl_t i4btrcioctl;
 
-#define CDEV_MAJOR 59
-
 static struct dev_ops i4btrc_ops = {
-	{ "i4btrc", CDEV_MAJOR, 0 },
+	{ "i4btrc", 0, 0 },
 	.d_open =	i4btrcopen,
         .d_close =	i4btrcclose,
         .d_read =	i4btrcread,
diff --git a/sys/net/i4b/layer4/i4b_i4bdrv.c b/sys/net/i4b/layer4/i4b_i4bdrv.c
index 689140cba8..e821360bb7 100644
--- a/sys/net/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/net/i4b/layer4/i4b_i4bdrv.c
@@ -28,7 +28,6 @@
  *	--------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer4/i4b_i4bdrv.c,v 1.11.2.5 2001/12/16 15:12:59 hm Exp $
- * $DragonFly: src/sys/net/i4b/layer4/i4b_i4bdrv.c,v 1.20 2008/01/06 16:55:52 swildner Exp $
  *
  *      last edit-date: [Sat Aug 11 18:08:10 2001]
  *
@@ -91,10 +90,8 @@ PDEVSTATIC void i4bkqfilt_detach(struct knote *);
 PDEVSTATIC int i4bkqfilt_read(struct knote *, long);
 PDEVSTATIC int i4bkqfilt_write(struct knote *, long);
 
-#define CDEV_MAJOR 60
-
 static struct dev_ops i4b_ops = {
-	{ "i4b", CDEV_MAJOR, 0 },
+	{ "i4b", 0, 0 },
 	.d_open =	i4bopen,
 	.d_close =	i4bclose,
 	.d_read =	i4bread,
diff --git a/sys/net/tap/if_tap.c b/sys/net/tap/if_tap.c
index 8424362766..10539bd43c 100644
--- a/sys/net/tap/if_tap.c
+++ b/sys/net/tap/if_tap.c
@@ -32,7 +32,6 @@
 
 /*
  * $FreeBSD: src/sys/net/if_tap.c,v 1.3.2.3 2002/04/14 21:41:48 luigi Exp $
- * $DragonFly: src/sys/net/tap/if_tap.c,v 1.41 2008/09/05 17:03:15 dillon Exp $
  * $Id: if_tap.c,v 0.21 2000/07/23 21:46:02 max Exp $
  */
 
@@ -80,7 +79,6 @@
 #define TAP_PREALLOCATED_UNITS	4
 
 #define CDEV_NAME	"tap"
-#define CDEV_MAJOR	149
 #define TAPDEBUG	if (tapdebug) if_printf
 
 #define TAP		"tap"
@@ -119,7 +117,7 @@ static d_ioctl_t	tapioctl;
 static d_kqfilter_t	tapkqfilter;
 
 static struct dev_ops	tap_ops = {
-	{ CDEV_NAME, CDEV_MAJOR, 0 },
+	{ CDEV_NAME, 0, 0 },
 	.d_open =	tapopen,
 	.d_close =	tapclose,
 	.d_read =	tapread,
diff --git a/sys/net/tun/if_tun.c b/sys/net/tun/if_tun.c
index 6c851c5276..ad4ef23f5b 100644
--- a/sys/net/tun/if_tun.c
+++ b/sys/net/tun/if_tun.c
@@ -14,7 +14,6 @@
  * operation though.
  *
  * $FreeBSD: src/sys/net/if_tun.c,v 1.74.2.8 2002/02/13 00:43:11 dillon Exp $
- * $DragonFly: src/sys/net/tun/if_tun.c,v 1.37 2008/06/05 18:06:32 swildner Exp $
  */
 
 #include "use_tun.h"
@@ -97,9 +96,8 @@ DEVFS_DECLARE_CLONE_BITMAP(tun);
 #define TUN_PREALLOCATED_UNITS	NTUN
 #endif
 
-#define CDEV_MAJOR 52
 static struct dev_ops tun_ops = {
-	{ "tun", CDEV_MAJOR, 0 },
+	{ "tun", 0, 0 },
 	.d_open =	tunopen,
 	.d_close =	tunclose,
 	.d_read =	tunread,
diff --git a/sys/netproto/smb/smb_dev.c b/sys/netproto/smb/smb_dev.c
index 86219eaaf1..c5a9c37ab9 100644
--- a/sys/netproto/smb/smb_dev.c
+++ b/sys/netproto/smb/smb_dev.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netsmb/smb_dev.c,v 1.2.2.1 2001/05/22 08:32:33 bp Exp $
- * $DragonFly: src/sys/netproto/smb/smb_dev.c,v 1.18 2007/05/08 02:31:42 dillon Exp $
  */
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -87,7 +86,7 @@ int smb_dev_queue(struct smb_dev *ndp, struct smb_rq *rqp, int prio);
 */
 
 static struct dev_ops nsmb_ops = {
-	{ NSMB_NAME, NSMB_MAJOR, 0 },
+	{ NSMB_NAME, 0, 0 },
 	.d_open =	nsmb_dev_open,
 	.d_close =	nsmb_dev_close,
 	.d_read =	nsmb_dev_read,
diff --git a/sys/netproto/smb/smb_dev.h b/sys/netproto/smb/smb_dev.h
index 6fb4765369..6ce82228b3 100644
--- a/sys/netproto/smb/smb_dev.h
+++ b/sys/netproto/smb/smb_dev.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netsmb/smb_dev.h,v 1.3.2.1 2001/05/22 08:32:33 bp Exp $
- * $DragonFly: src/sys/netproto/smb/smb_dev.h,v 1.3 2003/08/07 21:17:39 dillon Exp $
  */
 #ifndef _NETSMB_DEV_H_
 #define _NETSMB_DEV_H_
@@ -43,7 +42,6 @@
 #include "smb.h"
 
 #define	NSMB_NAME		"nsmb"
-#define	NSMB_MAJOR		144
 
 #define NSMB_VERMAJ	1
 #define NSMB_VERMIN	3006
diff --git a/sys/platform/pc32/acpica5/acpi_machdep.c b/sys/platform/pc32/acpica5/acpi_machdep.c
index 6985f1d32e..7d1576b4d9 100644
--- a/sys/platform/pc32/acpica5/acpi_machdep.c
+++ b/sys/platform/pc32/acpica5/acpi_machdep.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.20 2004/05/05 19:51:15 njl Exp $
- * $DragonFly: src/sys/platform/pc32/acpica5/acpi_machdep.c,v 1.14 2008/09/29 06:59:45 hasso Exp $
  */
 
 #include <sys/param.h>
@@ -68,9 +67,8 @@ static d_write_t apmwrite;
 static d_ioctl_t apmioctl;
 static d_kqfilter_t apmkqfilter;
 
-#define CDEV_MAJOR 39
 static struct dev_ops apm_ops = {
-	{ "apm", CDEV_MAJOR, 0 },
+	{ "apm", 0, 0 },
         .d_open = apmopen,
         .d_close = apmclose,
 	.d_write = apmwrite,
diff --git a/sys/platform/pc32/apm/apm.c b/sys/platform/pc32/apm/apm.c
index e4d942149a..7a8fef9405 100644
--- a/sys/platform/pc32/apm/apm.c
+++ b/sys/platform/pc32/apm/apm.c
@@ -16,7 +16,6 @@
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
  * $FreeBSD: src/sys/i386/apm/apm.c,v 1.114.2.5 2002/11/02 04:41:50 iwasaki Exp $
- * $DragonFly: src/sys/platform/pc32/apm/apm.c,v 1.21 2006/12/23 00:27:03 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -87,9 +86,8 @@ static void apmfilter_detach(struct knote *);
 static int apmfilter_read(struct knote *, long);
 static int apmfilter_write(struct knote *, long);
 
-#define CDEV_MAJOR 39
 static struct dev_ops apm_ops = {
-	{ "apm", CDEV_MAJOR, 0 },
+	{ "apm", 0, 0 },
 	.d_open =	apmopen,
 	.d_close =	apmclose,
 	.d_write =	apmwrite,
diff --git a/sys/platform/pc32/i386/elan-mmcr.c b/sys/platform/pc32/i386/elan-mmcr.c
index 0dd0fe4113..1e6dad87f2 100644
--- a/sys/platform/pc32/i386/elan-mmcr.c
+++ b/sys/platform/pc32/i386/elan-mmcr.c
@@ -7,7 +7,6 @@
  * ----------------------------------------------------------------------------
  *
  * $FreeBSD: src/sys/i386/i386/elan-mmcr.c,v 1.6.2.1 2002/09/17 22:39:53 sam Exp $
- * $DragonFly: src/sys/platform/pc32/i386/elan-mmcr.c,v 1.10 2007/12/29 13:40:28 swildner Exp $
  * The AMD Elan sc520 is a system-on-chip gadget which is used in embedded
  * kind of things, see www.soekris.com for instance, and it has a few quirks
  * we need to deal with.
@@ -97,7 +96,7 @@ static d_mmap_t elan_mmap;
 
 #define CDEV_MAJOR 100
 static struct dev_ops elan_ops = {
-	{ "elan", CDEV_MAJOR, 0 },
+	{ "elan", 0, 0 },
 	.d_open =	elan_open,
 	.d_close =	elan_close,
 	.d_ioctl =	elan_ioctl,
diff --git a/sys/platform/pc32/i386/perfmon.c b/sys/platform/pc32/i386/perfmon.c
index 55034982c7..6055c4607b 100644
--- a/sys/platform/pc32/i386/perfmon.c
+++ b/sys/platform/pc32/i386/perfmon.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/i386/perfmon.c,v 1.21 1999/09/25 18:24:04 phk Exp $
- * $DragonFly: src/sys/platform/pc32/i386/perfmon.c,v 1.11 2008/05/10 17:24:07 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -62,9 +61,8 @@ static d_close_t	perfmon_close;
 static d_open_t		perfmon_open;
 static d_ioctl_t	perfmon_ioctl;
 
-#define CDEV_MAJOR 2	/* We're really a minor of mem.c */
 static struct dev_ops perfmon_ops = {
-	{ "perfmon", CDEV_MAJOR, 0 },
+	{ "perfmon", 0, 0 },
 	.d_open =	perfmon_open,
 	.d_close =	perfmon_close,
 	.d_ioctl =	perfmon_ioctl,
diff --git a/sys/platform/pc32/isa/asc.c b/sys/platform/pc32/isa/asc.c
index f64614b494..3ff04f3ec4 100644
--- a/sys/platform/pc32/isa/asc.c
+++ b/sys/platform/pc32/isa/asc.c
@@ -35,7 +35,6 @@
  */
 /*
  * $FreeBSD: src/sys/i386/isa/asc.c,v 1.42.2.2 2001/03/01 03:22:39 jlemon Exp $
- * $DragonFly: src/sys/platform/pc32/isa/asc.c,v 1.21 2008/08/02 01:14:43 dillon Exp $
  */
 
 #include "use_asc.h"
@@ -189,10 +188,8 @@ static d_kqfilter_t	asckqfilter;
 static void ascfilter_detach(struct knote *kn);
 static int ascfilter(struct knote *kn, long hint);
 
-#define CDEV_MAJOR 71
-
 static struct dev_ops asc_ops = {
-	{ "asc", CDEV_MAJOR, 0 },
+	{ "asc", 0, 0 },
 	.d_open =	ascopen,
 	.d_close =	ascclose,
 	.d_read =	ascread,
diff --git a/sys/platform/pc64/acpica5/acpi_machdep.c b/sys/platform/pc64/acpica5/acpi_machdep.c
index 33d2ad6d8c..3c15638f6e 100644
--- a/sys/platform/pc64/acpica5/acpi_machdep.c
+++ b/sys/platform/pc64/acpica5/acpi_machdep.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.20 2004/05/05 19:51:15 njl Exp $
- * $DragonFly: src/sys/platform/pc32/acpica5/acpi_machdep.c,v 1.14 2008/09/29 06:59:45 hasso Exp $
  */
 
 #include <sys/param.h>
@@ -64,9 +63,8 @@ static d_write_t apmwrite;
 static d_ioctl_t apmioctl;
 static d_kqfilter_t apmkqfilter;
 
-#define CDEV_MAJOR 39
 static struct dev_ops apm_ops = {
-	{ "apm", CDEV_MAJOR, 0 },
+	{ "apm", 0, 0 },
         .d_open = apmopen,
         .d_close = apmclose,
 	.d_write = apmwrite,
diff --git a/sys/platform/pc64/apm/apm.c b/sys/platform/pc64/apm/apm.c
index 5d2e622ccd..1ab9a636a8 100644
--- a/sys/platform/pc64/apm/apm.c
+++ b/sys/platform/pc64/apm/apm.c
@@ -16,7 +16,6 @@
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
  * $FreeBSD: src/sys/i386/apm/apm.c,v 1.114.2.5 2002/11/02 04:41:50 iwasaki Exp $
- * $DragonFly: src/sys/platform/pc32/apm/apm.c,v 1.21 2006/12/23 00:27:03 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -87,9 +86,8 @@ static void apmfilter_detach(struct knote *);
 static int apmfilter_read(struct knote *, long);
 static int apmfilter_write(struct knote *, long);
 
-#define CDEV_MAJOR 39
 static struct dev_ops apm_ops = {
-	{ "apm", CDEV_MAJOR, 0 },
+	{ "apm", 0, 0 },
 	.d_open =	apmopen,
 	.d_close =	apmclose,
 	.d_write =	apmwrite,
diff --git a/sys/platform/pc64/isa/asc.c b/sys/platform/pc64/isa/asc.c
index d36c34eb38..48a7524f9b 100644
--- a/sys/platform/pc64/isa/asc.c
+++ b/sys/platform/pc64/isa/asc.c
@@ -36,7 +36,6 @@
  */
 /*
  * $FreeBSD: src/sys/i386/isa/asc.c,v 1.42.2.2 2001/03/01 03:22:39 jlemon Exp $
- * $DragonFly: src/sys/platform/pc64/isa/asc.c,v 1.1 2008/08/29 17:07:19 dillon Exp $
  */
 
 #include "use_asc.h"
@@ -188,10 +187,8 @@ static d_kqfilter_t	asckqfilter;
 static void ascfilter_detach(struct knote *kn);
 static int ascfilter(struct knote *kn, long hint);
 
-#define CDEV_MAJOR 71
-
 static struct dev_ops asc_ops = {
-	{ "asc", CDEV_MAJOR, 0 },
+	{ "asc", 0, 0 },
 	.d_open =	ascopen,
 	.d_close =	ascclose,
 	.d_read =	ascread,
diff --git a/sys/platform/vkernel/platform/console.c b/sys/platform/vkernel/platform/console.c
index 36ab336aea..431e7ff310 100644
--- a/sys/platform/vkernel/platform/console.c
+++ b/sys/platform/vkernel/platform/console.c
@@ -33,7 +33,6 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $DragonFly: src/sys/platform/vkernel/platform/console.c,v 1.17 2007/07/02 04:19:14 dillon Exp $
  */
 
 #include <sys/systm.h>
@@ -60,8 +59,6 @@ static struct kqueue_info *kqueue_console_info;
  *
  */
 
-#define CDEV_MAJOR	12	/* steal the same major as /dev/ttyv* */
-
 static int vcons_tty_param(struct tty *tp, struct termios *tio);
 static void vcons_tty_start(struct tty *tp);
 static void vcons_intr(void *tpx, struct intrframe *frame __unused);
@@ -71,7 +68,7 @@ static d_close_t        vcons_close;
 static d_ioctl_t        vcons_ioctl;
 
 static struct dev_ops vcons_ops = {
-	{ "vcons", CDEV_MAJOR, D_TTY },
+	{ "vcons", 0, D_TTY },
 	.d_open =	vcons_open,
 	.d_close =	vcons_close,
 	.d_read =	ttyread,
diff --git a/sys/platform/vkernel64/platform/console.c b/sys/platform/vkernel64/platform/console.c
index 7835e243c4..11f9618368 100644
--- a/sys/platform/vkernel64/platform/console.c
+++ b/sys/platform/vkernel64/platform/console.c
@@ -33,7 +33,6 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $DragonFly: src/sys/platform/vkernel/platform/console.c,v 1.17 2007/07/02 04:19:14 dillon Exp $
  */
 
 #include <sys/systm.h>
@@ -60,8 +59,6 @@ static struct kqueue_info *kqueue_console_info;
  *
  */
 
-#define CDEV_MAJOR	12	/* steal the same major as /dev/ttyv* */
-
 static int vcons_tty_param(struct tty *tp, struct termios *tio);
 static void vcons_tty_start(struct tty *tp);
 static void vcons_intr(void *tpx, struct intrframe *frame __unused);
@@ -71,7 +68,7 @@ static d_close_t        vcons_close;
 static d_ioctl_t        vcons_ioctl;
 
 static struct dev_ops vcons_ops = {
-	{ "vcons", CDEV_MAJOR, D_TTY },
+	{ "vcons", 0, D_TTY },
 	.d_open =	vcons_open,
 	.d_close =	vcons_close,
 	.d_read =	ttyread,
-- 
2.41.0