- fold several occurences of DEVNAME() into one located in sdmmcvar.h.

making DEVNAME() usage a lot more consistent.

ok krw@

8 files changed, 52 insertions, 60 deletions

diff --git a/sys/dev/sdmmc/sbt.c b/sys/dev/sdmmc/sbt.c
index b66b6023610..107d7b8435f 100644
--- a/sys/dev/sdmmc/sbt.c
+++ b/sys/dev/sdmmc/sbt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbt.c,v 1.15 2010/07/02 02:40:16 blambert Exp $	*/
+/*	$OpenBSD: sbt.c,v 1.16 2010/08/19 17:54:12 jasper Exp $	*/
 
 /*
  * Copyright (c) 2007 Uwe Stuehler <uwe@openbsd.org>
@@ -99,8 +99,6 @@ int sbt_debug = 0;
 #define DNPRINTF(n, s)	do {} while (0)
 #endif
 
-#define DEVNAME(sc)	((sc)->sc_dev.dv_xname)
-
 struct cfattach sbt_ca = {
 	sizeof(struct sbt_softc), sbt_match, sbt_attach, sbt_detach
 };
diff --git a/sys/dev/sdmmc/sdhc.c b/sys/dev/sdmmc/sdhc.c
index 774a7247339..e7177c16cd0 100644
--- a/sys/dev/sdmmc/sdhc.c
+++ b/sys/dev/sdmmc/sdhc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdhc.c,v 1.27 2010/07/02 18:05:28 deraadt Exp $	*/
+/*	$OpenBSD: sdhc.c,v 1.28 2010/08/19 17:54:12 jasper Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -52,8 +52,6 @@ struct sdhc_host {
 	u_int16_t intr_error_status;	/* soft error status */
 };
 
-#define HDEVNAME(hp)	((hp)->sc->sc_dev.dv_xname)
-
 /* flag values */
 #define SHF_USE_DMA		0x0001
 
@@ -553,7 +551,7 @@ sdhc_wait_state(struct sdhc_host *hp, u_int32_t mask, u_int32_t value)
 			return 0;
 		sdmmc_delay(10000);
 	}
-	DPRINTF(0,("%s: timeout waiting for %x (state=%b)\n", HDEVNAME(hp),
+	DPRINTF(0,("%s: timeout waiting for %x (state=%b)\n", DEVNAME(hp->sc),
 	    value, state, SDHC_PRESENT_STATE_BITS));
 	return ETIMEDOUT;
 }
@@ -612,7 +610,7 @@ sdhc_exec_command(sdmmc_chipset_handle_t sch, struct sdmmc_command *cmd)
 	HCLR1(hp, SDHC_HOST_CTL, SDHC_LED_ON);
 
 	DPRINTF(1,("%s: cmd %u done (flags=%#x error=%d)\n",
-	    HDEVNAME(hp), cmd->c_opcode, cmd->c_flags, cmd->c_error));
+	    DEVNAME(hp->sc), cmd->c_opcode, cmd->c_flags, cmd->c_error));
 	SET(cmd->c_flags, SCF_ITSDONE);
 }
 
@@ -627,7 +625,7 @@ sdhc_start_command(struct sdhc_host *hp, struct sdmmc_command *cmd)
 	int s;
 	
 	DPRINTF(1,("%s: start cmd %u arg=%#x data=%#x dlen=%d flags=%#x "
-	    "proc=\"%s\"\n", HDEVNAME(hp), cmd->c_opcode, cmd->c_arg,
+	    "proc=\"%s\"\n", DEVNAME(hp->sc), cmd->c_opcode, cmd->c_arg,
 	    cmd->c_data, cmd->c_datalen, cmd->c_flags, curproc ?
 	    curproc->p_comm : ""));
 
