3 files changed, 11 insertions, 11 deletions

diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 7ecf9e814228..82414fe317a3 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.115 1999/05/06 22:16:19 peter Exp $
+ *	$Id: autoconf.c,v 1.116 1999/05/07 10:10:21 phk Exp $
  */
 
 /*
@@ -153,7 +153,7 @@ find_cdrom_root()
 			if (try_cdrom[j].major >= nblkdev)
 				continue;
 			rootdev = makedev(try_cdrom[j].major, i * 8);
-			bd = bdevsw(major(rootdev));
+			bd = bdevsw(rootdev);
 			if (bd == NULL || bd->d_open == NULL)
 				continue;
 			if (bootverbose)
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index 954012518cf3..32b181ddd527 100644
--- a/sys/i386/i386/cons.c
+++ b/sys/i386/i386/cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.63 1999/04/27 12:21:03 phk Exp $
+ *	$Id: cons.c,v 1.64 1999/04/28 10:52:04 dt Exp $
  */
 
 #include "opt_devfs.h"
@@ -158,7 +158,7 @@ cninit_finish()
 	/*
 	 * Hook the open and close functions.
 	 */
-	cdp = cdevsw[major(cn_tab->cn_dev)];
+	cdp = devsw(cn_tab->cn_dev);
 	cn_phys_close = cdp->d_close;
 	cdp->d_close = cnclose;
 	cn_phys_open = cdp->d_open;
@@ -178,7 +178,7 @@ cnuninit(void)
 	/*
 	 * Unhook the open and close functions.
 	 */
-	cdp = cdevsw[major(cn_tab->cn_dev)];
+	cdp = devsw(cn_tab->cn_dev);
 	cdp->d_close = cn_phys_close;
 	cn_phys_close = NULL;
 	cdp->d_open = cn_phys_open;
@@ -321,7 +321,7 @@ cnread(dev, uio, flag)
 	if ((cn_tab == NULL) || cn_mute)
 		return (0);
 	dev = cn_tab->cn_dev;
-	return ((*cdevsw[major(dev)]->d_read)(dev, uio, flag));
+	return ((*devsw(dev)->d_read)(dev, uio, flag));
 }
 
 static int
@@ -338,7 +338,7 @@ cnwrite(dev, uio, flag)
 		dev = constty->t_dev;
 	else
 		dev = cn_tab->cn_dev;
-	return ((*cdevsw[major(dev)]->d_write)(dev, uio, flag));
+	return ((*devsw(dev)->d_write)(dev, uio, flag));
 }
 
 static int
@@ -365,7 +365,7 @@ cnioctl(dev, cmd, data, flag, p)
 		return (0);
 	}
 	dev = cn_tab->cn_dev;
-	return ((*cdevsw[major(dev)]->d_ioctl)(dev, cmd, data, flag, p));
+	return ((*devsw(dev)->d_ioctl)(dev, cmd, data, flag, p));
 }
 
 static int
@@ -379,7 +379,7 @@ cnpoll(dev, events, p)
 
 	dev = cn_tab->cn_dev;
 
-	return ((*cdevsw[major(dev)]->d_poll)(dev, events, p));
+	return ((*devsw(dev)->d_poll)(dev, events, p));
 }
 
 int
diff --git a/sys/i386/linux/linux_file.c b/sys/i386/linux/linux_file.c
index 907e6b8bba00..e357e159cd84 100644
--- a/sys/i386/linux/linux_file.c
+++ b/sys/i386/linux/linux_file.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_file.c,v 1.23 1999/01/10 23:15:35 eivind Exp $
+ *  $Id: linux_file.c,v 1.24 1999/05/06 18:44:20 peter Exp $
  */
 
 #include "opt_compat.h"
@@ -306,7 +306,7 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args)
 	if ((error = VOP_GETATTR(vp, &va, p->p_ucred, p)))
 	    return error;
 
-	d_tty = cdevsw[major(va.va_rdev)]->d_devtotty;
+	d_tty = devsw(va.va_rdev)->d_devtotty;
 	if (!d_tty || (!(tp = (*d_tty)(va.va_rdev))))
 	    return EINVAL;
 	if (args->cmd == LINUX_F_GETOWN) {