summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorxtraeme <xtraeme@NetBSD.org>2008-05-04 17:14:41 +0000
committerxtraeme <xtraeme@NetBSD.org>2008-05-04 17:14:41 +0000
commitdd178c786ecdf5d8f7c6d3df38323ff3f58881cb (patch)
tree4fa486a4004be4fbd54ca6b177718dd61889f433 /sys/dev
parent7db0e57765c5442d9c413d18d63f4c38df9fc014 (diff)
mii_dev is a device_t now.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/gem.c6
-rw-r--r--sys/dev/ic/smc83c170.c6
-rw-r--r--sys/dev/sbus/be.c8
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index fc41812fa44..58c6d002943 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gem.c,v 1.76 2008/04/08 12:07:26 cegger Exp $ */
+/* $NetBSD: gem.c,v 1.77 2008/05/04 17:16:27 xtraeme Exp $ */
/*
*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.76 2008/04/08 12:07:26 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.77 2008/05/04 17:16:27 xtraeme Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -314,7 +314,7 @@ gem_attach(sc, enaddr)
aprint_error_dev(&sc->sc_dev,
"cannot accommodate MII device"
" %s at PHY %d, instance %d\n",
- device_xname(&child->mii_dev),
+ device_xname(child->mii_dev),
child->mii_phy, child->mii_inst);
continue;
}
diff --git a/sys/dev/ic/smc83c170.c b/sys/dev/ic/smc83c170.c
index 24ce7ca1386..1baa5b8ebf2 100644
--- a/sys/dev/ic/smc83c170.c
+++ b/sys/dev/ic/smc83c170.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smc83c170.c,v 1.74 2008/04/28 20:23:51 martin Exp $ */
+/* $NetBSD: smc83c170.c,v 1.75 2008/05/04 17:16:27 xtraeme Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.74 2008/04/28 20:23:51 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.75 2008/05/04 17:16:27 xtraeme Exp $");
#include "bpfilter.h"
@@ -1494,7 +1494,7 @@ epic_mediachange(ifp)
}
#ifdef EPICMEDIADEBUG
printf("%s: using phy %s\n", ifp->if_xname,
- device_xname(&miisc->mii_dev));
+ device_xname(miisc->mii_dev));
#endif
if (miisc->mii_flags & MIIF_HAVEFIBER) {
diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c
index 095ebe72337..20b6e3992fd 100644
--- a/sys/dev/sbus/be.c
+++ b/sys/dev/sbus/be.c
@@ -1,4 +1,4 @@
-/* $NetBSD: be.c,v 1.58 2008/04/28 20:23:57 martin Exp $ */
+/* $NetBSD: be.c,v 1.59 2008/05/04 17:14:41 xtraeme Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.58 2008/04/28 20:23:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.59 2008/05/04 17:14:41 xtraeme Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -393,14 +393,14 @@ beattach(parent, self, aux)
#ifdef DIAGNOSTIC
if (LIST_NEXT(child, mii_list) != NULL) {
aprint_error_dev(&sc->sc_dev, "spurious MII device %s attached\n",
- device_xname(&child->mii_dev));
+ device_xname(child->mii_dev));
}
#endif
if (child->mii_phy != BE_PHY_EXTERNAL ||
child->mii_inst > 0) {
aprint_error_dev(&sc->sc_dev, "cannot accommodate MII device %s"
" at phy %d, instance %d\n",
- device_xname(&child->mii_dev),
+ device_xname(child->mii_dev),
child->mii_phy, child->mii_inst);
} else {
sc->sc_phys[instance] = child->mii_phy;