@@ -643,14 +641,14 @@ sdhc_start_command(struct sdhc_host *hp, struct sdmmc_command *cmd)
 		if (cmd->c_datalen % blksize > 0) {
 			/* XXX: Split this command. (1.7.4) */
 			printf("%s: data not a multiple of %d bytes\n",
-			    HDEVNAME(hp), blksize);
+			    DEVNAME(hp->sc), blksize);
 			return EINVAL;
 		}
 	}
 
 	/* Check limit imposed by 9-bit block count. (1.7.2) */
 	if (blkcount > SDHC_BLOCK_COUNT_MAX) {
-		printf("%s: too much data\n", HDEVNAME(hp));
+		printf("%s: too much data\n", DEVNAME(hp->sc));
 		return EINVAL;
 	}
 
@@ -705,7 +703,7 @@ sdhc_start_command(struct sdhc_host *hp, struct sdmmc_command *cmd)
 	/* XXX: Set DMA start address if SHF_USE_DMA is set. */
 
 	DPRINTF(1,("%s: cmd=%#x mode=%#x blksize=%d blkcount=%d\n",
-	    HDEVNAME(hp), command, mode, blksize, blkcount));
+	    DEVNAME(hp->sc), command, mode, blksize, blkcount));
 
 	/*
 	 * Start a CPU data transfer.  Writing to the high order byte
@@ -735,7 +733,7 @@ sdhc_transfer_data(struct sdhc_host *hp, struct sdmmc_command *cmd)
 	error = 0;
 	datalen = cmd->c_datalen;
 
-	DPRINTF(1,("%s: resp=%#x datalen=%d\n", HDEVNAME(hp),
+	DPRINTF(1,("%s: resp=%#x datalen=%d\n", DEVNAME(hp->sc),
 	    MMC_R1(cmd->c_resp), datalen));
 
 #ifdef SDHC_DEBUG
@@ -743,7 +741,7 @@ sdhc_transfer_data(struct sdhc_host *hp, struct sdmmc_command *cmd)
 	if ((cmd->c_opcode == 52 || cmd->c_opcode == 53) &&
 	    ISSET(MMC_R1(cmd->c_resp), 0xcb00))
 		printf("%s: CMD52/53 error response flags %#x\n",
-		    HDEVNAME(hp), MMC_R1(cmd->c_resp) & 0xff00);
+		    DEVNAME(hp->sc), MMC_R1(cmd->c_resp) & 0xff00);
 #endif
 
 	while (datalen > 0) {
@@ -775,7 +773,7 @@ sdhc_transfer_data(struct sdhc_host *hp, struct sdmmc_command *cmd)
 	SET(cmd->c_flags, SCF_ITSDONE);
 
 	DPRINTF(1,("%s: data transfer done (error=%d)\n",
-	    HDEVNAME(hp), cmd->c_error));
+	    DEVNAME(hp->sc), cmd->c_error));
 }
 
 void
@@ -821,7 +819,7 @@ sdhc_soft_reset(struct sdhc_host *hp, int mask)
 {
 	int timo;
 
-	DPRINTF(1,("%s: software reset reg=%#x\n", HDEVNAME(hp), mask));
+	DPRINTF(1,("%s: software reset reg=%#x\n", DEVNAME(hp->sc), mask));
 
 	HWRITE1(hp, SDHC_SOFTWARE_RESET, mask);
 	for (timo = 10; timo > 0; timo--) {
@@ -831,7 +829,7 @@ sdhc_soft_reset(struct sdhc_host *hp, int mask)
 		HWRITE1(hp, SDHC_SOFTWARE_RESET, 0);
 	}
 	if (timo == 0) {
-		DPRINTF(1,("%s: timeout reg=%#x\n", HDEVNAME(hp),
+		DPRINTF(1,("%s: timeout reg=%#x\n", DEVNAME(hp->sc),
 		    HREAD1(hp, SDHC_SOFTWARE_RESET)));
 		HWRITE1(hp, SDHC_SOFTWARE_RESET, 0);
 		return (ETIMEDOUT);
@@ -860,7 +858,7 @@ sdhc_wait_intr(struct sdhc_host *hp, int mask, int timo)
 	}
 	hp->intr_status &= ~status;
 
-	DPRINTF(2,("%s: intr status %#x error %#x\n", HDEVNAME(hp), status,
+	DPRINTF(2,("%s: intr status %#x error %#x\n", DEVNAME(hp->sc), status,
 	    hp->intr_error_status));
 	
 	/* Command timeout has higher priority than command complete. */
