summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/macppc/macppc/db_disasm.c6
-rw-r--r--sys/arch/macppc/macppc/mainbus.c5
-rw-r--r--sys/dev/ata/ata.c4
-rw-r--r--sys/dev/eisa/if_fea.c4
-rw-r--r--sys/dev/ic/aac.c6
-rw-r--r--sys/dev/ic/adw.c6
-rw-r--r--sys/dev/isa/ess_isapnp.c4
-rw-r--r--sys/dev/isa/i82365_isa.c4
-rw-r--r--sys/dev/isa/i82365_isapnp.c4
-rw-r--r--sys/dev/isa/isapnp.c4
-rw-r--r--sys/dev/pci/ahc_pci.c4
-rw-r--r--sys/dev/pci/eso.c5
-rw-r--r--sys/dev/pci/i82365_pci.c4
-rw-r--r--sys/dev/pci/if_de.c5
-rw-r--r--sys/dev/pci/if_nge.c4
-rw-r--r--sys/dev/pci/if_txp.c11
-rw-r--r--sys/dev/pci/maestro.c5
17 files changed, 43 insertions, 42 deletions
diff --git a/sys/arch/macppc/macppc/db_disasm.c b/sys/arch/macppc/macppc/db_disasm.c
index 638fb4dd1a0..608048001bb 100644
--- a/sys/arch/macppc/macppc/db_disasm.c
+++ b/sys/arch/macppc/macppc/db_disasm.c
@@ -1,5 +1,5 @@
/* $NetBSD: db_disasm.c,v 1.8 2001/06/12 05:31:44 simonb Exp $ */
-/* $OpenBSD: db_disasm.c,v 1.7 2001/09/09 23:28:16 drahn Exp $ */
+/* $OpenBSD: db_disasm.c,v 1.8 2001/09/21 17:55:39 miod Exp $ */
/*
* Copyright (c) 1996 Dale Rahn. All rights reserved.
*
@@ -590,7 +590,7 @@ disasm_process_field(u_int32_t addr, instr_t instr, char **ppfmt, char **ppoutpu
if (name) {
if (offset == 0) {
pstr += sprintf (pstr, "0x%x (%s)", addr + LI,
- name, offset);
+ name);
} else {
pstr += sprintf (pstr, "0x%x (%s+0x%x)", addr + LI,
name, offset);
@@ -623,7 +623,7 @@ disasm_process_field(u_int32_t addr, instr_t instr, char **ppfmt, char **ppoutpu
if (name) {
if (offset == 0) {
pstr += sprintf (pstr, "0x%x (%s)", addr + BD,
- name, offset);
+ name);
} else {
pstr += sprintf (pstr, "0x%x (%s+0x%x)", addr + BD,
name, offset);
diff --git a/sys/arch/macppc/macppc/mainbus.c b/sys/arch/macppc/macppc/mainbus.c
index 138471a66a8..24b014340ea 100644
--- a/sys/arch/macppc/macppc/mainbus.c
+++ b/sys/arch/macppc/macppc/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.1 2001/09/01 15:44:20 drahn Exp $ */
+/* $OpenBSD: mainbus.c,v 1.2 2001/09/21 17:55:39 miod Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -123,7 +123,8 @@ mbattach(parent, self, aux)
if (OF_getprop(node, "device_type", name, sizeof(name)) <= 0)
{
if (OF_getprop(node, "name", name, sizeof(name)) <= 0)
- printf ("name not found on node %x\n");
+ printf ("name not found on node %x\n",
+ node);
continue;
}
if (strcmp(name, "memory-controller") == 0) {
diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c
index a4fe7dd82a4..e92076922f2 100644
--- a/sys/dev/ata/ata.c
+++ b/sys/dev/ata/ata.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ata.c,v 1.12 2001/07/12 01:45:42 csapuntz Exp $ */
+/* $OpenBSD: ata.c,v 1.13 2001/09/21 17:55:43 miod Exp $ */
/* $NetBSD: ata.c,v 1.9 1999/04/15 09:41:09 bouyer Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer. All rights reserved.
@@ -97,7 +97,7 @@ ata_get_params(drvp, flags, prms)
{
int ret;
if ((ret = wdc_exec_command(drvp, &wdc_c)) != WDC_COMPLETE) {
- printf ("WDC_EXEC_COMMAND: %d\n");
+ printf ("WDC_EXEC_COMMAND: %d\n", ret);
return CMD_AGAIN;
}
}
diff --git a/sys/dev/eisa/if_fea.c b/sys/dev/eisa/if_fea.c
index 3719de40dfd..ddc9176687d 100644
--- a/sys/dev/eisa/if_fea.c
+++ b/sys/dev/eisa/if_fea.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_fea.c,v 1.10 2001/09/11 20:05:25 miod Exp $ */
+/* $OpenBSD: if_fea.c,v 1.11 2001/09/21 17:55:43 miod Exp $ */
/* $NetBSD: if_fea.c,v 1.9 1996/10/21 22:31:05 thorpej Exp $ */
/*-
@@ -221,7 +221,7 @@ pdq_eisa_attach(parent, self, aux)
return;
}
if (intrstr != NULL)
- printf(": interrupting at %s\n", sc->sc_dev.dv_xname, intrstr);
+ printf(": interrupting at %s\n", intrstr);
bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes,
sc->sc_ac.ac_enaddr, 6);
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index 2d17ba6932c..ff88c3e58cc 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aac.c,v 1.7 2001/08/12 20:12:11 mickey Exp $ */
+/* $OpenBSD: aac.c,v 1.8 2001/09/21 17:55:43 miod Exp $ */
/*-
* Copyright (c) 2000 Michael Smith
@@ -1095,8 +1095,8 @@ aac_bio_complete(struct aac_ccb *ccb)
bp->b_flags |= B_ERROR;
/* XXX be more verbose? */
- printf("%s: I/O error %d (%s)\n", status,
- AAC_COMMAND_STATUS(status));
+ printf("%s: I/O error %d (%s)\n", sc->sc_dev.dv_xname,
+ status, AAC_COMMAND_STATUS(status));
}
scsi_done(xs);
}
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index cd7b4a81bd9..a71e92f199d 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adw.c,v 1.21 2001/08/26 02:39:05 krw Exp $ */
+/* $OpenBSD: adw.c,v 1.22 2001/09/21 17:55:43 miod Exp $ */
/* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */
/*
@@ -1405,8 +1405,8 @@ adw_async_callback(sc, code)
break;
default:
- printf("%s: Unknown Async callback code (ignored): 0x%02x\n"
- ,sc->sc_dev.dv_xname );
+ printf("%s: Unknown Async callback code (ignored): 0x%02x\n",
+ sc->sc_dev.dv_xname, code);
break;
}
}
diff --git a/sys/dev/isa/ess_isapnp.c b/sys/dev/isa/ess_isapnp.c
index 92b792500b1..56784874d01 100644
--- a/sys/dev/isa/ess_isapnp.c
+++ b/sys/dev/isa/ess_isapnp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ess_isapnp.c,v 1.3 2001/04/19 23:33:20 deraadt Exp $ */
+/* $OpenBSD: ess_isapnp.c,v 1.4 2001/09/21 17:55:43 miod Exp $ */
/* $NetBSD: ess_isa.c,v 1.4 1999/03/18 20:57:11 mycroft Exp $ */
/*-
@@ -94,7 +94,7 @@ void ess_isapnp_attach(parent, self, aux)
sc->sc_isa = parent->dv_parent;
if (!essmatch(sc)) {
- printf(": essmatch failed\n", sc->sc_dev.dv_xname);
+ printf(": essmatch failed\n");
return;
}
diff --git a/sys/dev/isa/i82365_isa.c b/sys/dev/isa/i82365_isa.c
index e1986cd9a15..fa6ff2b2265 100644
--- a/sys/dev/isa/i82365_isa.c
+++ b/sys/dev/isa/i82365_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365_isa.c,v 1.13 2001/08/17 21:52:16 deraadt Exp $ */
+/* $OpenBSD: i82365_isa.c,v 1.14 2001/09/21 17:55:43 miod Exp $ */
/* $NetBSD: i82365_isa.c,v 1.11 1998/06/09 07:25:00 thorpej Exp $ */
/*
@@ -224,7 +224,7 @@ pcic_isa_attach(parent, self, aux)
} else
printf("%s: no irq, ", sc->dev.dv_xname);
- printf("polling enabled\n", sc->dev.dv_xname);
+ printf("polling enabled\n");
if (sc->poll_established == 0) {
timeout_set(&sc->poll_timeout, pcic_poll_intr, sc);
timeout_add(&sc->poll_timeout, hz / 2);
diff --git a/sys/dev/isa/i82365_isapnp.c b/sys/dev/isa/i82365_isapnp.c
index d6aa01fef06..c9e8833c695 100644
--- a/sys/dev/isa/i82365_isapnp.c
+++ b/sys/dev/isa/i82365_isapnp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365_isapnp.c,v 1.1 2001/03/05 15:13:42 aaron Exp $ */
+/* $OpenBSD: i82365_isapnp.c,v 1.2 2001/09/21 17:55:43 miod Exp $ */
/* $NetBSD: i82365_isapnp.c,v 1.8 2000/02/23 17:22:11 soren Exp $ */
/*
@@ -206,7 +206,7 @@ pcic_isapnp_attach(parent, self, aux)
} else
printf("%s: no irq, ", sc->dev.dv_xname);
- printf("polling enabled\n", sc->dev.dv_xname);
+ printf("polling enabled\n");
if (sc->poll_established == 0) {
timeout_set(&sc->poll_timeout, pcic_poll_intr, sc);
timeout_add(&sc->poll_timeout, hz / 2);
diff --git a/sys/dev/isa/isapnp.c b/sys/dev/isa/isapnp.c
index ee26920286c..ac39fa08f81 100644
--- a/sys/dev/isa/isapnp.c
+++ b/sys/dev/isa/isapnp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isapnp.c,v 1.30 2001/01/29 06:16:14 mickey Exp $ */
+/* $OpenBSD: isapnp.c,v 1.31 2001/09/21 17:55:43 miod Exp $ */
/* $NetBSD: isapnp.c,v 1.9.4.3 1997/10/29 00:40:43 thorpej Exp $ */
/*
@@ -899,7 +899,7 @@ isapnp_attach(parent, self, aux)
panic("%s: bus map failed", sc->sc_dev.dv_xname);
if (!isapnp_find(sc, 1)) {
- printf(": no cards found\n", sc->sc_dev.dv_xname);
+ printf(": no cards found\n");
return;
}
diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c
index a862b131e7b..0267a9876bd 100644
--- a/sys/dev/pci/ahc_pci.c
+++ b/sys/dev/pci/ahc_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ahc_pci.c,v 1.25 2001/08/25 10:13:29 art Exp $ */
+/* $OpenBSD: ahc_pci.c,v 1.26 2001/09/21 17:55:43 miod Exp $ */
/* $NetBSD: ahc_pci.c,v 1.9 1996/10/21 22:56:24 thorpej Exp $ */
/*
@@ -470,7 +470,7 @@ void *aux;
}
if (pci_intr_map(pa, &ih)) {
- printf(": couldn't map interrupt\n", ahc->sc_dev.dv_xname);
+ printf(": couldn't map interrupt\n");
ahc_free(ahc);
return;
}
diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c
index 3d0bc060c2b..01ebb5e946d 100644
--- a/sys/dev/pci/eso.c
+++ b/sys/dev/pci/eso.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eso.c,v 1.12 2001/08/25 10:13:29 art Exp $ */
+/* $OpenBSD: eso.c,v 1.13 2001/09/21 17:55:43 miod Exp $ */
/* $NetBSD: eso.c,v 1.3 1999/08/02 17:37:43 augustss Exp $ */
/*
@@ -346,8 +346,7 @@ eso_attach(parent, self, aux)
sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, eso_intr, sc);
#endif
if (sc->sc_ih == NULL) {
- printf(", couldn't establish interrupt",
- sc->sc_dev.dv_xname);
+ printf(", couldn't establish interrupt");
if (intrstring != NULL)
printf(" at %s", intrstring);
printf("\n");
diff --git a/sys/dev/pci/i82365_pci.c b/sys/dev/pci/i82365_pci.c
index 92faced02ea..a6d105ec05e 100644
--- a/sys/dev/pci/i82365_pci.c
+++ b/sys/dev/pci/i82365_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365_pci.c,v 1.4 2001/06/12 15:40:31 niklas Exp $ */
+/* $OpenBSD: i82365_pci.c,v 1.5 2001/09/21 17:55:43 miod Exp $ */
/* $NetBSD: i82365_pci.c,v 1.11 2000/02/24 03:42:44 itohy Exp $ */
/*
@@ -217,7 +217,7 @@ pcic_pci_attach(parent, self, aux)
} else
printf("%s: no irq, ", sc->dev.dv_xname);
- printf("polling enabled\n", sc->dev.dv_xname);
+ printf("polling enabled\n");
if (sc->poll_established == 0) {
timeout_set(&sc->poll_timeout, pcic_poll_intr, sc);
timeout_add(&sc->poll_timeout, hz / 2);
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index 058c0625317..1cfb25ffd1c 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_de.c,v 1.50 2001/09/11 20:05:25 miod Exp $ */
+/* $OpenBSD: if_de.c,v 1.51 2001/09/21 17:55:43 miod Exp $ */
/* $NetBSD: if_de.c,v 1.45 1997/06/09 00:34:18 thorpej Exp $ */
/*-
@@ -5545,8 +5545,7 @@ tulip_pci_attach(
sc->tulip_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET,
intr_rtn, sc, self->dv_xname);
if (sc->tulip_ih == NULL) {
- printf(", couldn't establish interrupt",
- sc->tulip_dev.dv_xname);
+ printf(", couldn't establish interrupt");
if (intrstr != NULL)
printf(" at %s", intrstr);
printf("\n");
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index fd745d57129..891df060e4d 100644
--- a/sys/dev/pci/if_nge.c
+++ b/sys/dev/pci/if_nge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_nge.c,v 1.10 2001/09/11 20:05:25 miod Exp $ */
+/* $OpenBSD: if_nge.c,v 1.11 2001/09/21 17:55:44 miod Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -856,7 +856,7 @@ void nge_attach(parent, self, aux)
/*
* A NatSemi chip was detected. Inform the world.
*/
- printf(": Ethernet address: %s\n", ether_sprintf(eaddr), ":");
+ printf(": Ethernet address: %s\n", ether_sprintf(eaddr));
bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index 7e1498a9c9d..d5c280e558e 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_txp.c,v 1.55 2001/09/11 20:05:25 miod Exp $ */
+/* $OpenBSD: if_txp.c,v 1.56 2001/09/21 17:55:44 miod Exp $ */
/*
* Copyright (c) 2001
@@ -391,7 +391,7 @@ txp_download_fw(sc)
WRITE_REG(sc, TXP_H2A_0, TXP_BOOTCMD_RUNTIME_IMAGE);
if (txp_download_fw_wait(sc)) {
- printf(": fw wait failed, initial\n");
+ printf("%s: fw wait failed, initial\n", sc->sc_dev.dv_xname);
return (-1);
}
@@ -438,7 +438,7 @@ txp_download_fw_wait(sc)
}
if (!(r & TXP_INT_A2H_0)) {
- printf(": fw wait failed comm0\n", sc->sc_dev.dv_xname);
+ printf(": fw wait failed comm0\n");
return (-1);
}
@@ -446,7 +446,7 @@ txp_download_fw_wait(sc)
r = READ_REG(sc, TXP_A2H_0);
if (r != STAT_WAITING_FOR_SEGMENT) {
- printf(": fw not waiting for segment\n", sc->sc_dev.dv_xname);
+ printf(": fw not waiting for segment\n");
return (-1);
}
return (0);
@@ -516,7 +516,8 @@ txp_download_fw_section(sc, sect, sectnum)
WRITE_REG(sc, TXP_H2A_0, TXP_BOOTCMD_SEGMENT_AVAILABLE);
if (txp_download_fw_wait(sc)) {
- printf(": fw wait failed, section %d\n", sectnum);
+ printf("%s: fw wait failed, section %d\n",
+ sc->sc_dev.dv_xname, sectnum);
err = -1;
}
diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c
index f42ef208645..f5878e66e39 100644
--- a/sys/dev/pci/maestro.c
+++ b/sys/dev/pci/maestro.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: maestro.c,v 1.10 2001/09/05 08:29:55 espie Exp $ */
+/* $OpenBSD: maestro.c,v 1.11 2001/09/21 17:55:44 miod Exp $ */
/* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */
/*
* FreeBSD's ESS Agogo/Maestro driver
@@ -1223,7 +1223,8 @@ maestro_powerhook(why, self)
/* Power up device on resume. */
DPRINTF(("maestro: power resume\n"));
if (sc->suspend == PWR_RESUME) {
- printf("%s: resume without suspend?\n");
+ printf("%s: resume without suspend?\n",
+ sc->dev.dv_xname);
sc->suspend = why;
return;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 21:59:42 +0000