Tue Jul 7 06:59:22 2020 UTC ()

"no media present" is intended case on tlphy(4), so don't use
aprint_error_dev().


(msaitoh)

diff -r1.68 -r1.69 src/sys/dev/mii/tlphy.c

--- src/sys/dev/mii/tlphy.c 2020/03/15 23:04:50	1.68
+++ src/sys/dev/mii/tlphy.c 2020/07/07 06:59:22	1.69

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tlphy.c,v 1.68 2020/03/15 23:04:50 thorpej Exp $	*/
+/*	$NetBSD: tlphy.c,v 1.69 2020/07/07 06:59:22 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -49,27 +49,27 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Driver for Texas Instruments's ThunderLAN PHYs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.68 2020/03/15 23:04:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.69 2020/07/07 06:59:22 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
 #include <sys/bus.h>
 #include <net/if.h>
 #include <net/if_media.h>
 @@ -154,50 +154,52 @@ tlphyattach(device_t parent, device_t se
 	 * be another PHY on the MII wired up to the UTP connector.  The parent
 	 * indicates this to us by specifying the TLPHY_MEDIA_NO_10_T bit.
 	 */
 	tsc->sc_tlphycap = tlsc->tl_product->tp_tlphymedia;
 	if ((tsc->sc_tlphycap & TLPHY_MEDIA_NO_10_T) == 0) {
 		PHY_READ(sc, MII_BMSR, &sc->mii_capabilities);
 		sc->mii_capabilities &= ma->mii_capmask;
 	} else
 		sc->mii_capabilities = 0;
 	mii_unlock(mii);
 #define	ADD(m, c)	ifmedia_add(&mii->mii_media, (m), (c), NULL)
-#define	PRINT(str)	aprint_normal("%s%s", sep, str); sep = ", "
+#define	PRINT(str)					     \
 	do {						     \
 		aprint_normal("%s%s", sep, str);	     \
 		sep = ", ";				     \
 	} while (/* CONSTCOND */0)
 	if (tsc->sc_tlphycap) {
 		mii_lock(mii);
 		sc->mii_anegticks = MII_ANEGTICKS;
 		mii_unlock(mii);
 		aprint_normal_dev(self, "");
 		if (tsc->sc_tlphycap & TLPHY_MEDIA_10_2) {
 			ADD(IFM_MAKEWORD(IFM_ETHER, IFM_10_2, 0, sc->mii_inst),
 );
 			PRINT("10base2");
 		} else if (tsc->sc_tlphycap & TLPHY_MEDIA_10_5) {
 			ADD(IFM_MAKEWORD(IFM_ETHER, IFM_10_5, 0, sc->mii_inst),
 );
 			PRINT("10base5");
 		} else
 			PRINT("no media present");
 		aprint_normal("\n");
+	}
 	if (sc->mii_capabilities & BMSR_MEDIAMASK)
 		mii_phy_add_media(sc);
 	else {
 		if ((tsc->sc_tlphycap &
 		    (TLPHY_MEDIA_10_2 | TLPHY_MEDIA_10_5)) == 0)
 			aprint_error_dev(self, "no media present\n");
 		/*
 		 * mii_phy_add_media() automatically install power handler,
 		 * but if_media_add() doesn't. Do it now.
 		 */
 		if (!pmf_device_register(self, NULL, mii_phy_resume)) {
 			aprint_error_dev(self,
 			    "couldn't establish power handler\n");
+		}
+	}
 #undef ADD
 #undef PRINT
+}