@@ -899,7 +897,7 @@ sdhc_intr(void *arg)
 
 		/* Acknowledge the interrupts we are about to handle. */
 		HWRITE2(hp, SDHC_NINTR_STATUS, status);
-		DPRINTF(2,("%s: interrupt status=%b\n", HDEVNAME(hp),
+		DPRINTF(2,("%s: interrupt status=%b\n", DEVNAME(hp->sc),
 		    status, SDHC_NINTR_STATUS_BITS));
 
 		/* Claim this interrupt. */
@@ -915,7 +913,7 @@ sdhc_intr(void *arg)
 			error = HREAD2(hp, SDHC_EINTR_STATUS);
 			HWRITE2(hp, SDHC_EINTR_STATUS, error);
 			DPRINTF(2,("%s: error interrupt, status=%b\n",
-			    HDEVNAME(hp), error, SDHC_EINTR_STATUS_BITS));
+			    DEVNAME(hp->sc), error, SDHC_EINTR_STATUS_BITS));
 
 			if (ISSET(error, SDHC_CMD_TIMEOUT_ERROR|
 			    SDHC_DATA_TIMEOUT_ERROR)) {
@@ -946,7 +944,7 @@ sdhc_intr(void *arg)
 		 * Service SD card interrupts.
 		 */
 		if (ISSET(status, SDHC_CARD_INTERRUPT)) {
-			DPRINTF(0,("%s: card interrupt\n", HDEVNAME(hp)));
+			DPRINTF(0,("%s: card interrupt\n", DEVNAME(hp->sc)));
 			HCLR2(hp, SDHC_NINTR_STATUS_EN, SDHC_CARD_INTERRUPT);
 			sdmmc_card_intr(hp->sdmmc);
 		}
diff --git a/sys/dev/sdmmc/sdmmc.c b/sys/dev/sdmmc/sdmmc.c
index 4b130f7c870..bb67e6e21e1 100644
--- a/sys/dev/sdmmc/sdmmc.c
+++ b/sys/dev/sdmmc/sdmmc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdmmc.c,v 1.22 2010/07/02 18:05:28 deraadt Exp $	*/
+/*	$OpenBSD: sdmmc.c,v 1.23 2010/08/19 17:54:12 jasper Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -66,8 +66,6 @@ int	sdmmc_set_bus_width(struct sdmmc_function *);
 int	sdmmc_ioctl(struct device *, u_long, caddr_t);
 #endif
 
-#define DEVNAME(sc)	SDMMCDEVNAME(sc)
-
 #ifdef SDMMC_DEBUG
 int sdmmcdebug = 0;
 extern int sdhcdebug;	/* XXX should have a sdmmc_chip_debug() function */
diff --git a/sys/dev/sdmmc/sdmmc_cis.c b/sys/dev/sdmmc/sdmmc_cis.c
index 1b4f5584ce4..66a9a6c4e00 100644
--- a/sys/dev/sdmmc/sdmmc_cis.c
+++ b/sys/dev/sdmmc/sdmmc_cis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdmmc_cis.c,v 1.3 2009/11/11 21:59:16 jasper Exp $	*/
+/*	$OpenBSD: sdmmc_cis.c,v 1.4 2010/08/19 17:54:12 jasper Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -71,7 +71,7 @@ sdmmc_read_cis(struct sdmmc_function *sf, struct sdmmc_cis *cis)
 	reg = (int)sdmmc_cisptr(sf);
 	if (reg < SD_IO_CIS_START ||
 	    reg >= (SD_IO_CIS_START+SD_IO_CIS_SIZE-16)) {
-		printf("%s: bad CIS ptr %#x\n", SDMMCDEVNAME(sf->sc), reg);
+		printf("%s: bad CIS ptr %#x\n", DEVNAME(sf->sc), reg);
 		return 1;
 	}
 
@@ -83,7 +83,7 @@ sdmmc_read_cis(struct sdmmc_function *sf, struct sdmmc_cis *cis)
 			if (tplcode != 0xff)
 				printf("%s: CIS parse error at %d, "
 				    "tuple code %#x, length %d\n",
-				    SDMMCDEVNAME(sf->sc), reg, tplcode, tpllen);
+				    DEVNAME(sf->sc), reg, tplcode, tpllen);
 			break;
 		}
 
@@ -91,7 +91,7 @@ sdmmc_read_cis(struct sdmmc_function *sf, struct sdmmc_cis *cis)
 		case SD_IO_CISTPL_FUNCID:
 			if (tpllen < 2) {
 				printf("%s: bad CISTPL_FUNCID length\n",
-				    SDMMCDEVNAME(sf->sc));
+				    DEVNAME(sf->sc));
 				reg += tpllen;
 				break;
 			}
@@ -101,7 +101,7 @@ sdmmc_read_cis(struct sdmmc_function *sf, struct sdmmc_cis *cis)
 		case SD_IO_CISTPL_MANFID:
 			if (tpllen < 4) {
 				printf("%s: bad CISTPL_MANFID length\n",
-				    SDMMCDEVNAME(sf->sc));
+				    DEVNAME(sf->sc));
 				reg += tpllen;
 				break;
 			}
@@ -113,7 +113,7 @@ sdmmc_read_cis(struct sdmmc_function *sf, struct sdmmc_cis *cis)
 		case SD_IO_CISTPL_VERS_1:
 			if (tpllen < 2) {
 				printf("%s: CISTPL_VERS_1 too short\n",
-				    SDMMCDEVNAME(sf->sc));
+				    DEVNAME(sf->sc));
 				reg += tpllen;
 				break;
 			}
@@ -142,7 +142,7 @@ sdmmc_read_cis(struct sdmmc_function *sf, struct sdmmc_cis *cis)
 			break;
 		default:
 			DPRINTF(("%s: unknown tuple code %#x, length %d\n",
-			    SDMMCDEVNAME(sf->sc), tplcode, tpllen));
+			    DEVNAME(sf->sc), tplcode, tpllen));
 			reg += tpllen;
 			break;
 		}
@@ -157,10 +157,10 @@ sdmmc_print_cis(struct sdmmc_function *sf)
 	struct sdmmc_cis *cis = &sf->cis;
 	int i;
 
-	printf("%s: CIS version %d.%d\n", SDMMCDEVNAME(sf->sc),
+	printf("%s: CIS version %d.%d\n", DEVNAME(sf->sc),
 	    cis->cis1_major, cis->cis1_minor);
 
-	printf("%s: CIS info: ", SDMMCDEVNAME(sf->sc));
+	printf("%s: CIS info: ", DEVNAME(sf->sc));
 	for (i = 0; i < 4; i++) {
 		if (cis->cis1_info[i] == NULL)
 			break;
@@ -171,9 +171,9 @@ sdmmc_print_cis(struct sdmmc_function *sf)
 	printf("\n");
 
 	printf("%s: Manufacturer code 0x%x, product 0x%x\n",
-	    SDMMCDEVNAME(sf->sc), cis->manufacturer, cis->product);
+	    DEVNAME(sf->sc), cis->manufacturer, cis->product);
 
-	printf("%s: function %d: ", SDMMCDEVNAME(sf->sc), sf->number);
+	printf("%s: function %d: ", DEVNAME(sf->sc), sf->number);
 	switch (sf->cis.function) {
 	case SDMMC_FUNCTION_WLAN:
 		printf("wireless network adapter");
diff --git a/sys/dev/sdmmc/sdmmc_io.c b/sys/dev/sdmmc/sdmmc_io.c
index 069dc23d24a..815aac6beb8 100644
--- a/sys/dev/sdmmc/sdmmc_io.c
+++ b/sys/dev/sdmmc/sdmmc_io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdmmc_io.c,v 1.17 2009/11/11 21:59:16 jasper Exp $	*/
+/*	$OpenBSD: sdmmc_io.c,v 1.18 2010/08/19 17:54:12 jasper Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -95,13 +95,13 @@ sdmmc_io_enable(struct sdmmc_softc *sc)
 	/* Parse the additional bits in the I/O OCR value. */
 	if (!ISSET(card_ocr, SD_IO_OCR_MEM_PRESENT)) {
 		/* SDIO card without memory (not a "combo card"). */
-		DPRINTF(("%s: no memory present\n", SDMMCDEVNAME(sc)));
+		DPRINTF(("%s: no memory present\n", DEVNAME(sc)));
 		CLR(sc->sc_flags, SMF_MEM_MODE);
 	}
 	sc->sc_function_count = SD_IO_OCR_NUM_FUNCTIONS(card_ocr);
 	if (sc->sc_function_count == 0) {
 		/* Useless SDIO card without any I/O functions. */
-		DPRINTF(("%s: no I/O functions\n", SDMMCDEVNAME(sc)));
+		DPRINTF(("%s: no I/O functions\n", DEVNAME(sc)));
 		CLR(sc->sc_flags, SMF_IO_MODE);
 		return 0;
 	}
@@ -111,7 +111,7 @@ sdmmc_io_enable(struct sdmmc_softc *sc)
 	host_ocr = sdmmc_chip_host_ocr(sc->sct, sc->sch);
 	if (sdmmc_set_bus_power(sc, host_ocr, card_ocr) != 0) {
 		printf("%s: can't supply voltage requested by card\n",
-		    SDMMCDEVNAME(sc));
+		    DEVNAME(sc));
 		return 1;
 	}
 
