From: jsg <jsg@openbsd.org>
Date: Sat, 30 May 2015 02:17:36 +0000 (+0000)
Subject: fix the build when SDHC_DEBUG is defined
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=cebbbdda7b4600c853c940c7ac17adbc8f814b20;p=openbsd

fix the build when SDHC_DEBUG is defined
---

diff --git a/sys/arch/armv7/exynos/exesdhc.c b/sys/arch/armv7/exynos/exesdhc.c
index f2756792496..b5da2c23673 100644
--- a/sys/arch/armv7/exynos/exesdhc.c
+++ b/sys/arch/armv7/exynos/exesdhc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exesdhc.c,v 1.2 2015/05/27 00:06:14 jsg Exp $	*/
+/*	$OpenBSD: exesdhc.c,v 1.3 2015/05/30 02:17:36 jsg Exp $	*/
 /*
  * Copyright (c) 2009 Dale Rahn <drahn@openbsd.org>
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -602,7 +602,7 @@ exesdhc_wait_state(struct exesdhc_softc *sc, uint32_t mask, uint32_t value)
 			return 0;
 		delay(10);
 	}
-	DPRINTF(0,("%s: timeout waiting for %x\n", HDEVNAME(sc),
+	DPRINTF(0,("%s: timeout waiting for %x, state %x\n", HDEVNAME(sc),
 	    value, state));
 	return ETIMEDOUT;
 }
@@ -677,7 +677,7 @@ exesdhc_start_command(struct exesdhc_softc *sc, struct sdmmc_command *cmd)
 	int error;
 	int s;
 
-	DPRINTF(1,("%s: start cmd %u arg=%#x data=%#x dlen=%d flags=%#x "
+	DPRINTF(1,("%s: start cmd %u arg=%#x data=%p dlen=%d flags=%#x "
 	    "proc=\"%s\"\n", HDEVNAME(sc), cmd->c_opcode, cmd->c_arg,
 	    cmd->c_data, cmd->c_datalen, cmd->c_flags, curproc ?
 	    curproc->p_comm : ""));
@@ -968,7 +968,7 @@ exesdhc_intr(void *arg)
 	/* Acknowledge the interrupts we are about to handle. */
 	HWRITE4(sc, SDHC_INT_STATUS, status);
 	DPRINTF(2,("%s: interrupt status=0x%08x\n", HDEVNAME(sc),
-	    status, status));
+	    status));
 
 	/*
 	 * Service error interrupts.
diff --git a/sys/arch/armv7/imx/imxesdhc.c b/sys/arch/armv7/imx/imxesdhc.c
index 4437323cfb9..9408dbe9b5a 100644
--- a/sys/arch/armv7/imx/imxesdhc.c
+++ b/sys/arch/armv7/imx/imxesdhc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: imxesdhc.c,v 1.10 2015/05/17 12:28:03 jsg Exp $	*/
+/*	$OpenBSD: imxesdhc.c,v 1.11 2015/05/30 02:17:36 jsg Exp $	*/
 /*
  * Copyright (c) 2009 Dale Rahn <drahn@openbsd.org>
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -635,7 +635,7 @@ imxesdhc_wait_state(struct imxesdhc_softc *sc, uint32_t mask, uint32_t value)
 			return 0;
 		delay(10);
 	}
-	DPRINTF(0,("%s: timeout waiting for %x\n", HDEVNAME(sc),
+	DPRINTF(0,("%s: timeout waiting for %x, state %x\n", HDEVNAME(sc),
 	    value, state));
 	return ETIMEDOUT;
 }
@@ -710,7 +710,7 @@ imxesdhc_start_command(struct imxesdhc_softc *sc, struct sdmmc_command *cmd)
 	int error;
 	int s;
 
-	DPRINTF(1,("%s: start cmd %u arg=%#x data=%#x dlen=%d flags=%#x "
+	DPRINTF(1,("%s: start cmd %u arg=%#x data=%p dlen=%d flags=%#x "
 	    "proc=\"%s\"\n", HDEVNAME(sc), cmd->c_opcode, cmd->c_arg,
 	    cmd->c_data, cmd->c_datalen, cmd->c_flags, curproc ?
 	    curproc->p_comm : ""));
@@ -1001,7 +1001,7 @@ imxesdhc_intr(void *arg)
 	/* Acknowledge the interrupts we are about to handle. */
 	HWRITE4(sc, SDHC_INT_STATUS, status);
 	DPRINTF(2,("%s: interrupt status=0x%08x\n", HDEVNAME(sc),
-	    status, status));
+	    status));
 
 	/*
 	 * Service error interrupts.
diff --git a/sys/arch/armv7/omap/ommmc.c b/sys/arch/armv7/omap/ommmc.c
index 7abb1db9a37..03040e9c6fc 100644
--- a/sys/arch/armv7/omap/ommmc.c
+++ b/sys/arch/armv7/omap/ommmc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ommmc.c,v 1.13 2014/11/04 13:18:04 jsg Exp $	*/
+/*	$OpenBSD: ommmc.c,v 1.14 2015/05/30 02:17:36 jsg Exp $	*/
 
 /*
  * Copyright (c) 2009 Dale Rahn <drahn@openbsd.org>
@@ -817,7 +817,7 @@ ommmc_start_command(struct ommmc_softc *sc, struct sdmmc_command *cmd)
 	int error;
 	int s;
 
-	DPRINTF(1,("%s: start cmd %u arg=%#x data=%#x dlen=%d flags=%#x "
+	DPRINTF(1,("%s: start cmd %u arg=%#x data=%p dlen=%d flags=%#x "
 	    "proc=\"%s\"\n", DEVNAME(sc), cmd->c_opcode, cmd->c_arg,
 	    cmd->c_data, cmd->c_datalen, cmd->c_flags, curproc ?
 	    curproc->p_comm : ""));