Module Name: src
Committed By: njoly
Date: Fri Dec 4 11:13:05 UTC 2009
Modified Files:
src/sys/arch/alpha/sableio: com_sableio.c fdc_sableio.c pckbc_sableio.c
src/sys/arch/i386/pci: gcscehci.c
src/sys/dev/eisa: ahb.c ahc_eisa.c bha_eisa.c if_ep_eisa.c if_fea.c
if_tlp_eisa.c uha_eisa.c
src/sys/dev/pci/hdaudio: hdaudio_pci.c
Log Message:
Cleanup interrupt establish error messages. Do not mix
aprint_error/aprint_normal/printf calls for a single line.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/sableio/com_sableio.c \
src/sys/arch/alpha/sableio/fdc_sableio.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/alpha/sableio/pckbc_sableio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/pci/gcscehci.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/eisa/ahb.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/eisa/ahc_eisa.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/eisa/bha_eisa.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/eisa/if_ep_eisa.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/eisa/if_fea.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/eisa/if_tlp_eisa.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/eisa/uha_eisa.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/hdaudio/hdaudio_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/sableio/com_sableio.c
diff -u src/sys/arch/alpha/sableio/com_sableio.c:1.9 src/sys/arch/alpha/sableio/com_sableio.c:1.10
--- src/sys/arch/alpha/sableio/com_sableio.c:1.9 Sat Nov 21 05:35:41 2009
+++ src/sys/arch/alpha/sableio/com_sableio.c Fri Dec 4 11:13:04 2009
@@ -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);
Index: src/sys/arch/alpha/sableio/fdc_sableio.c
diff -u src/sys/arch/alpha/sableio/fdc_sableio.c:1.9 src/sys/arch/alpha/sableio/fdc_sableio.c:1.10
--- src/sys/arch/alpha/sableio/fdc_sableio.c:1.9 Mon Apr 28 20:23:12 2008
+++ src/sys/arch/alpha/sableio/fdc_sableio.c Fri Dec 4 11:13:04 2009
@@ -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);
Index: src/sys/arch/alpha/sableio/pckbc_sableio.c
diff -u src/sys/arch/alpha/sableio/pckbc_sableio.c:1.8 src/sys/arch/alpha/sableio/pckbc_sableio.c:1.9
--- src/sys/arch/alpha/sableio/pckbc_sableio.c:1.8 Mon Apr 28 20:23:12 2008
+++ src/sys/arch/alpha/sableio/pckbc_sableio.c Fri Dec 4 11:13:04 2009
@@ -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",
Index: src/sys/arch/i386/pci/gcscehci.c
diff -u src/sys/arch/i386/pci/gcscehci.c:1.5 src/sys/arch/i386/pci/gcscehci.c:1.6
--- src/sys/arch/i386/pci/gcscehci.c:1.5 Mon May 4 12:15:51 2009
+++ src/sys/arch/i386/pci/gcscehci.c Fri Dec 4 11:13:04 2009
@@ -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);
Index: src/sys/dev/eisa/ahb.c
diff -u src/sys/dev/eisa/ahb.c:1.57 src/sys/dev/eisa/ahb.c:1.58
--- src/sys/dev/eisa/ahb.c:1.57 Mon Nov 23 02:13:45 2009
+++ src/sys/dev/eisa/ahb.c Fri Dec 4 11:13:04 2009
@@ -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);
/*
Index: src/sys/dev/eisa/ahc_eisa.c
diff -u src/sys/dev/eisa/ahc_eisa.c:1.37 src/sys/dev/eisa/ahc_eisa.c:1.38
--- src/sys/dev/eisa/ahc_eisa.c:1.37 Tue May 5 09:51:23 2009
+++ src/sys/dev/eisa/ahc_eisa.c Fri Dec 4 11:13:04 2009
@@ -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);
/*
Index: src/sys/dev/eisa/bha_eisa.c
diff -u src/sys/dev/eisa/bha_eisa.c:1.33 src/sys/dev/eisa/bha_eisa.c:1.34
--- src/sys/dev/eisa/bha_eisa.c:1.33 Tue May 12 14:21:32 2009
+++ src/sys/dev/eisa/bha_eisa.c Fri Dec 4 11:13:04 2009
@@ -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);
}
Index: src/sys/dev/eisa/if_ep_eisa.c
diff -u src/sys/dev/eisa/if_ep_eisa.c:1.40 src/sys/dev/eisa/if_ep_eisa.c:1.41
--- src/sys/dev/eisa/if_ep_eisa.c:1.40 Sat Jan 31 13:54:10 2009
+++ src/sys/dev/eisa/if_ep_eisa.c Fri Dec 4 11:13:04 2009
@@ -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);
}
Index: src/sys/dev/eisa/if_fea.c
diff -u src/sys/dev/eisa/if_fea.c:1.41 src/sys/dev/eisa/if_fea.c:1.42
--- src/sys/dev/eisa/if_fea.c:1.41 Tue May 12 14:21:32 2009
+++ src/sys/dev/eisa/if_fea.c Fri Dec 4 11:13:04 2009
@@ -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 <m...@3am-software.com>
@@ -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);
Index: src/sys/dev/eisa/if_tlp_eisa.c
diff -u src/sys/dev/eisa/if_tlp_eisa.c:1.22 src/sys/dev/eisa/if_tlp_eisa.c:1.23
--- src/sys/dev/eisa/if_tlp_eisa.c:1.22 Fri Apr 17 10:20:32 2009
+++ src/sys/dev/eisa/if_tlp_eisa.c Fri Dec 4 11:13:04 2009
@@ -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 @@
if (esc->sc_ih == NULL) {
aprint_error_dev(self, "unable to 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(self),
- intrstr);
+ aprint_normal_dev(self, "interrupting at %s\n", intrstr);
/*
* Finish off the attach.
Index: src/sys/dev/eisa/uha_eisa.c
diff -u src/sys/dev/eisa/uha_eisa.c:1.32 src/sys/dev/eisa/uha_eisa.c:1.33
--- src/sys/dev/eisa/uha_eisa.c:1.32 Mon Nov 23 02:13:45 2009
+++ src/sys/dev/eisa/uha_eisa.c Fri Dec 4 11:13:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uha_eisa.c,v 1.32 2009/11/23 02:13:45 rmind Exp $ */
+/* $NetBSD: uha_eisa.c,v 1.33 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: uha_eisa.c,v 1.32 2009/11/23 02:13:45 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.33 2009/12/04 11:13:04 njoly Exp $");
#include "opt_ddb.h"
@@ -147,11 +147,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);
/* Save function pointers for later use. */
sc->start_mbox = u24_start_mbox;
Index: src/sys/dev/pci/hdaudio/hdaudio_pci.c
diff -u src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.2 src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.3
--- src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.2 Sun Sep 6 17:33:53 2009
+++ src/sys/dev/pci/hdaudio/hdaudio_pci.c Fri Dec 4 11:13:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio_pci.c,v 1.2 2009/09/06 17:33:53 sborrill Exp $ */
+/* $NetBSD: hdaudio_pci.c,v 1.3 2009/12/04 11:13:05 njoly Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <supp...@precedence.co.uk>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.2 2009/09/06 17:33:53 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.3 2009/12/04 11:13:05 njoly Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -144,8 +144,8 @@
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr)
- 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);