@@ -120,7 +120,7 @@ sdmmc_io_enable(struct sdmmc_softc *sc)
 
 	/* Send the new OCR value until all cards are ready. */
 	if (sdmmc_io_send_op_cond(sc, host_ocr, NULL) != 0) {
-		printf("%s: can't send I/O OCR\n", SDMMCDEVNAME(sc));
+		printf("%s: can't send I/O OCR\n", DEVNAME(sc));
 		return 1;
 	}
 	return 0;
@@ -141,7 +141,7 @@ sdmmc_io_scan(struct sdmmc_softc *sc)
 	sf0 = sdmmc_function_alloc(sc);
 	sf0->number = 0;
 	if (sdmmc_set_relative_addr(sc, sf0) != 0) {
-		printf("%s: can't set I/O RCA\n", SDMMCDEVNAME(sc));
+		printf("%s: can't set I/O RCA\n", DEVNAME(sc));
 		SET(sf0->flags, SFF_ERROR);
 		return;
 	}
@@ -150,7 +150,7 @@ sdmmc_io_scan(struct sdmmc_softc *sc)
 
 	/* Verify that the RCA has been set by selecting the card. */
 	if (sdmmc_select_card(sc, sf0) != 0) {
-		printf("%s: can't select I/O RCA %d\n", SDMMCDEVNAME(sc),
+		printf("%s: can't select I/O RCA %d\n", DEVNAME(sc),
 		    sf0->rca);
 		SET(sf0->flags, SFF_ERROR);
 		return;
@@ -178,7 +178,7 @@ sdmmc_io_init(struct sdmmc_softc *sc, struct sdmmc_function *sf)
 		    CCCR_BUS_WIDTH_1);
 
 		if (sdmmc_read_cis(sf, &sf->cis) != 0) {
-			printf("%s: can't read CIS\n", SDMMCDEVNAME(sc));
+			printf("%s: can't read CIS\n", DEVNAME(sc));
 			SET(sf->flags, SFF_ERROR);
 			return 1;
 		}
diff --git a/sys/dev/sdmmc/sdmmc_mem.c b/sys/dev/sdmmc/sdmmc_mem.c
index 8750b53c715..d135fb6b334 100644
--- a/sys/dev/sdmmc/sdmmc_mem.c
+++ b/sys/dev/sdmmc/sdmmc_mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdmmc_mem.c,v 1.14 2010/02/10 23:33:08 drahn Exp $	*/
+/*	$OpenBSD: sdmmc_mem.c,v 1.15 2010/08/19 17:54:12 jasper Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -76,7 +76,7 @@ sdmmc_mem_enable(struct sdmmc_softc *sc)
 		}
 		if (!ISSET(sc->sc_flags, SMF_SD_MODE)) {
 			DPRINTF(("%s: can't read memory OCR\n",
-			    SDMMCDEVNAME(sc)));
+			    DEVNAME(sc)));
 			return 1;
 		} else {
 			/* Not a "combo" card. */
@@ -89,7 +89,7 @@ sdmmc_mem_enable(struct sdmmc_softc *sc)
 	host_ocr = sdmmc_chip_host_ocr(sc->sct, sc->sch);
 	if (sdmmc_set_bus_power(sc, host_ocr, card_ocr) != 0) {
 		DPRINTF(("%s: can't supply voltage requested by card\n",
-		    SDMMCDEVNAME(sc)));
+		    DEVNAME(sc)));
 		return 1;
 	}
 
