Use scsiprint (and remove scsiprint from esp.c).

diff --git a/sys/arch/mac68k/dev/esp.c b/sys/arch/mac68k/dev/esp.c
index 10cf87f..37864c4 100644 (file)
--- a/sys/arch/mac68k/dev/esp.c
+++ b/sys/arch/mac68k/dev/esp.c
@@ -283,15 +283,6 @@ espmatch(parent, vcf, aux)
 #endif
 }
 
-int scsiprint __P((void *, const char *));
-int
-scsiprint(aux, name)
-       void *aux;
-       const char *name;
-{
-       return (UNCONF);
-}
-
 /*
  * Attach this instance, and then all the sub-devices
  */

diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c
index fd25b26..25a854a 100644 (file)
--- a/sys/arch/mac68k/dev/ncr5380.c
+++ b/sys/arch/mac68k/dev/ncr5380.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ncr5380.c,v 1.10 1996/11/23 21:45:53 kstailey Exp $   */
+/*     $OpenBSD: ncr5380.c,v 1.11 1997/01/18 17:58:38 briggs Exp $     */
 /*     $NetBSD: ncr5380.c,v 1.31 1996/06/23 15:02:58 briggs Exp $      */
 
 /*
@@ -197,7 +197,6 @@ extern __inline__ void finish_req(SC_REQ *reqp)
 /*
  * Auto config stuff....
  */
-int    ncr_cprint __P((void *auxp, const char *));
 void   ncr_attach __P((struct device *, struct device *, void *));
 int    ncr_match __P((struct device *, void *, void *));
 
@@ -274,21 +273,9 @@ void               *auxp;
        /*
         * attach all scsi units on us
         */
-       config_found(dp, &sc->sc_link, ncr_cprint);
+       config_found(dp, &sc->sc_link, scsiprint);
 }
 
-/*
- * print diag if name is NULL else just extra
- */
-int
-ncr_cprint(auxp, name)
-void   *auxp;
-const char *name;
-{
-       if (name == NULL)
-               return (UNCONF);
-       return (QUIET);
-}
 /*
  * End of auto config stuff....
  */

diff --git a/sys/arch/mac68k/dev/sbc.c b/sys/arch/mac68k/dev/sbc.c
index 6421fdf..b9110fe 100644 (file)
--- a/sys/arch/mac68k/dev/sbc.c
+++ b/sys/arch/mac68k/dev/sbc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sbc.c,v 1.5 1996/11/23 21:45:55 kstailey Exp $        */
+/*     $OpenBSD: sbc.c,v 1.6 1997/01/18 17:58:37 briggs Exp $  */
 /*     $NetBSD: sbc.c,v 1.9 1996/06/19 01:47:28 scottr Exp $   */
 
 /*
@@ -348,17 +348,7 @@ sbc_attach(parent, self, args)
         */
        ncr5380_init(ncr_sc);
        ncr5380_reset_scsibus(ncr_sc);
-       config_found(self, &(ncr_sc->sc_link), sbc_print);
-}
-
-static int
-sbc_print(aux, name)
-       void *aux;
-       const char *name;
-{
-       if (name != NULL)
-               printf("%s: scsibus ", name);
-       return UNCONF;
+       config_found(self, &(ncr_sc->sc_link), scsiprint);
 }
 
 static void