From e16931059ac25ec87e584c1154a3cace3ce772ca Mon Sep 17 00:00:00 2001
From: kstailey <kstailey@openbsd.org>
Date: Thu, 16 Jan 1997 19:47:47 +0000
Subject: [PATCH] ahaprint() & btprint() -> scsiprint()

---
 sys/dev/isa/aha.c | 16 ++--------------
 sys/dev/isa/bt.c  | 14 +-------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 2368691d303..2f544c80add 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aha.c,v 1.27 1996/11/23 21:46:35 kstailey Exp $	*/
+/*	$OpenBSD: aha.c,v 1.28 1997/01/16 19:47:47 kstailey Exp $	*/
 /*	$NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $	*/
 
 #undef AHADIAG
@@ -172,7 +172,6 @@ struct scsi_device aha_dev = {
 
 int	ahaprobe __P((struct device *, void *, void *));
 void	ahaattach __P((struct device *, struct device *, void *));
-int	ahaprint __P((void *, const char *));
 
 struct cfattach aha_ca = {
 	sizeof(struct aha_softc), ahaprobe, ahaattach
@@ -354,17 +353,6 @@ ahaprobe(parent, match, aux)
 	return 1;
 }
 
-int
-ahaprint(aux, name)
-	void *aux;
-	const char *name;
-{
-
-	if (name != NULL)
-		printf("%s: scsibus ", name);
-	return UNCONF;
-}
-
 /*
  * Attach all the sub-devices we can find
  */
@@ -406,7 +394,7 @@ ahaattach(parent, self, aux)
 	/*
 	 * ask the adapter what subunits are present
 	 */
-	config_found(self, &sc->sc_link, ahaprint);
+	config_found(self, &sc->sc_link, scsiprint);
 }
 
 integrate void
diff --git a/sys/dev/isa/bt.c b/sys/dev/isa/bt.c
index 8820f0eee8d..4840c08a7f9 100644
--- a/sys/dev/isa/bt.c
+++ b/sys/dev/isa/bt.c
@@ -182,7 +182,6 @@ struct scsi_device bt_dev = {
 
 int	btprobe __P((struct device *, void *, void *));
 void	btattach __P((struct device *, struct device *, void *));
-int	btprint __P((void *, const char *));
 
 struct cfattach bt_ca = {
 	sizeof(struct bt_softc), btprobe, btattach
@@ -356,17 +355,6 @@ btprobe(parent, match, aux)
 	return 1;
 }
 
-int
-btprint(aux, name)
-	void *aux;
-	const char *name;
-{
-
-	if (name != NULL)
-		printf("%s: scsibus ", name);
-	return UNCONF;
-}
-
 /*
  * Attach all the sub-devices we can find
  */
@@ -408,7 +396,7 @@ btattach(parent, self, aux)
 	/*
 	 * ask the adapter what subunits are present
 	 */
-	config_found(self, &sc->sc_link, btprint);
+	config_found(self, &sc->sc_link, scsiprint);
 }
 
 integrate void
-- 
2.20.1