@@ -103,7 +103,7 @@ sdmmc_mem_enable(struct sdmmc_softc *sc)
 
 	/* Send the new OCR value until all cards are ready. */
 	if (sdmmc_mem_send_op_cond(sc, host_ocr, NULL) != 0) {
-		DPRINTF(("%s: can't send memory OCR\n", SDMMCDEVNAME(sc)));
+		DPRINTF(("%s: can't send memory OCR\n", DEVNAME(sc)));
 		return 1;
 	}
 	return 0;
@@ -141,7 +141,7 @@ sdmmc_mem_scan(struct sdmmc_softc *sc)
 			/* No more cards there. */
 			break;
 		} else if (error != 0) {
-			DPRINTF(("%s: can't read CID\n", SDMMCDEVNAME(sc)));
+			DPRINTF(("%s: can't read CID\n", DEVNAME(sc)));
 			break;
 		}
 
@@ -166,7 +166,7 @@ sdmmc_mem_scan(struct sdmmc_softc *sc)
 		 * querying it for its RCA in the case of SD.
 		 */
 		if (sdmmc_set_relative_addr(sc, sf) != 0) {
-			printf("%s: can't set mem RCA\n", SDMMCDEVNAME(sc));
+			printf("%s: can't set mem RCA\n", DEVNAME(sc));
 			sdmmc_function_free(sf);
 			break;
 		}
