diff --git a/sys/arch/mips/alchemy/dev/aupcmcia.c b/sys/arch/mips/alchemy/dev/aupcmcia.c
index 358d94d0d4db..f7df481bfb7d 100644
--- a/sys/arch/mips/alchemy/dev/aupcmcia.c
+++ b/sys/arch/mips/alchemy/dev/aupcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aupcmcia.c,v 1.8 2012/01/03 07:36:02 kiyohara Exp $ */
+/* $NetBSD: aupcmcia.c,v 1.9 2012/01/04 02:36:26 kiyohara Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -35,7 +35,7 @@
 /* #include "pci.h" */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aupcmcia.c,v 1.8 2012/01/03 07:36:02 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aupcmcia.c,v 1.9 2012/01/04 02:36:26 kiyohara Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -389,14 +389,14 @@ aupcm_event_thread(void *arg)
 			if (sc->sc_slot_status(sp->as_slot) != 0) {
 				if (!sp->as_status) {
 					DPRINTF(("%s: card %d insertion\n",
-						    sc->sc_dev.dv_xname, i));
+					    device_xname(sc->sc_dev), i));
 					attach |= (1 << i);
 					sp->as_status = 1;
 				}
 			} else {
 				if (sp->as_status) {
 					DPRINTF(("%s: card %d removal\n",
-						    sc->sc_dev.dv_xname, i));
+					    device_xname(sc->sc_dev), i));
 					detach |= (1 << i);
 					sp->as_status = 0;
 				}
@@ -409,8 +409,7 @@ aupcm_event_thread(void *arg)
 
 			if (detach & (1 << i)) {
 				aupcm_slot_disable(sp);
-				pcmcia_card_detach(sp->as_pcmcia,
-				    DETACH_FORCE);
+				pcmcia_card_detach(sp->as_pcmcia, DETACH_FORCE);
 			} else if (attach & (1 << i)) {
 				/*
 				 * until the function is enabled, don't
diff --git a/sys/arch/mips/alchemy/dev/auspi.c b/sys/arch/mips/alchemy/dev/auspi.c
index 7391e84e96cc..6134e90cb1bd 100644
--- a/sys/arch/mips/alchemy/dev/auspi.c
+++ b/sys/arch/mips/alchemy/dev/auspi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auspi.c,v 1.7 2012/01/03 07:36:02 kiyohara Exp $ */
+/* $NetBSD: auspi.c,v 1.8 2012/01/04 02:36:26 kiyohara Exp $ */
 
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auspi.c,v 1.7 2012/01/03 07:36:02 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auspi.c,v 1.8 2012/01/04 02:36:26 kiyohara Exp $");
 
 #include "locators.h"
 
@@ -162,7 +162,7 @@ auspi_attach(device_t parent, device_t self, void *aux)
 	sc->sc_ih = au_intr_establish(aa->aupsc_irq, 0, IPL_BIO, IST_LEVEL,
 	    auspi_intr, sc);
 
-	(void) config_found_ia(&sc->sc_dev, "spibus", &sba, spibus_print);
+	(void) config_found_ia(self, "spibus", &sba, spibus_print);
 }
 
 int
@@ -376,15 +376,15 @@ auspi_intr(void *arg)
 
 	if (ev & SPIMSK_MM) {
 		printf("%s: multiple masters detected!\n",
-		    sc->sc_dev.dv_xname);
+		    device_xname(sc->sc_dev));
 		err = EIO;
 	}
 	if (ev & SPIMSK_RO) {
-		printf("%s: receive overflow\n", sc->sc_dev.dv_xname);
+		printf("%s: receive overflow\n", device_xname(sc->sc_dev));
 		err = EIO;
 	}
 	if (ev & SPIMSK_TU) {
-		printf("%s: transmit underflow\n", sc->sc_dev.dv_xname);
+		printf("%s: transmit underflow\n", device_xname(sc->sc_dev));
 		err = EIO;
 	}
 	if (err) {
@@ -409,7 +409,7 @@ auspi_intr(void *arg)
 			if ((sc->sc_wchunk != NULL) ||
 			    (sc->sc_rchunk != NULL)) {
 				printf("%s: partial transfer?\n",
-				    sc->sc_dev.dv_xname);
+				    device_xname(sc->sc_dev));
 				err = EIO;
 			} 
 			auspi_done(sc, err);