[src/trunk]: src/sys/dev/usb usbnet(9): Simplify core lock use in usbnet_tick...

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

details:   https://anonhg.NetBSD.org/src/rev/135133e7434e
branches:  trunk
changeset: 369502:135133e7434e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Aug 20 14:08:17 2022 +0000

description:
usbnet(9): Simplify core lock use in usbnet_tick_task.

diffstat:

 sys/dev/usb/usbnet.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r f327a41251d2 -r 135133e7434e sys/dev/usb/usbnet.c
--- a/sys/dev/usb/usbnet.c      Sat Aug 20 14:08:05 2022 +0000
+++ b/sys/dev/usb/usbnet.c      Sat Aug 20 14:08:17 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbnet.c,v 1.104 2022/08/20 14:08:05 riastradh Exp $   */
+/*     $NetBSD: usbnet.c,v 1.105 2022/08/20 14:08:17 riastradh Exp $   */
 
 /*
  * Copyright (c) 2019 Matthew R. Green
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.104 2022/08/20 14:08:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.105 2022/08/20 14:08:17 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -1237,16 +1237,14 @@
        /* Call driver if requested. */
        uno_tick(un);
 
+       mutex_enter(&unp->unp_core_lock);
        DPRINTFN(8, "mii %#jx ifp %#jx", (uintptr_t)mii, (uintptr_t)ifp, 0, 0);
        if (mii) {
-               mutex_enter(&unp->unp_core_lock);
                mii_tick(mii);
                if (!unp->unp_link)
                        (*mii->mii_statchg)(ifp);
-               mutex_exit(&unp->unp_core_lock);
        }
 
-       mutex_enter(&unp->unp_core_lock);
        if (!unp->unp_stopped && !usbnet_isdying(un))
                callout_schedule(&unp->unp_stat_ch, hz);
        mutex_exit(&unp->unp_core_lock);