@@ -175,7 +175,7 @@ sdmmc_mem_scan(struct sdmmc_softc *sc)
 		/* Verify that the RCA has been set by selecting the card. */
 		if (sdmmc_select_card(sc, sf) != 0) {
 			printf("%s: can't select mem RCA %d\n",
-			    SDMMCDEVNAME(sc), sf->rca);
+			    DEVNAME(sc), sf->rca);
 			sdmmc_function_free(sf);
 			break;
 		}
@@ -216,7 +216,7 @@ sdmmc_mem_scan(struct sdmmc_softc *sc)
 		}
 
 #ifdef SDMMC_DEBUG
-		printf("%s: CID: ", SDMMCDEVNAME(sc));
+		printf("%s: CID: ", DEVNAME(sc));
 		sdmmc_print_cid(&sf->cid);
 #endif
 	}
@@ -246,7 +246,7 @@ sdmmc_decode_csd(struct sdmmc_softc *sc, sdmmc_response resp,
 			break;
 		default:
 			printf("%s: unknown SD CSD structure version 0x%x\n",
-			    SDMMCDEVNAME(sc), csd->csdver);
+			    DEVNAME(sc), csd->csdver);
 			return 1;
 			break;
 		}
@@ -256,7 +256,7 @@ sdmmc_decode_csd(struct sdmmc_softc *sc, sdmmc_response resp,
 		if (csd->csdver != MMC_CSD_CSDVER_1_0 &&
 		    csd->csdver != MMC_CSD_CSDVER_2_0) {
 			printf("%s: unknown MMC CSD structure version 0x%x\n",
-			    SDMMCDEVNAME(sc), csd->csdver);
+			    DEVNAME(sc), csd->csdver);
 			return 1;
 		}
 
