[src/trunk]: src/sys Cleanup interrupt establish error messages. Do not mix

[njoly <njoly%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1c8fb7d6b81d
branches:  trunk
changeset: 749605:1c8fb7d6b81d
user:      njoly <njoly%NetBSD.org@localhost>
date:      Fri Dec 04 11:13:04 2009 +0000

description:
Cleanup interrupt establish error messages. Do not mix
aprint_error/aprint_normal/printf calls for a single line.

diffstat:

 sys/arch/alpha/sableio/com_sableio.c   |   8 ++++----
 sys/arch/alpha/sableio/fdc_sableio.c   |   8 ++++----
 sys/arch/alpha/sableio/pckbc_sableio.c |   8 ++++----
 sys/arch/i386/pci/gcscehci.c           |   8 ++++----
 sys/dev/eisa/ahb.c                     |  10 +++++-----
 sys/dev/eisa/ahc_eisa.c                |  10 +++++-----
 sys/dev/eisa/bha_eisa.c                |  10 +++++-----
 sys/dev/eisa/if_ep_eisa.c              |  11 +++++------
 sys/dev/eisa/if_fea.c                  |   8 ++++----
 sys/dev/eisa/if_tlp_eisa.c             |  11 +++++------
 sys/dev/eisa/uha_eisa.c                |  10 +++++-----
 sys/dev/pci/hdaudio/hdaudio_pci.c      |   8 ++++----
 12 files changed, 54 insertions(+), 56 deletions(-)

diffs (truncated from 378 to 300 lines):

diff -r b5b42bcce9f3 -r 1c8fb7d6b81d sys/arch/alpha/sableio/com_sableio.c
--- a/sys/arch/alpha/sableio/com_sableio.c      Fri Dec 04 10:42:39 2009 +0000
+++ b/sys/arch/alpha/sableio/com_sableio.c      Fri Dec 04 11:13:04 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: com_sableio.c,v 1.9 2009/11/21 05:35:41 rmind Exp $ */
+/* $NetBSD: com_sableio.c,v 1.10 2009/12/04 11:13:04 njoly Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: com_sableio.c,v 1.9 2009/11/21 05:35:41 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_sableio.c,v 1.10 2009/12/04 11:13:04 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -111,8 +111,8 @@
        if (ssc->sc_ih == NULL) {
                aprint_error_dev(self, "unable to establish interrupt");
                if (intrstr != NULL)
-                       aprint_normal(" at %s", intrstr);
-               aprint_normal("\n");
+                       aprint_error(" at %s", intrstr);
+               aprint_error("\n");
                return;
        }
        aprint_normal_dev(self, "interrupting at %s\n", intrstr);
diff -r b5b42bcce9f3 -r 1c8fb7d6b81d sys/arch/alpha/sableio/fdc_sableio.c
--- a/sys/arch/alpha/sableio/fdc_sableio.c      Fri Dec 04 10:42:39 2009 +0000
+++ b/sys/arch/alpha/sableio/fdc_sableio.c      Fri Dec 04 11:13:04 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_sableio.c,v 1.9 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: fdc_sableio.c,v 1.10 2009/12/04 11:13:04 njoly Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: fdc_sableio.c,v 1.9 2008/04/28 20:23:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_sableio.c,v 1.10 2009/12/04 11:13:04 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -118,8 +118,8 @@
        if (fdc->sc_ih == NULL) {
                aprint_error_dev(self, "unable to establish interrupt");
                if (intrstr != NULL)
-                       aprint_normal(" at %s", intrstr);
-               aprint_normal("\n");
+                       aprint_error(" at %s", intrstr);
+               aprint_error("\n");
                return;
        }
        aprint_normal_dev(self, "interrupting at %s\n", intrstr);
diff -r b5b42bcce9f3 -r 1c8fb7d6b81d sys/arch/alpha/sableio/pckbc_sableio.c
--- a/sys/arch/alpha/sableio/pckbc_sableio.c    Fri Dec 04 10:42:39 2009 +0000
+++ b/sys/arch/alpha/sableio/pckbc_sableio.c    Fri Dec 04 11:13:04 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_sableio.c,v 1.8 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: pckbc_sableio.c,v 1.9 2009/12/04 11:13:04 njoly Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pckbc_sableio.c,v 1.8 2008/04/28 20:23:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_sableio.c,v 1.9 2009/12/04 11:13:04 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -144,8 +144,8 @@
                    "unable to establish interrupt for %s slot",
                    pckbc_slot_names[slot]);
                if (intrstr != NULL)
-                       aprint_normal(" at %s", intrstr);
-               aprint_normal("\n");
+                       aprint_error(" at %s", intrstr);
+               aprint_error("\n");
                return;
        }
        aprint_normal_dev(sc->sc_dv, "%s slot interrupting at %s\n",
diff -r b5b42bcce9f3 -r 1c8fb7d6b81d sys/arch/i386/pci/gcscehci.c
--- a/sys/arch/i386/pci/gcscehci.c      Fri Dec 04 10:42:39 2009 +0000
+++ b/sys/arch/i386/pci/gcscehci.c      Fri Dec 04 11:13:04 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscehci.c,v 1.5 2009/05/04 12:15:51 cegger Exp $ */
+/* $NetBSD: gcscehci.c,v 1.6 2009/12/04 11:13:04 njoly Exp $ */
 
 /*
  * Copyright (c) 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.5 2009/05/04 12:15:51 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.6 2009/12/04 11:13:04 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -141,8 +141,8 @@
        if (sc->sc_ih == NULL) {
                aprint_error("%s: couldn't establish interrupt", devname);
                if (intrstr != NULL)
-                       aprint_normal(" at %s", intrstr);
-               aprint_normal("\n");
+                       aprint_error(" at %s", intrstr);
+               aprint_error("\n");
                return;
        }
        aprint_normal("%s: interrupting at %s\n", devname, intrstr);
diff -r b5b42bcce9f3 -r 1c8fb7d6b81d sys/dev/eisa/ahb.c
--- a/sys/dev/eisa/ahb.c        Fri Dec 04 10:42:39 2009 +0000
+++ b/sys/dev/eisa/ahb.c        Fri Dec 04 11:13:04 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ahb.c,v 1.57 2009/11/23 02:13:45 rmind Exp $   */
+/*     $NetBSD: ahb.c,v 1.58 2009/12/04 11:13:04 njoly Exp $   */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.57 2009/11/23 02:13:45 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.58 2009/12/04 11:13:04 njoly Exp $");
 
 #include "opt_ddb.h"
 
@@ -257,12 +257,12 @@
        if (sc->sc_ih == NULL) {
                aprint_error_dev(&sc->sc_dev, "couldn't establish interrupt");
                if (intrstr != NULL)
-                       printf(" at %s", intrstr);
-               printf("\n");
+                       aprint_error(" at %s", intrstr);
+               aprint_error("\n");
                return;
        }
        if (intrstr != NULL)
-               printf("%s: interrupting at %s\n", device_xname(&sc->sc_dev),
+               aprint_normal_dev(&sc->sc_dev, "interrupting at %s\n",
                    intrstr);
 
        /*
diff -r b5b42bcce9f3 -r 1c8fb7d6b81d sys/dev/eisa/ahc_eisa.c
--- a/sys/dev/eisa/ahc_eisa.c   Fri Dec 04 10:42:39 2009 +0000
+++ b/sys/dev/eisa/ahc_eisa.c   Fri Dec 04 11:13:04 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ahc_eisa.c,v 1.37 2009/05/05 09:51:23 cegger Exp $     */
+/*     $NetBSD: ahc_eisa.c,v 1.38 2009/12/04 11:13:04 njoly Exp $      */
 
 /*
  * Product specific probe and attach routines for:
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_eisa.c,v 1.37 2009/05/05 09:51:23 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_eisa.c,v 1.38 2009/12/04 11:13:04 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -172,12 +172,12 @@
                aprint_error_dev(ahc->sc_dev, "couldn't establish %s interrupt",
                    intrtypestr);
                if (intrstr != NULL)
-                       printf(" at %s", intrstr);
-               printf("\n");
+                       aprint_error(" at %s", intrstr);
+               aprint_error("\n");
                goto free_io;
        }
        if (intrstr != NULL)
-               printf("%s: %s interrupting at %s\n", device_xname(ahc->sc_dev),
+               aprint_normal_dev(ahc->sc_dev, "%s interrupting at %s\n",
                       intrtypestr, intrstr);
 
        /*
diff -r b5b42bcce9f3 -r 1c8fb7d6b81d sys/dev/eisa/bha_eisa.c
--- a/sys/dev/eisa/bha_eisa.c   Fri Dec 04 10:42:39 2009 +0000
+++ b/sys/dev/eisa/bha_eisa.c   Fri Dec 04 11:13:04 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bha_eisa.c,v 1.33 2009/05/12 14:21:32 cegger Exp $     */
+/*     $NetBSD: bha_eisa.c,v 1.34 2009/12/04 11:13:04 njoly Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.33 2009/05/12 14:21:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.34 2009/12/04 11:13:04 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -184,11 +184,11 @@
        if (sc->sc_ih == NULL) {
                aprint_error_dev(&sc->sc_dev, "couldn't establish interrupt");
                if (intrstr != NULL)
-                       printf(" at %s", intrstr);
-               printf("\n");
+                       aprint_error(" at %s", intrstr);
+               aprint_error("\n");
                return;
        }
-       printf("%s: interrupting at %s\n", device_xname(&sc->sc_dev), intrstr);
+       aprint_normal_dev(&sc->sc_dev, "interrupting at %s\n", intrstr);
 
        bha_attach(sc);
 }
diff -r b5b42bcce9f3 -r 1c8fb7d6b81d sys/dev/eisa/if_ep_eisa.c
--- a/sys/dev/eisa/if_ep_eisa.c Fri Dec 04 10:42:39 2009 +0000
+++ b/sys/dev/eisa/if_ep_eisa.c Fri Dec 04 11:13:04 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ep_eisa.c,v 1.40 2009/01/31 13:54:10 martin Exp $   */
+/*     $NetBSD: if_ep_eisa.c,v 1.41 2009/12/04 11:13:04 njoly Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_eisa.c,v 1.40 2009/01/31 13:54:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_eisa.c,v 1.41 2009/12/04 11:13:04 njoly Exp $");
 
 #include "opt_inet.h"
 #include "bpfilter.h"
@@ -266,13 +266,12 @@
        if (sc->sc_ih == NULL) {
                aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
                if (intrstr != NULL)
-                       printf(" at %s", intrstr);
-               printf("\n");
+                       aprint_error(" at %s", intrstr);
+               aprint_error("\n");
                return;
        }
        if (intrstr != NULL)
-               printf("%s: interrupting at %s\n", device_xname(sc->sc_dev),
-                   intrstr);
+               aprint_normal_dev(sc->sc_dev, "interrupting at %s\n", intrstr);
 
        epconfig(sc, eep->eep_chipset, NULL);
 }
diff -r b5b42bcce9f3 -r 1c8fb7d6b81d sys/dev/eisa/if_fea.c
--- a/sys/dev/eisa/if_fea.c     Fri Dec 04 10:42:39 2009 +0000
+++ b/sys/dev/eisa/if_fea.c     Fri Dec 04 11:13:04 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_fea.c,v 1.41 2009/05/12 14:21:32 cegger Exp $       */
+/*     $NetBSD: if_fea.c,v 1.42 2009/12/04 11:13:04 njoly Exp $        */
 
 /*-
  * Copyright (c) 1995, 1996 Matt Thomas <matt%3am-software.com@localhost>
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.41 2009/05/12 14:21:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.42 2009/12/04 11:13:04 njoly Exp $");
 
 #include "opt_inet.h"
 
@@ -517,8 +517,8 @@
     if (sc->sc_ih == NULL) {
        aprint_error_dev(&sc->sc_dev, "couldn't establish interrupt");
        if (intrstr != NULL)
-           printf(" at %s", intrstr);
-       printf("\n");
+           aprint_error(" at %s", intrstr);
+       aprint_error("\n");
        return;
     }
     sc->sc_ats = shutdownhook_establish((void (*)(void *)) pdq_hwreset, sc->sc_pdq);
diff -r b5b42bcce9f3 -r 1c8fb7d6b81d sys/dev/eisa/if_tlp_eisa.c
--- a/sys/dev/eisa/if_tlp_eisa.c        Fri Dec 04 10:42:39 2009 +0000
+++ b/sys/dev/eisa/if_tlp_eisa.c        Fri Dec 04 11:13:04 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tlp_eisa.c,v 1.22 2009/04/17 10:20:32 cegger Exp $  */
+/*     $NetBSD: if_tlp_eisa.c,v 1.23 2009/12/04 11:13:04 njoly Exp $   */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_eisa.c,v 1.22 2009/04/17 10:20:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_eisa.c,v 1.23 2009/12/04 11:13:04 njoly Exp $");
 
 #include "opt_inet.h"
 #include "bpfilter.h"
@@ -275,13 +275,12 @@