CVS commit: src/sys/dev/marvell

[Chuck Silvers]

Module Name:    src
Committed By:   chs
Date:           Tue Oct  1 17:35:09 UTC 2019

Modified Files:
        src/sys/dev/marvell: files.armada if_mvxpe.c

Log Message:
make this compile again:
 - remove unused config attributes
 - rename a local variable to avoid a name conflict


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/marvell/files.armada
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/marvell/if_mvxpe.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/dev/marvell/files.armada
diff -u src/sys/dev/marvell/files.armada:1.3 src/sys/dev/marvell/files.armada:1.4
--- src/sys/dev/marvell/files.armada:1.3	Wed Jun  3 04:20:02 2015
+++ src/sys/dev/marvell/files.armada	Tue Oct  1 17:35:09 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: files.armada,v 1.3 2015/06/03 04:20:02 hsuenaga Exp $
+#	$NetBSD: files.armada,v 1.4 2019/10/01 17:35:09 chs Exp $
 # Configuration info for Marvell ARMADA integrated peripherals
 
 # ARMADA XP Buffer Manger
@@ -6,11 +6,9 @@ device	mvxpbm { [port = -1 ], [irq = -1]
 file	dev/marvell/mvxpbm.c
 
 # ARMADA XP Gigabit Ethernet Controller Interface
-define	mvxpe { [port = -1 ], [irq = -1] }
 device	mvxpe: mvxpbm, ether, ifnet, arp, mii
 file	dev/marvell/if_mvxpe.c			mvxpe		needs-flag
 
 # ARMADA XP Cryptographic Engines and Security Accelerator
-define	mvxpsec { [port = -1 ], [irq = -1] }
 device	mvxpsec: opencrypto
 file	dev/marvell/mvxpsec.c			mvxpsec		needs-flag

Index: src/sys/dev/marvell/if_mvxpe.c
diff -u src/sys/dev/marvell/if_mvxpe.c:1.28 src/sys/dev/marvell/if_mvxpe.c:1.29
--- src/sys/dev/marvell/if_mvxpe.c:1.28	Fri Sep 13 07:55:07 2019
+++ src/sys/dev/marvell/if_mvxpe.c	Tue Oct  1 17:35:09 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mvxpe.c,v 1.28 2019/09/13 07:55:07 msaitoh Exp $	*/
+/*	$NetBSD: if_mvxpe.c,v 1.29 2019/10/01 17:35:09 chs Exp $	*/
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.28 2019/09/13 07:55:07 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.29 2019/10/01 17:35:09 chs Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -286,7 +286,7 @@ STATIC void
 mvxpe_attach(device_t parent, device_t self, void *aux)
 {
 	struct mvxpe_softc *sc = device_private(self);
-	struct mii_softc *mii;
+	struct mii_softc *child;
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	struct mii_data * const mii = &sc->sc_mii;
 	struct marvell_attach_args *mva = aux;
@@ -485,14 +485,14 @@ mvxpe_attach(device_t parent, device_t s
 	 * but some boards may not.
 	 */
 	mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, sc->sc_dev->dv_unit, 0);
-	mii = LIST_FIRST(&mii->mii_phys);
-	if (mii == NULL) {
+	child = LIST_FIRST(&mii->mii_phys);
+	if (child == NULL) {
 		aprint_error_dev(self, "no PHY found!\n");
 		ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL);
 		ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL);
 	} else {
 		ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO);
-		phyaddr = MVXPE_PHYADDR_PHYAD(mii->mii_phy);
+		phyaddr = MVXPE_PHYADDR_PHYAD(child->mii_phy);
 		MVXPE_WRITE(sc, MVXPE_PHYADDR, phyaddr);
 		DPRINTSC(sc, 1, "PHYADDR: %#x\n", MVXPE_READ(sc, MVXPE_PHYADDR));
 	}