 @@ -1,14 +1,14 @@
-/* $NetBSD: if_msk.c,v 1.113 2020/05/11 23:47:45 jakllsch Exp $ */
+/* $NetBSD: if_msk.c,v 1.114 2020/10/04 16:23:04 jakllsch Exp $ */
 /*	$OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -42,27 +42,27 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.113 2020/05/11 23:47:45 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.114 2020/10/04 16:23:04 jakllsch Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/callout.h>
 #include <sys/sysctl.h>
 @@ -245,27 +245,27 @@ msk_miibus_readreg(device_t dev, int phy
 	int i;
 	SK_YU_WRITE_2(sc_if, YUKON_SMICR, YU_SMICR_PHYAD(phy) |
 		      YU_SMICR_REGAD(reg) | YU_SMICR_OP_READ);
 	for (i = 0; i < SK_TIMEOUT; i++) {
 		DELAY(1);
 		data = SK_YU_READ_2(sc_if, YUKON_SMICR);
 		if (data & YU_SMICR_READ_VALID)
 			break;
+	}
 	if (i == SK_TIMEOUT) {
-		aprint_error_dev(sc_if->sk_dev, "phy failed to come ready\n");
+		device_printf(sc_if->sk_dev, "phy failed to come ready\n");
 		return ETIMEDOUT;
+	}
 	DPRINTFN(9, ("msk_miibus_readreg: i=%d, timeout=%d\n", i, SK_TIMEOUT));
 	*val = SK_YU_READ_2(sc_if, YUKON_SMIDR);
 	DPRINTFN(9, ("msk_miibus_readreg phy=%d, reg=%#x, val=%#hx\n",
 		phy, reg, *val));
 	return 0;
+}
 @@ -279,27 +279,27 @@ msk_miibus_writereg(device_t dev, int ph
 		     phy, reg, val));
 	SK_YU_WRITE_2(sc_if, YUKON_SMIDR, val);
 	SK_YU_WRITE_2(sc_if, YUKON_SMICR, YU_SMICR_PHYAD(phy) |
 		      YU_SMICR_REGAD(reg) | YU_SMICR_OP_WRITE);
 	for (i = 0; i < SK_TIMEOUT; i++) {
 		DELAY(1);
 		if (!(SK_YU_READ_2(sc_if, YUKON_SMICR) & YU_SMICR_BUSY))
 			break;
+	}
 	if (i == SK_TIMEOUT) {
-		aprint_error_dev(sc_if->sk_dev, "phy write timed out\n");
+		device_printf(sc_if->sk_dev, "phy write timed out\n");
 		return ETIMEDOUT;
+	}
 	return 0;
+}
 static void
 msk_miibus_statchg(struct ifnet *ifp)
+{
 	struct sk_if_softc *sc_if = ifp->if_softc;
 	struct mii_data *mii = &sc_if->sk_mii;
 	struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
 	int gpcr;
 @@ -2025,27 +2025,27 @@ msk_start(struct ifnet *ifp)
+}
 static void
 msk_watchdog(struct ifnet *ifp)
+{
 	struct sk_if_softc *sc_if = ifp->if_softc;
 	/*
 	 * Reclaim first as there is a possibility of losing Tx completion
 	 * interrupts.
 	 */
 	msk_txeof(sc_if);
 	if (sc_if->sk_cdata.sk_tx_cnt != 0) {
-		aprint_error_dev(sc_if->sk_dev, "watchdog timeout\n");
+		device_printf(sc_if->sk_dev, "watchdog timeout\n");
 		if_statinc(ifp, if_oerrors);
 		/* XXX Resets both ports; we shouldn't do that. */
 		mskc_reset(sc_if->sk_softc);
 		msk_reset(sc_if);
 		msk_init(ifp);
+	}
+}
 static bool
 mskc_suspend(device_t dv, const pmf_qual_t *qual)
+{