From 6125e1b5518305f01726b57b15e178d0c7fc312e Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Wed, 4 Jan 1995 00:47:53 +0000
Subject: [PATCH] Fix oversight in previous.

---
 sys/arch/i386/isa/ast.c   | 5 ++---
 sys/arch/i386/isa/boca.c  | 5 ++---
 sys/arch/i386/isa/com.c   | 3 +--
 sys/arch/i386/isa/rtfps.c | 5 ++---
 sys/dev/ic/com.c          | 3 +--
 sys/dev/isa/ast.c         | 5 ++---
 sys/dev/isa/boca.c        | 5 ++---
 sys/dev/isa/com.c         | 3 +--
 sys/dev/isa/rtfps.c       | 5 ++---
 9 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/sys/arch/i386/isa/ast.c b/sys/arch/i386/isa/ast.c
index d88dc61eb9a2..093cf693b8d3 100644
--- a/sys/arch/i386/isa/ast.c
+++ b/sys/arch/i386/isa/ast.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ast.c,v 1.15 1995/01/03 22:38:54 mycroft Exp $	*/
+/*	$NetBSD: ast.c,v 1.16 1995/01/04 00:47:53 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Charles Hannum.  All rights reserved.
@@ -82,10 +82,9 @@ astsubmatch(parent, match, aux)
 	void *match, *aux;
 {
 	struct ast_softc *sc = (void *)parent;
-	struct device *self = match;
+	struct cfdata *cf = match;
 	struct isa_attach_args *ia = aux;
 	struct ast_attach_args *aa = ia->ia_aux;
-	struct cfdata *cf = self->dv_cfdata;
 
 	if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != aa->aa_slave)
 		return (0);
diff --git a/sys/arch/i386/isa/boca.c b/sys/arch/i386/isa/boca.c
index 862e4de69737..51adfbdb7016 100644
--- a/sys/arch/i386/isa/boca.c
+++ b/sys/arch/i386/isa/boca.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: boca.c,v 1.2 1995/01/03 22:38:55 mycroft Exp $	*/
+/*	$NetBSD: boca.c,v 1.3 1995/01/04 00:47:54 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Charles Hannum.  All rights reserved.
@@ -82,10 +82,9 @@ bocasubmatch(parent, match, aux)
 	void *match, *aux;
 {
 	struct boca_softc *sc = (void *)parent;
-	struct device *self = match;
+	struct cfdata *cf = match;
 	struct isa_attach_args *ia = aux;
 	struct boca_attach_args *ba = ia->ia_aux;
-	struct cfdata *cf = self->dv_cfdata;
 
 	if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != ba->ba_slave)
 		return (0);
diff --git a/sys/arch/i386/isa/com.c b/sys/arch/i386/isa/com.c
index 044e5237cc7f..12dc663c1917 100644
--- a/sys/arch/i386/isa/com.c
+++ b/sys/arch/i386/isa/com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com.c,v 1.43 1995/01/03 01:30:28 mycroft Exp $	*/
+/*	$NetBSD: com.c,v 1.44 1995/01/04 00:47:56 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -164,7 +164,6 @@ comprobe(parent, match, aux)
 	struct device *parent;
 	void *match, *aux;
 {
-	struct com_softc *sc = match;
 	struct isa_attach_args *ia = aux;
 	int iobase = ia->ia_iobase;
 
diff --git a/sys/arch/i386/isa/rtfps.c b/sys/arch/i386/isa/rtfps.c
index 4b506cdbf7bc..2c6d98993434 100644
--- a/sys/arch/i386/isa/rtfps.c
+++ b/sys/arch/i386/isa/rtfps.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtfps.c,v 1.10 1995/01/03 22:38:56 mycroft Exp $	*/
+/*	$NetBSD: rtfps.c,v 1.11 1995/01/04 00:47:58 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Charles Hannum.  All rights reserved.
@@ -83,10 +83,9 @@ rtfpssubmatch(parent, match, aux)
 	void *match, *aux;
 {
 	struct rtfps_softc *sc = (void *)parent;
-	struct device *self = match;
+	struct cfdata *cf = match;
 	struct isa_attach_args *ia = aux;
 	struct rtfps_attach_args *ra = ia->ia_aux;
-	struct cfdata *cf = self->dv_cfdata;
 
 	if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != ra->ra_slave)
 		return (0);
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 044e5237cc7f..12dc663c1917 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com.c,v 1.43 1995/01/03 01:30:28 mycroft Exp $	*/
+/*	$NetBSD: com.c,v 1.44 1995/01/04 00:47:56 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -164,7 +164,6 @@ comprobe(parent, match, aux)
 	struct device *parent;
 	void *match, *aux;
 {
-	struct com_softc *sc = match;
 	struct isa_attach_args *ia = aux;
 	int iobase = ia->ia_iobase;
 
diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c
index d88dc61eb9a2..093cf693b8d3 100644
--- a/sys/dev/isa/ast.c
+++ b/sys/dev/isa/ast.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ast.c,v 1.15 1995/01/03 22:38:54 mycroft Exp $	*/
+/*	$NetBSD: ast.c,v 1.16 1995/01/04 00:47:53 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Charles Hannum.  All rights reserved.
@@ -82,10 +82,9 @@ astsubmatch(parent, match, aux)
 	void *match, *aux;
 {
 	struct ast_softc *sc = (void *)parent;
-	struct device *self = match;
+	struct cfdata *cf = match;
 	struct isa_attach_args *ia = aux;
 	struct ast_attach_args *aa = ia->ia_aux;
-	struct cfdata *cf = self->dv_cfdata;
 
 	if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != aa->aa_slave)
 		return (0);
diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c
index 862e4de69737..51adfbdb7016 100644
--- a/sys/dev/isa/boca.c
+++ b/sys/dev/isa/boca.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: boca.c,v 1.2 1995/01/03 22:38:55 mycroft Exp $	*/
+/*	$NetBSD: boca.c,v 1.3 1995/01/04 00:47:54 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Charles Hannum.  All rights reserved.
@@ -82,10 +82,9 @@ bocasubmatch(parent, match, aux)
 	void *match, *aux;
 {
 	struct boca_softc *sc = (void *)parent;
-	struct device *self = match;
+	struct cfdata *cf = match;
 	struct isa_attach_args *ia = aux;
 	struct boca_attach_args *ba = ia->ia_aux;
-	struct cfdata *cf = self->dv_cfdata;
 
 	if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != ba->ba_slave)
 		return (0);
diff --git a/sys/dev/isa/com.c b/sys/dev/isa/com.c
index 044e5237cc7f..12dc663c1917 100644
--- a/sys/dev/isa/com.c
+++ b/sys/dev/isa/com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com.c,v 1.43 1995/01/03 01:30:28 mycroft Exp $	*/
+/*	$NetBSD: com.c,v 1.44 1995/01/04 00:47:56 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -164,7 +164,6 @@ comprobe(parent, match, aux)
 	struct device *parent;
 	void *match, *aux;
 {
-	struct com_softc *sc = match;
 	struct isa_attach_args *ia = aux;
 	int iobase = ia->ia_iobase;
 
diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c
index 4b506cdbf7bc..2c6d98993434 100644
--- a/sys/dev/isa/rtfps.c
+++ b/sys/dev/isa/rtfps.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtfps.c,v 1.10 1995/01/03 22:38:56 mycroft Exp $	*/
+/*	$NetBSD: rtfps.c,v 1.11 1995/01/04 00:47:58 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1995 Charles Hannum.  All rights reserved.
@@ -83,10 +83,9 @@ rtfpssubmatch(parent, match, aux)
 	void *match, *aux;
 {
 	struct rtfps_softc *sc = (void *)parent;
-	struct device *self = match;
+	struct cfdata *cf = match;
 	struct isa_attach_args *ia = aux;
 	struct rtfps_attach_args *ra = ia->ia_aux;
-	struct cfdata *cf = self->dv_cfdata;
 
 	if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != ra->ra_slave)
 		return (0);