@@ -306,7 +306,7 @@ sdmmc_decode_cid(struct sdmmc_softc *sc, sdmmc_response resp,
 			break;
 		default:
 			printf("%s: unknown MMC version %d\n",
-			    SDMMCDEVNAME(sc), sf->csd.mmcver);
+			    DEVNAME(sc), sf->csd.mmcver);
 			return 1;
 		}
 	}
@@ -398,7 +398,7 @@ sdmmc_mem_set_blocklen(struct sdmmc_softc *sc, struct sdmmc_function *sf)
 	cmd.c_opcode = MMC_SET_BLOCKLEN;
 	cmd.c_arg = sf->csd.sector_size;
 	cmd.c_flags = SCF_CMD_AC | SCF_RSP_R1;
-	DPRINTF(("%s: read_bl_len=%d sector_size=%d\n", SDMMCDEVNAME(sc),
+	DPRINTF(("%s: read_bl_len=%d sector_size=%d\n", DEVNAME(sc),
 	    1 << sf->csd.read_bl_len, sf->csd.sector_size));
 
 	return sdmmc_mmc_command(sc, &cmd);
diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c
index 09a5f43e029..de146606a9a 100644
--- a/sys/dev/sdmmc/sdmmc_scsi.c
+++ b/sys/dev/sdmmc/sdmmc_scsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdmmc_scsi.c,v 1.23 2010/06/20 23:05:29 mk Exp $	*/
+/*	$OpenBSD: sdmmc_scsi.c,v 1.24 2010/08/19 17:54:12 jasper Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -84,8 +84,6 @@ void	sdmmc_done_xs(struct sdmmc_ccb *);
 void	sdmmc_stimeout(void *);
 void	sdmmc_scsi_minphys(struct buf *, struct scsi_link *);
 
-#define DEVNAME(sc)	SDMMCDEVNAME(sc)
-
 #ifdef SDMMC_DEBUG
 #define DPRINTF(s)	printf s
 #else
diff --git a/sys/dev/sdmmc/sdmmcvar.h b/sys/dev/sdmmc/sdmmcvar.h
index bf90731ab73..169ac764677 100644
--- a/sys/dev/sdmmc/sdmmcvar.h
+++ b/sys/dev/sdmmc/sdmmcvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdmmcvar.h,v 1.16 2009/04/07 16:35:52 blambert Exp $	*/
+/*	$OpenBSD: sdmmcvar.h,v 1.17 2010/08/19 17:54:12 jasper Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -153,7 +153,7 @@ struct sdmmc_function {
  */
 struct sdmmc_softc {
 	struct device sc_dev;		/* base device */
-#define SDMMCDEVNAME(sc)	((sc)->sc_dev.dv_xname)
+#define DEVNAME(sc)	((sc)->sc_dev.dv_xname)
 	sdmmc_chipset_tag_t sct;	/* host controller chipset tag */
 	sdmmc_chipset_handle_t sch;	/* host controller chipset handle */
 	int sc_flags;