Module Name: src
Committed By: kiyohara
Date: Wed Jan 4 02:36:26 UTC 2012
Modified Files:
src/sys/arch/mips/alchemy/dev: aupcmcia.c auspi.c
Log Message:
Use device_t instead of 'struct device *'.
Remove unnecessary \n.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/alchemy/dev/aupcmcia.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/alchemy/dev/auspi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/alchemy/dev/aupcmcia.c
diff -u src/sys/arch/mips/alchemy/dev/aupcmcia.c:1.8 src/sys/arch/mips/alchemy/dev/aupcmcia.c:1.9
--- src/sys/arch/mips/alchemy/dev/aupcmcia.c:1.8 Tue Jan 3 07:36:02 2012
+++ src/sys/arch/mips/alchemy/dev/aupcmcia.c Wed Jan 4 02:36:26 2012
@@ -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
Index: src/sys/arch/mips/alchemy/dev/auspi.c
diff -u src/sys/arch/mips/alchemy/dev/auspi.c:1.7 src/sys/arch/mips/alchemy/dev/auspi.c:1.8
--- src/sys/arch/mips/alchemy/dev/auspi.c:1.7 Tue Jan 3 07:36:02 2012
+++ src/sys/arch/mips/alchemy/dev/auspi.c Wed Jan 4 02:36:26 2012
@@ -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 s
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);
