diff options
author | phk <phk@FreeBSD.org> | 2001-03-26 12:41:29 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2001-03-26 12:41:29 +0000 |
commit | c47745e97713190e3da533b9d29b74b2ceee96f1 (patch) | |
tree | 6046a3f7ba5778a5ad444f6594e905caeb70379f /sys/dev | |
parent | a95c2d852912f59fb8e69c1a812dabcaf04cfc23 (diff) | |
download | FreeBSD-src-c47745e97713190e3da533b9d29b74b2ceee96f1.zip FreeBSD-src-c47745e97713190e3da533b9d29b74b2ceee96f1.tar.gz |
Send the remains (such as I have located) of "block major numbers" to
the bit-bucket.
Diffstat (limited to 'sys/dev')
63 files changed, 2 insertions, 74 deletions
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c index 0d025e3..ccffb18e 100644 --- a/sys/dev/aac/aac.c +++ b/sys/dev/aac/aac.c @@ -163,7 +163,6 @@ static struct cdevsw aac_cdevsw = { nodump, /* dump */ nopsize, /* psize */ 0, /* flags */ - -1, /* bmaj */ }; /******************************************************************************** diff --git a/sys/dev/aac/aac_disk.c b/sys/dev/aac/aac_disk.c index 6319027..09bd971 100644 --- a/sys/dev/aac/aac_disk.c +++ b/sys/dev/aac/aac_disk.c @@ -74,7 +74,6 @@ static struct cdevsw aac_disk_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* bmaj */ -1 }; devclass_t aac_disk_devclass; diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c index a9d85bb..6419635 100644 --- a/sys/dev/agp/agp.c +++ b/sys/dev/agp/agp.c @@ -82,7 +82,6 @@ static struct cdevsw agp_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* bmaj */ -1 }; static devclass_t agp_devclass; diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c index 5fe07e2..e17f38a 100644 --- a/sys/dev/amr/amr.c +++ b/sys/dev/amr/amr.c @@ -78,7 +78,6 @@ static struct cdevsw amr_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ 254 /* XXX magic no-bdev */ }; /* diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c index c2038fe..bd9c729 100644 --- a/sys/dev/amr/amr_disk.c +++ b/sys/dev/amr/amr_disk.c @@ -76,7 +76,6 @@ static struct cdevsw amrd_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* bmaj */ 254 }; static devclass_t amrd_devclass; diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c index eda4e74..5fa8e08 100644 --- a/sys/dev/asr/asr.c +++ b/sys/dev/asr/asr.c @@ -546,7 +546,6 @@ STATIC struct cdevsw asr_cdevsw = { nodump, /* dump */ nopsize, /* psize */ 0, /* flags */ - -1 /* bmaj */ }; #ifdef ASR_MEASURE_PERFORMANCE diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index a6fb7b7..4b04a31 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -69,7 +69,6 @@ static struct cdevsw ata_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; /* prototypes */ diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index b3b2b3a..060ebac 100644 --- a/sys/dev/ata/ata-disk.c +++ b/sys/dev/ata/ata-disk.c @@ -69,7 +69,6 @@ static struct cdevsw ad_cdevsw = { /* dump */ addump, /* psize */ nopsize, /* flags */ D_DISK, - /* bmaj */ 30 }; static struct cdevsw addisk_cdevsw; diff --git a/sys/dev/ata/ata-raid.c b/sys/dev/ata/ata-raid.c index 0dfa263..30cbd76 100644 --- a/sys/dev/ata/ata-raid.c +++ b/sys/dev/ata/ata-raid.c @@ -64,7 +64,6 @@ static struct cdevsw ar_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* bmaj */ -1 }; static struct cdevsw ardisk_cdevsw; diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index 6b6bab3..d2a1591 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -66,7 +66,6 @@ static struct cdevsw acd_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK | D_TRACKCLOSE, - /* bmaj */ 31 }; /* prototypes */ diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c index 9a8bc44..6905a29 100644 --- a/sys/dev/ata/atapi-fd.c +++ b/sys/dev/ata/atapi-fd.c @@ -62,7 +62,6 @@ static struct cdevsw afd_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK | D_TRACKCLOSE, - /* bmaj */ 32 }; static struct cdevsw afddisk_cdevsw; diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c index c22fb8c..a5f3f42 100644 --- a/sys/dev/ata/atapi-tape.c +++ b/sys/dev/ata/atapi-tape.c @@ -62,7 +62,6 @@ static struct cdevsw ast_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TAPE | D_TRACKCLOSE, - /* bmaj */ -1 }; /* prototypes */ diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index 6b670ea..a756073 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -338,7 +338,6 @@ static struct cdevsw psm_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; /* debug message level */ diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c index 0f8110f..f916864 100644 --- a/sys/dev/bktr/bktr_os.c +++ b/sys/dev/bktr/bktr_os.c @@ -249,7 +249,6 @@ static struct cdevsw bktr_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; DRIVER_MODULE(bktr, pci, bktr_driver, bktr_devclass, 0, 0); diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index 13964a3..57067f2 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/ccd.c @@ -167,7 +167,6 @@ static d_psize_t ccdsize; #define NCCDFREEHIWAT 16 #define CDEV_MAJOR 74 -#define BDEV_MAJOR 21 static struct cdevsw ccd_cdevsw = { /* open */ ccdopen, @@ -183,7 +182,6 @@ static struct cdevsw ccd_cdevsw = { /* dump */ ccddump, /* psize */ ccdsize, /* flags */ D_DISK, - /* bmaj */ BDEV_MAJOR }; /* called during module initialization */ diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 7d7671d..f5161a6 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/cy.c @@ -406,7 +406,6 @@ static struct cdevsw sio_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY | D_KQFILTER, - /* bmaj */ -1, /* kqfilter */ ttykqfilter, }; diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index 7d7671d..f5161a6 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.c @@ -406,7 +406,6 @@ static struct cdevsw sio_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY | D_KQFILTER, - /* bmaj */ -1, /* kqfilter */ ttykqfilter, }; diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c index 818aad7..c675485 100644 --- a/sys/dev/dgb/dgb.c +++ b/sys/dev/dgb/dgb.c @@ -256,7 +256,6 @@ static struct cdevsw dgb_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY | D_KQFILTER, - /* bmaj */ -1, /* kqfilter */ ttykqfilter, }; diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c index 0e0bcfe..2951e96 100644 --- a/sys/dev/dgb/dgm.c +++ b/sys/dev/dgb/dgm.c @@ -259,7 +259,6 @@ static struct cdevsw dgm_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY | D_KQFILTER, - /* bmaj */ -1, /* kqfilter */ ttykqfilter, }; diff --git a/sys/dev/dpt/dpt_control.c b/sys/dev/dpt/dpt_control.c index ef3ddf2..15dab41 100644 --- a/sys/dev/dpt/dpt_control.c +++ b/sys/dev/dpt/dpt_control.c @@ -106,7 +106,6 @@ static struct cdevsw dpt_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; static struct buf *dpt_inbuf[DPT_MAX_ADAPTERS]; diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c index c729e0f..3d92761 100644 --- a/sys/dev/fb/fb.c +++ b/sys/dev/fb/fb.c @@ -372,7 +372,6 @@ static struct cdevsw fb_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 04bffb0..4b7789b 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -315,7 +315,6 @@ static d_ioctl_t fdioctl; static d_strategy_t fdstrategy; #define CDEV_MAJOR 9 -#define BDEV_MAJOR 2 static struct cdevsw fd_cdevsw = { /* open */ Fdopen, @@ -331,7 +330,6 @@ static struct cdevsw fd_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* bmaj */ BDEV_MAJOR }; static int diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c index d7d7def..f50e031 100644 --- a/sys/dev/hfa/fore_load.c +++ b/sys/dev/hfa/fore_load.c @@ -550,7 +550,6 @@ static struct cdevsw fore_cdev = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c index 257cc30..f307c68 100644 --- a/sys/dev/ida/ida_disk.c +++ b/sys/dev/ida/ida_disk.c @@ -65,7 +65,6 @@ 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 cdevsw id_cdevsw = { @@ -82,7 +81,6 @@ static struct cdevsw id_cdevsw = { /* dump */ idad_dump, /* psize */ nopsize, /* flags */ D_DISK, - /* bmaj */ IDAD_BDEV_MAJOR }; static devclass_t idad_devclass; diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c index e8e5f96..1f07f25 100644 --- a/sys/dev/iicbus/iic.c +++ b/sys/dev/iicbus/iic.c @@ -103,7 +103,6 @@ static struct cdevsw iic_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; /* diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c index b12e201..55ff62c 100644 --- a/sys/dev/joy/joy.c +++ b/sys/dev/joy/joy.c @@ -93,7 +93,6 @@ static struct cdevsw joy_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; devclass_t joy_devclass; diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c index 777e6f1..8ebba7e 100644 --- a/sys/dev/kbd/kbd.c +++ b/sys/dev/kbd/kbd.c @@ -435,7 +435,6 @@ static struct cdevsw kbd_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; int diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index 837b4ce..6f8c0f7 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -209,9 +209,6 @@ static d_psize_t mcdsize; static d_strategy_t mcdstrategy; #define CDEV_MAJOR 29 -#define BDEV_MAJOR 7 - - static struct cdevsw mcd_cdevsw = { /* open */ mcdopen, @@ -227,7 +224,6 @@ static struct cdevsw mcd_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* bmaj */ BDEV_MAJOR }; #define mcd_put(port,byte) outb(port,byte) diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c index 291618a..fe2dc31 100644 --- a/sys/dev/mlx/mlx.c +++ b/sys/dev/mlx/mlx.c @@ -69,7 +69,6 @@ static struct cdevsw mlx_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; devclass_t mlx_devclass; diff --git a/sys/dev/mlx/mlx_disk.c b/sys/dev/mlx/mlx_disk.c index 3f19514..365ac45 100644 --- a/sys/dev/mlx/mlx_disk.c +++ b/sys/dev/mlx/mlx_disk.c @@ -58,7 +58,6 @@ static d_close_t mlxd_close; static d_strategy_t mlxd_strategy; static d_ioctl_t mlxd_ioctl; -#define MLXD_BDEV_MAJOR 27 #define MLXD_CDEV_MAJOR 131 static struct cdevsw mlxd_cdevsw = { @@ -75,7 +74,6 @@ static struct cdevsw mlxd_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* bmaj */ MLXD_BDEV_MAJOR }; devclass_t mlxd_devclass; diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c index 9268574..7d54682 100644 --- a/sys/dev/mse/mse.c +++ b/sys/dev/mse/mse.c @@ -153,7 +153,6 @@ static struct cdevsw mse_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; static void mseintr __P((void *)); diff --git a/sys/dev/nmdm/nmdm.c b/sys/dev/nmdm/nmdm.c index d006ee0..b38f60e 100644 --- a/sys/dev/nmdm/nmdm.c +++ b/sys/dev/nmdm/nmdm.c @@ -80,7 +80,6 @@ static struct cdevsw nmdm_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* bmaj */ -1 }; #define BUFSIZ 100 /* Chunk size iomoved to/from user */ diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c index 4ec97a9..f7eaa77 100644 --- a/sys/dev/null/null.c +++ b/sys/dev/null/null.c @@ -63,7 +63,6 @@ static struct cdevsw null_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; static struct cdevsw zero_cdevsw = { @@ -80,7 +79,6 @@ static struct cdevsw zero_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_MMAP_ANON, - /* bmaj */ -1 }; static void *zbuf; diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c index 1699029..d8debc3 100644 --- a/sys/dev/pci/pci_user.c +++ b/sys/dev/pci/pci_user.c @@ -82,7 +82,6 @@ struct cdevsw pcicdev = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; static int diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c index 076b808..20fc816 100644 --- a/sys/dev/ppbus/lpt.c +++ b/sys/dev/ppbus/lpt.c @@ -202,7 +202,6 @@ static struct cdevsw lpt_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; static int diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c index 91a516d..2db7f96 100644 --- a/sys/dev/ppbus/pcfclock.c +++ b/sys/dev/ppbus/pcfclock.c @@ -81,7 +81,6 @@ static struct cdevsw pcfclock_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; #ifndef PCFCLOCK_MAX_RETRIES diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c index 9c7eca6..5e851f0 100644 --- a/sys/dev/ppbus/ppi.c +++ b/sys/dev/ppbus/ppi.c @@ -103,7 +103,6 @@ static struct cdevsw ppi_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; #ifdef PERIPH_1284 diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c index b8560a7..c79d965 100644 --- a/sys/dev/ppbus/pps.c +++ b/sys/dev/ppbus/pps.c @@ -72,7 +72,6 @@ static struct cdevsw pps_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; static void diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c index 4a6aeb8..252662d 100644 --- a/sys/dev/random/randomdev.c +++ b/sys/dev/random/randomdev.c @@ -75,7 +75,6 @@ static struct cdevsw random_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; static void random_kthread(void *); diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c index 6c1ca5d..15076fb 100644 --- a/sys/dev/rc/rc.c +++ b/sys/dev/rc/rc.c @@ -108,7 +108,6 @@ static struct cdevsw rc_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY | D_KQFILTER, - /* bmaj */ -1, /* kqfilter */ ttykqfilter, }; diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c index d3a3399..f9391f3 100644 --- a/sys/dev/rp/rp.c +++ b/sys/dev/rp/rp.c @@ -583,7 +583,6 @@ struct cdevsw rp_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* bmaj */ -1 }; static int rp_num_ports_open = 0; diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c index fd3a54d..1ab5afa 100644 --- a/sys/dev/scd/scd.c +++ b/sys/dev/scd/scd.c @@ -185,7 +185,7 @@ static d_ioctl_t scdioctl; static d_strategy_t scdstrategy; #define CDEV_MAJOR 45 -#define BDEV_MAJOR 16 + static struct cdevsw scd_cdevsw = { /* open */ scdopen, /* close */ scdclose, @@ -200,7 +200,6 @@ static struct cdevsw scd_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, - /* bmaj */ BDEV_MAJOR }; diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index 615c6d8..0f42692 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -130,7 +130,6 @@ static struct cdevsw si_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY | D_KQFILTER, - /* bmaj */ -1, /* kqfilter */ ttykqfilter, }; diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 3f56ab9..d1a876b 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -389,7 +389,6 @@ static struct cdevsw sio_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY | D_KQFILTER, - /* bmaj */ -1, /* kqfilter */ ttykqfilter, }; diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c index 3b40de1..7eac3cc 100644 --- a/sys/dev/smbus/smb.c +++ b/sys/dev/smbus/smb.c @@ -104,7 +104,6 @@ static struct cdevsw smb_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; /* diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c index 3744928..442eafd 100644 --- a/sys/dev/snp/snp.c +++ b/sys/dev/snp/snp.c @@ -52,7 +52,6 @@ static struct cdevsw snp_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index ce272e0..ad62804 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -83,7 +83,6 @@ static struct cdevsw midi_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; /* diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c index 34995d6..d8beba2 100644 --- a/sys/dev/sound/midi/sequencer.c +++ b/sys/dev/sound/midi/sequencer.c @@ -158,7 +158,6 @@ static struct cdevsw seq_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; static TAILQ_HEAD(,_seqdev_info) seq_info; diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 0cf266f..a3039e3 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -58,7 +58,6 @@ static struct cdevsw snd_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TRACKCLOSE, - /* bmaj */ -1 }; /* diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c index 776a9c6..ad9dc3e 100644 --- a/sys/dev/speaker/spkr.c +++ b/sys/dev/speaker/spkr.c @@ -42,7 +42,6 @@ static struct cdevsw spkr_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; static MALLOC_DEFINE(M_SPKR, "spkr", "Speaker buffer"); diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c index 8f279da..b1ccc35 100644 --- a/sys/dev/streams/streams.c +++ b/sys/dev/streams/streams.c @@ -118,7 +118,6 @@ static struct cdevsw streams_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; struct streams_softc { diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index af7fd94..6d08400 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -212,7 +212,6 @@ static struct cdevsw sc_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* bmaj */ -1 }; int diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c index 34f914b..60082e0 100644 --- a/sys/dev/syscons/sysmouse.c +++ b/sys/dev/syscons/sysmouse.c @@ -61,7 +61,6 @@ static struct cdevsw sm_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY, - /* bmaj */ -1 }; /* local variables */ diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c index abee7e9..7ffee6f 100644 --- a/sys/dev/tdfx/tdfx_pci.c +++ b/sys/dev/tdfx/tdfx_pci.c @@ -117,7 +117,6 @@ static struct cdevsw tdfx_cdev = { nodump, /* dump */ nopsize, /* size */ 0, /* flags (no set flags) */ - -1 /* bmaj (no block dev) */ }; static int diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index d318f13..7e935d7 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -147,7 +147,6 @@ Static struct cdevsw ugen_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; #endif diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index f413c3b..d34329e 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -152,7 +152,6 @@ Static struct cdevsw uhid_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; #endif diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index 78eb779..d4b9649 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -138,7 +138,6 @@ Static struct cdevsw ulpt_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; #endif diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c index b715c5e..6d4aa16 100644 --- a/sys/dev/usb/umodem.c +++ b/sys/dev/usb/umodem.c @@ -172,7 +172,6 @@ static struct cdevsw umodem_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY | D_KQFILTER, - /* bmaj */ -1, /* kqfilter */ ttykqfilter, }; #endif diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c index 1632782..c3ac612 100644 --- a/sys/dev/usb/ums.c +++ b/sys/dev/usb/ums.c @@ -158,7 +158,6 @@ Static struct cdevsw ums_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; USB_DECLARE_DRIVER(ums); diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index 5382ec0..338871a 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -147,7 +147,6 @@ struct cdevsw usb_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; #endif diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 18b7aeb..d3ff321 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -220,7 +220,6 @@ Static struct cdevsw uscanner_cdevsw = { /* dump */ nodump, /* psize */ nopsize, /* flags */ 0, - /* bmaj */ -1 }; #endif diff --git a/sys/dev/vinum/vinum.c b/sys/dev/vinum/vinum.c index 4b7089c..366a822 100644 --- a/sys/dev/vinum/vinum.c +++ b/sys/dev/vinum/vinum.c @@ -58,7 +58,7 @@ struct cdevsw vinum_cdevsw = vinumopen, vinumclose, physread, physwrite, vinumioctl, seltrue, nommap, vinumstrategy, "vinum", VINUM_CDEV_MAJOR, vinumdump, vinumsize, - D_DISK, VINUM_BDEV_MAJOR + D_DISK }; /* Called by main() during pseudo-device attachment. */ diff --git a/sys/dev/vinum/vinumvar.h b/sys/dev/vinum/vinumvar.h index 44a9c8b..eb3e4c2 100644 --- a/sys/dev/vinum/vinumvar.h +++ b/sys/dev/vinum/vinumvar.h @@ -59,7 +59,6 @@ enum constants { MINVINUMSLICE = 1048576, /* minimum size of a slice */ VINUM_CDEV_MAJOR = 91, /* major number for character device */ - VINUM_BDEV_MAJOR = 25, /* and legacy major number for block device */ ROUND_ROBIN_READPOL = -1, /* round robin read policy */ @@ -131,8 +130,6 @@ enum constants { << (VINUM_PLEX_SHIFT + VINUM_VOL_WIDTH)) \ | (t << VINUM_TYPE_SHIFT) ) -#define VINUMRBDEV(d,t) makedev (VINUM_BDEV_MAJOR, VINUMRMINOR (d, t)) - /* extract device type */ #define DEVTYPE(x) ((minor (x) >> VINUM_TYPE_SHIFT) & 7) |