diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/cardbus/ehci_cardbus.c | 4 | ||||
| -rw-r--r-- | sys/dev/cardbus/ohci_cardbus.c | 6 | ||||
| -rw-r--r-- | sys/dev/isa/fd.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_vic.c | 4 | ||||
| -rw-r--r-- | sys/dev/softraid.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/ubsa.c | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/cardbus/ehci_cardbus.c b/sys/dev/cardbus/ehci_cardbus.c index b98bfc4c4ce..ee0f6d7e84e 100644 --- a/sys/dev/cardbus/ehci_cardbus.c +++ b/sys/dev/cardbus/ehci_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci_cardbus.c,v 1.11 2008/06/26 05:42:14 ray Exp $ */ +/* $OpenBSD: ehci_cardbus.c,v 1.12 2009/06/02 12:32:08 deraadt Exp $ */ /* $NetBSD: ehci_cardbus.c,v 1.6.6.3 2004/09/21 13:27:25 skrll Exp $ */ /* @@ -109,7 +109,7 @@ ehci_cardbus_attach(struct device *parent, struct device *self, void *aux) /* Map I/O registers */ if (Cardbus_mapreg_map(ct, CARDBUS_CBMEM, CARDBUS_MAPREG_TYPE_MEM, 0, &sc->sc.iot, &sc->sc.ioh, NULL, &sc->sc.sc_size)) { - printf(": can't map mem space\n", devname); + printf(": can't map mem space\n"); return; } diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c index 186f6735eb9..cd2e799bba7 100644 --- a/sys/dev/cardbus/ohci_cardbus.c +++ b/sys/dev/cardbus/ohci_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci_cardbus.c,v 1.11 2008/06/26 05:42:14 ray Exp $ */ +/* $OpenBSD: ohci_cardbus.c,v 1.12 2009/06/02 12:32:08 deraadt Exp $ */ /* $NetBSD: ohci_cardbus.c,v 1.19 2004/08/02 19:14:28 mycroft Exp $ */ /* @@ -108,7 +108,7 @@ ohci_cardbus_attach(struct device *parent, struct device *self, void *aux) /* Map I/O registers */ if (Cardbus_mapreg_map(ct, CARDBUS_CBMEM, CARDBUS_MAPREG_TYPE_MEM, 0, &sc->sc.iot, &sc->sc.ioh, NULL, &sc->sc.sc_size)) { - printf(": can't map mem space\n", devname); + printf(": can't map mem space\n"); return; } @@ -134,7 +134,7 @@ ohci_cardbus_attach(struct device *parent, struct device *self, void *aux) sc->sc_ih = cardbus_intr_establish(cc, cf, ca->ca_intrline, IPL_USB, ohci_intr, sc, devname); if (sc->sc_ih == NULL) { - printf(": couldn't establish interrupt\n", devname); + printf(": couldn't establish interrupt\n"); return; } printf(": irq %d", ca->ca_intrline); diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index b5cde05df53..1e8c2f787c4 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.75 2008/10/15 19:12:18 blambert Exp $ */ +/* $OpenBSD: fd.c,v 1.76 2009/06/02 12:32:08 deraadt Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -781,7 +781,7 @@ loop: {int block; block = (fd->sc_cylin * type->heads + head) * type->sectrac + sec; if (block != fd->sc_blkno) { - printf("fdintr: block %d != blkno %d\n", block, fd->sc_blkno); + printf("fdintr: block %d != blkno %llu\n", block, fd->sc_blkno); #ifdef DDB Debugger(); #endif diff --git a/sys/dev/pci/if_vic.c b/sys/dev/pci/if_vic.c index 68de81af5b0..cbe5345796f 100644 --- a/sys/dev/pci/if_vic.c +++ b/sys/dev/pci/if_vic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vic.c,v 1.70 2009/02/01 14:05:52 dlg Exp $ */ +/* $OpenBSD: if_vic.c,v 1.71 2009/06/02 12:32:06 deraadt Exp $ */ /* * Copyright (c) 2006 Reyk Floeter <reyk@openbsd.org> @@ -443,7 +443,7 @@ vic_attach(struct device *parent, struct device *self, void *aux) r = bus_space_read_4(sc->sc_iot, ioh, VIC_LANCE_SIZE); if ((r & VIC_MORPH_MASK) != VIC_MORPH_VMXNET) { - printf(": unable to morph vlance chip\n", r); + printf(": unable to morph vlance chip\n"); goto unmap; } diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index 665ce959154..474b672cc5a 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.136 2009/06/02 05:49:35 marco Exp $ */ +/* $OpenBSD: softraid.c,v 1.137 2009/06/02 12:32:08 deraadt Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -377,7 +377,7 @@ sr_meta_rw(struct sr_discipline *sd, dev_t dev, void *md, size_t sz, biowait(&b); if (b.b_flags & B_ERROR) { - printf("%s: 0x%x i/o error on block %lld while reading " + printf("%s: 0x%x i/o error on block %llu while reading " "metadata %d\n", DEVNAME(sc), dev, b.b_blkno, b.b_error); goto done; } diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index 70ff8df61f7..aab896fc712 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsa.c,v 1.45 2009/02/24 13:23:03 yuo Exp $ */ +/* $OpenBSD: ubsa.c,v 1.46 2009/06/02 12:32:08 deraadt Exp $ */ /* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */ /*- * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>. @@ -717,7 +717,7 @@ ubsa_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) if (cdcbuf->bNotification == UCDC_N_SERIAL_STATE) printf("%s:notify serial state, len=%d, data=0x%02x\n", sc->sc_dev.dv_xname, - cdcbuf->wLength, cdcbuf->data[0]); + UGETW(cdcbuf->wLength), cdcbuf->data[0]); } #endif |