various format string fixes and remove -Wno-format from octeon

feedback/ok miod@

5 files changed, 14 insertions, 15 deletions

diff --git a/sys/arch/octeon/dev/if_cnmac.c b/sys/arch/octeon/dev/if_cnmac.c
index f26c0019d7f..385de3803d5 100644
--- a/sys/arch/octeon/dev/if_cnmac.c
+++ b/sys/arch/octeon/dev/if_cnmac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cnmac.c,v 1.13 2014/03/10 09:41:27 jasper Exp $	*/
+/*	$OpenBSD: if_cnmac.c,v 1.14 2014/05/10 22:25:16 jasper Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -928,7 +928,7 @@ if_cnmac_kvtophys(vaddr_t kva)
 	else if (kva >= CKSEG1_BASE && kva < CKSEG1_BASE + CKSEG_SIZE)
 		return CKSEG1_TO_PHYS(kva);
 
-	printf("kva %p is not be able to convert physical address\n", kva);
+	printf("kva %lx is not be able to convert physical address\n", kva);
 	panic("if_cnmac_kvtophys");
 }
 
diff --git a/sys/arch/octeon/dev/octcf.c b/sys/arch/octeon/dev/octcf.c
index 3227d5f2c65..02646c483fa 100644
--- a/sys/arch/octeon/dev/octcf.c
+++ b/sys/arch/octeon/dev/octcf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octcf.c,v 1.13 2013/11/01 01:06:03 dlg Exp $ */
+/*	$OpenBSD: octcf.c,v 1.14 2014/05/10 22:25:16 jasper Exp $ */
 /*	$NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
 
 /*
@@ -198,8 +198,7 @@ octcfattach(struct device *parent, struct device *self, void *aux)
 		if ((cfg & BOOT_CFG_BASE_MASK) ==
 			(OCTEON_CF_BASE >> BOOT_CFG_BASE_SHIFT)) {
 			if ((cfg & BOOT_CFG_WIDTH_MASK) == 0)
-				printf(": Doesn't support 8bit card\n",
-					wd->sc_dev.dv_xname);
+				printf(": Doesn't support 8bit card\n");
 			break;
 		}
 	}
@@ -208,7 +207,7 @@ octcfattach(struct device *parent, struct device *self, void *aux)
 	i = 0;
 	while ( (status = (OCTCF_REG_READ(wd, wdr_status)>>8)) & WDCS_BSY) {
 		if ((i++) == NR_TRIES )     {
-			printf(": card not present\n", wd->sc_dev.dv_xname);
+			printf(": card not present\n");
 			return;
                	}
 		DELAY(OCTCFDELAY);
@@ -216,7 +215,7 @@ octcfattach(struct device *parent, struct device *self, void *aux)
 
 	/* read our drive info */
 	if (octcf_get_params(wd, &wd->sc_params) != 0) {
-		printf(": IDENTIFY failed\n", wd->sc_dev.dv_xname);
+		printf(": IDENTIFY failed\n");
 		return;
 	}
 
diff --git a/sys/arch/octeon/dev/octeon_iobus.c b/sys/arch/octeon/dev/octeon_iobus.c
index 8c65d987b7d..223530c1878 100644
--- a/sys/arch/octeon/dev/octeon_iobus.c
+++ b/sys/arch/octeon/dev/octeon_iobus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octeon_iobus.c,v 1.5 2013/10/24 20:45:03 pirofti Exp $ */
+/*	$OpenBSD: octeon_iobus.c,v 1.6 2014/05/10 22:25:16 jasper Exp $ */
 
 /*
  * Copyright (c) 2000-2004 Opsycon AB  (www.opsycon.se)
@@ -183,7 +183,7 @@ iobusprint(void *aux, const char *iobus)
 		printf("%s at %s", aa->aa_name, iobus);
 
 	if (aa->aa_unit->addr != 0)
-		printf(" base 0x%llx", aa->aa_unit->addr);
+		printf(" base 0x%lx", aa->aa_unit->addr);
 	if (aa->aa_unit->irq >= 0)
 		printf(" irq %d", aa->aa_unit->irq);
 
diff --git a/sys/arch/octeon/dev/octeon_pcibus.c b/sys/arch/octeon/dev/octeon_pcibus.c
index e6121344f7b..509261a5db9 100644
--- a/sys/arch/octeon/dev/octeon_pcibus.c
+++ b/sys/arch/octeon/dev/octeon_pcibus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octeon_pcibus.c,v 1.12 2013/08/29 07:56:50 pirofti Exp $	*/
+/*	$OpenBSD: octeon_pcibus.c,v 1.13 2014/05/10 22:25:16 jasper Exp $	*/
 /*	$NetBSD: bonito_mainbus.c,v 1.11 2008/04/28 20:23:10 martin Exp $	*/
 /*	$NetBSD: bonito_pci.c,v 1.5 2008/04/28 20:23:28 martin Exp $	*/
 
@@ -248,7 +248,7 @@ octeon_pcibus_attach(struct device *parent, struct device *self, void *aux)
 bus_addr_t
 octeon_pcibus_pa_to_device(paddr_t pa)
 {
-	printf("%s:%d: pa=%p\n", __func__, __LINE__, pa);
+	printf("%s:%d: pa=%p\n", __func__, __LINE__, (void *)pa);
 
 	return pa & 0x1ffffffffffffUL;
 }
@@ -256,7 +256,7 @@ octeon_pcibus_pa_to_device(paddr_t pa)
 paddr_t
 octeon_pcibus_device_to_pa(bus_addr_t addr)
 {
-	printf("%s:%d: addr=%p\n", __func__, __LINE__, addr);
+	printf("%s:%d: addr=%lx\n", __func__, __LINE__, addr);
 
 	return PHYS_TO_XKPHYS(addr, CCA_NC);
 }
@@ -406,7 +406,7 @@ octeon_pcibus_pci_intr_string(void *cookie, pci_intr_handle_t ih)
 {
 	static char irqstr[sizeof("irq 0123456789")];
 
-	snprintf(irqstr, sizeof irqstr, "irq %d", ih);
+	snprintf(irqstr, sizeof irqstr, "irq %ld", ih);
 	return irqstr;
 }
 
diff --git a/sys/arch/octeon/dev/octeon_uartbus.c b/sys/arch/octeon/dev/octeon_uartbus.c
index c0e618c8162..dfca44bd391 100644
--- a/sys/arch/octeon/dev/octeon_uartbus.c
+++ b/sys/arch/octeon/dev/octeon_uartbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octeon_uartbus.c,v 1.3 2013/06/02 20:29:36 jasper Exp $ */
+/*	$OpenBSD: octeon_uartbus.c,v 1.4 2014/05/10 22:25:16 jasper Exp $ */
 
 /*
  * Copyright (c) 2000-2004 Opsycon AB  (www.opsycon.se)
@@ -151,7 +151,7 @@ uartbusprint(void *aux, const char *uartbus)
 		printf("%s at %s", uba->uba_name, uartbus);
 
 	if (uba->uba_baseaddr != 0)
-		printf(" base 0x%llx", uba->uba_baseaddr);
+		printf(" base 0x%lx", uba->uba_baseaddr);
 	if (uba->uba_intr >= 0)
 		printf(" irq %d", uba->uba_intr);