Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci Cleanup interrupt establish error messages. Do n...
details: https://anonhg.NetBSD.org/src/rev/2a7946d97dc6
branches: trunk
changeset: 749319:2a7946d97dc6
user: njoly <njoly%NetBSD.org@localhost>
date: Thu Nov 26 15:17:08 2009 +0000
description:
Cleanup interrupt establish error messages. Do not mix
aprint_error/aprint_normal/printf calls for a single line.
diffstat:
sys/dev/pci/aac_pci.c | 8 ++++----
sys/dev/pci/adv_pci.c | 8 ++++----
sys/dev/pci/adw_pci.c | 8 ++++----
sys/dev/pci/ahc_pci.c | 8 ++++----
sys/dev/pci/amr.c | 8 ++++----
sys/dev/pci/artsata.c | 8 ++++----
sys/dev/pci/atppc_puc.c | 10 +++++-----
sys/dev/pci/auacer.c | 8 ++++----
sys/dev/pci/auich.c | 8 ++++----
sys/dev/pci/auixp.c | 8 ++++----
sys/dev/pci/autri.c | 8 ++++----
sys/dev/pci/auvia.c | 8 ++++----
sys/dev/pci/bha_pci.c | 8 ++++----
sys/dev/pci/btvmei.c | 8 ++++----
sys/dev/pci/cac_pci.c | 8 ++++----
sys/dev/pci/ciss_pci.c | 8 ++++----
sys/dev/pci/cmpci.c | 8 ++++----
sys/dev/pci/com_puc.c | 8 ++++----
sys/dev/pci/cs4280.c | 8 ++++----
sys/dev/pci/cz.c | 8 ++++----
sys/dev/pci/dpt_pci.c | 8 ++++----
sys/dev/pci/emuxki.c | 8 ++++----
sys/dev/pci/esa.c | 8 ++++----
sys/dev/pci/esm.c | 8 ++++----
sys/dev/pci/eso.c | 8 ++++----
sys/dev/pci/fms.c | 8 ++++----
sys/dev/pci/fwlynx_pci.c | 8 ++++----
sys/dev/pci/gcscaudio.c | 8 ++++----
sys/dev/pci/hifn7751.c | 8 ++++----
sys/dev/pci/iavc_pci.c | 8 ++++----
sys/dev/pci/icp_pci.c | 8 ++++----
sys/dev/pci/if_an_pci.c | 8 ++++----
sys/dev/pci/if_bce.c | 8 ++++----
sys/dev/pci/if_de.c | 8 ++++----
sys/dev/pci/if_dge.c | 8 ++++----
sys/dev/pci/if_en_pci.c | 8 ++++----
sys/dev/pci/if_ep_pci.c | 8 ++++----
sys/dev/pci/if_epic_pci.c | 8 ++++----
sys/dev/pci/if_esh_pci.c | 8 ++++----
sys/dev/pci/if_fpa.c | 8 ++++----
sys/dev/pci/if_fxp_pci.c | 8 ++++----
sys/dev/pci/if_gem_pci.c | 8 ++++----
sys/dev/pci/if_kse.c | 10 +++++-----
sys/dev/pci/if_mtd_pci.c | 11 +++++------
sys/dev/pci/if_nfe.c | 8 ++++----
sys/dev/pci/if_ntwoc_pci.c | 10 +++++-----
sys/dev/pci/if_ral_pci.c | 6 +++---
sys/dev/pci/if_rtk_pci.c | 8 ++++----
sys/dev/pci/if_sf_pci.c | 10 +++++-----
sys/dev/pci/if_sip.c | 10 +++++-----
sys/dev/pci/if_sk.c | 7 ++++---
sys/dev/pci/if_ste.c | 10 +++++-----
sys/dev/pci/if_ti.c | 10 +++++-----
sys/dev/pci/if_vr.c | 11 +++++------
sys/dev/pci/if_wi_pci.c | 10 +++++-----
sys/dev/pci/if_wm.c | 8 ++++----
sys/dev/pci/ifpci.c | 12 ++++++------
sys/dev/pci/ifpci2.c | 12 ++++++------
sys/dev/pci/isic_pci.c | 10 +++++-----
sys/dev/pci/iwic_pci.c | 10 +++++-----
sys/dev/pci/mlx_pci.c | 8 ++++----
sys/dev/pci/mly.c | 10 +++++-----
sys/dev/pci/neo.c | 10 +++++-----
sys/dev/pci/oboe.c | 10 +++++-----
sys/dev/pci/pdcsata.c | 8 ++++----
sys/dev/pci/satalink.c | 8 ++++----
sys/dev/pci/siop_pci_common.c | 8 ++++----
sys/dev/pci/sv.c | 8 ++++----
sys/dev/pci/svwsata.c | 8 ++++----
sys/dev/pci/ubsec.c | 8 ++++----
sys/dev/pci/uhci_pci.c | 8 ++++----
sys/dev/pci/universe_pci.c | 8 ++++----
sys/dev/pci/voodoofb.c | 10 +++++-----
sys/dev/pci/yds.c | 10 +++++-----
74 files changed, 316 insertions(+), 317 deletions(-)
diffs (truncated from 2246 to 300 lines):
diff -r 0f4bafd88f4d -r 2a7946d97dc6 sys/dev/pci/aac_pci.c
--- a/sys/dev/pci/aac_pci.c Thu Nov 26 14:29:09 2009 +0000
+++ b/sys/dev/pci/aac_pci.c Thu Nov 26 15:17:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: aac_pci.c,v 1.29 2009/05/12 08:22:59 cegger Exp $ */
+/* $NetBSD: aac_pci.c,v 1.30 2009/11/26 15:17:08 njoly Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.29 2009/05/12 08:22:59 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.30 2009/11/26 15:17:08 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -516,8 +516,8 @@
if (sc->sc_ih == NULL) {
aprint_error("couldn't establish interrupt");
if (intrstr != NULL)
- aprint_normal(" at %s", intrstr);
- aprint_normal("\n");
+ aprint_error(" at %s", intrstr);
+ aprint_error("\n");
goto bail_out;
}
state++;
diff -r 0f4bafd88f4d -r 2a7946d97dc6 sys/dev/pci/adv_pci.c
--- a/sys/dev/pci/adv_pci.c Thu Nov 26 14:29:09 2009 +0000
+++ b/sys/dev/pci/adv_pci.c Thu Nov 26 15:17:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_pci.c,v 1.25 2009/05/06 10:34:32 cegger Exp $ */
+/* $NetBSD: adv_pci.c,v 1.26 2009/11/26 15:17:08 njoly Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.25 2009/05/06 10:34:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.26 2009/11/26 15:17:08 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -226,8 +226,8 @@
if (sc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev, "couldn't 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(&sc->sc_dev, "interrupting at %s\n", intrstr);
diff -r 0f4bafd88f4d -r 2a7946d97dc6 sys/dev/pci/adw_pci.c
--- a/sys/dev/pci/adw_pci.c Thu Nov 26 14:29:09 2009 +0000
+++ b/sys/dev/pci/adw_pci.c Thu Nov 26 15:17:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: adw_pci.c,v 1.24 2009/05/06 10:34:32 cegger Exp $ */
+/* $NetBSD: adw_pci.c,v 1.25 2009/11/26 15:17:08 njoly Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.24 2009/05/06 10:34:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.25 2009/11/26 15:17:08 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -179,8 +179,8 @@
if (sc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev, "couldn't 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(&sc->sc_dev, "interrupting at %s\n", intrstr);
diff -r 0f4bafd88f4d -r 2a7946d97dc6 sys/dev/pci/ahc_pci.c
--- a/sys/dev/pci/ahc_pci.c Thu Nov 26 14:29:09 2009 +0000
+++ b/sys/dev/pci/ahc_pci.c Thu Nov 26 15:17:08 2009 +0000
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: ahc_pci.c,v 1.67 2009/09/02 11:10:37 tsutsui Exp $
+ * $Id: ahc_pci.c,v 1.68 2009/11/26 15:17:08 njoly Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $
*
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.67 2009/09/02 11:10:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.68 2009/11/26 15:17:08 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -957,8 +957,8 @@
aprint_error_dev(ahc->sc_dev,
"couldn't establish interrupt\n");
if (intrstr != NULL)
- printf(" at %s", intrstr);
- printf("\n");
+ aprint_error(" at %s", intrstr);
+ aprint_error("\n");
ahc_free(ahc);
return;
}
diff -r 0f4bafd88f4d -r 2a7946d97dc6 sys/dev/pci/amr.c
--- a/sys/dev/pci/amr.c Thu Nov 26 14:29:09 2009 +0000
+++ b/sys/dev/pci/amr.c Thu Nov 26 15:17:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amr.c,v 1.52 2009/05/12 08:22:59 cegger Exp $ */
+/* $NetBSD: amr.c,v 1.53 2009/11/26 15:17:08 njoly Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.52 2009/05/12 08:22:59 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.53 2009/11/26 15:17:08 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -329,8 +329,8 @@
if (amr->amr_ih == NULL) {
aprint_error("can't establish interrupt");
if (intrstr != NULL)
- aprint_normal(" at %s", intrstr);
- aprint_normal("\n");
+ aprint_error(" at %s", intrstr);
+ aprint_error("\n");
amr_teardown(amr);
return;
}
diff -r 0f4bafd88f4d -r 2a7946d97dc6 sys/dev/pci/artsata.c
--- a/sys/dev/pci/artsata.c Thu Nov 26 14:29:09 2009 +0000
+++ b/sys/dev/pci/artsata.c Thu Nov 26 15:17:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: artsata.c,v 1.18 2008/04/28 20:23:54 martin Exp $ */
+/* $NetBSD: artsata.c,v 1.19 2009/11/26 15:17:08 njoly Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: artsata.c,v 1.18 2008/04/28 20:23:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: artsata.c,v 1.19 2009/11/26 15:17:08 njoly Exp $");
#include "opt_pciide.h"
@@ -148,8 +148,8 @@
aprint_error_dev(sc->sc_wdcdev.sc_atac.atac_dev,
"couldn't establish native-PCI interrupt");
if (intrstr != NULL)
- aprint_normal(" at %s", intrstr);
- aprint_normal("\n");
+ aprint_error(" at %s", intrstr);
+ aprint_error("\n");
goto bad;
}
}
diff -r 0f4bafd88f4d -r 2a7946d97dc6 sys/dev/pci/atppc_puc.c
--- a/sys/dev/pci/atppc_puc.c Thu Nov 26 14:29:09 2009 +0000
+++ b/sys/dev/pci/atppc_puc.c Thu Nov 26 15:17:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_puc.c,v 1.10 2008/04/28 20:23:54 martin Exp $ */
+/* $NetBSD: atppc_puc.c,v 1.11 2009/11/26 15:17:08 njoly Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "opt_atppc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_puc.c,v 1.10 2008/04/28 20:23:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_puc.c,v 1.11 2009/11/26 15:17:08 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -116,11 +116,11 @@
if (sc->sc_ieh == 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);
sc->sc_has |= ATPPC_HAS_INTR;
/* setup DMA hooks */
diff -r 0f4bafd88f4d -r 2a7946d97dc6 sys/dev/pci/auacer.c
--- a/sys/dev/pci/auacer.c Thu Nov 26 14:29:09 2009 +0000
+++ b/sys/dev/pci/auacer.c Thu Nov 26 15:17:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auacer.c,v 1.24 2009/05/12 08:22:59 cegger Exp $ */
+/* $NetBSD: auacer.c,v 1.25 2009/11/26 15:17:08 njoly Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.24 2009/05/12 08:22:59 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.25 2009/11/26 15:17:08 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -290,8 +290,8 @@
if (sc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev, "can't 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(&sc->sc_dev, "interrupting at %s\n", intrstr);
diff -r 0f4bafd88f4d -r 2a7946d97dc6 sys/dev/pci/auich.c
--- a/sys/dev/pci/auich.c Thu Nov 26 14:29:09 2009 +0000
+++ b/sys/dev/pci/auich.c Thu Nov 26 15:17:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auich.c,v 1.131 2009/11/12 19:39:26 dyoung Exp $ */
+/* $NetBSD: auich.c,v 1.132 2009/11/26 15:17:08 njoly Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.131 2009/11/12 19:39:26 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.132 2009/11/26 15:17:08 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -540,8 +540,8 @@
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "can't 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 0f4bafd88f4d -r 2a7946d97dc6 sys/dev/pci/auixp.c
--- a/sys/dev/pci/auixp.c Thu Nov 26 14:29:09 2009 +0000
+++ b/sys/dev/pci/auixp.c Thu Nov 26 15:17:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auixp.c,v 1.31 2009/05/06 09:25:14 cegger Exp $ */
+/* $NetBSD: auixp.c,v 1.32 2009/11/26 15:17:08 njoly Exp $ */
/*
* Copyright (c) 2004, 2005 Reinoud Zandijk <reinoud%netbsd.org@localhost>
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.31 2009/05/06 09:25:14 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.32 2009/11/26 15:17:08 njoly Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -1169,8 +1169,8 @@
if (sc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev, "can't 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(&sc->sc_dev, "interrupting at %s\n", intrstr);
diff -r 0f4bafd88f4d -r 2a7946d97dc6 sys/dev/pci/autri.c
--- a/sys/dev/pci/autri.c Thu Nov 26 14:29:09 2009 +0000
+++ b/sys/dev/pci/autri.c Thu Nov 26 15:17:08 2009 +0000
Home |
Main Index |
Thread Index |
Old Index