[src/netbsd-7]: src/sys/dev/pci Pull up following revision(s) (requested by c...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/51c19c8e797c
branches:  netbsd-7
changeset: 798820:51c19c8e797c
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jan 11 13:05:13 2015 +0000

description:
Pull up following revision(s) (requested by chs in ticket #406):
        sys/dev/pci/if_dge.c: revision 1.39
fix device/softc split botch.

diffstat:

 sys/dev/pci/if_dge.c |  14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (58 lines):

diff -r 1defd9be99ed -r 51c19c8e797c sys/dev/pci/if_dge.c
--- a/sys/dev/pci/if_dge.c      Sun Jan 11 13:02:41 2015 +0000
+++ b/sys/dev/pci/if_dge.c      Sun Jan 11 13:05:13 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_dge.c,v 1.38 2014/08/10 16:44:36 tls Exp $ */
+/*     $NetBSD: if_dge.c,v 1.38.2.1 2015/01/11 13:05:13 martin Exp $ */
 
 /*
  * Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.38 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.38.2.1 2015/01/11 13:05:13 martin Exp $");
 
 
 
@@ -630,7 +630,7 @@
 static int     dge_xgmii_mediachange(struct ifnet *);
 static void    dge_xgmii_mediastatus(struct ifnet *, struct ifmediareq *);
 static void    dge_xgmii_reset(struct dge_softc *);
-static void    dge_xgmii_writereg(device_t, int, int, int);
+static void    dge_xgmii_writereg(struct dge_softc *, int, int, int);
 
 
 CFATTACH_DECL_NEW(dge, sizeof(struct dge_softc),
@@ -2379,11 +2379,9 @@
         return mdic;
 }
 
-
 static void
-dge_xgmii_writereg(device_t self, int phy, int reg, int val)
+dge_xgmii_writereg(struct dge_softc *sc, int phy, int reg, int val)
 {
-       struct dge_softc *sc = device_private(self);
        int mdic;
 
        CSR_WRITE(sc, DGE_MDIRW, val);
@@ -2393,7 +2391,7 @@
                return;
        }
        if (((mdic = phwait(sc, phy, reg, 1, MDIO_WRITE)) & MDIO_CMD)) {
-               printf("%s: read cycle timeout; phy %d reg %d\n",
+               printf("%s: write cycle timeout; phy %d reg %d\n",
                    device_xname(sc->sc_dev), phy, reg);
                return;
        }
@@ -2402,7 +2400,7 @@
 static void
 dge_xgmii_reset(struct dge_softc *sc)
 {
-       dge_xgmii_writereg((void *)sc, 0, 0, BMCR_RESET);
+       dge_xgmii_writereg(sc, 0, 0, BMCR_RESET);
 }
 
 static int