From owner-svn-src-all@freebsd.org Fri Nov 20 11:25:55 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B0FF32C65B9; Fri, 20 Nov 2020 11:25:55 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CcvPH3QdQz3CD2; Fri, 20 Nov 2020 11:25:55 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 63D62155A7; Fri, 20 Nov 2020 11:25:55 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AKBPtot089444; Fri, 20 Nov 2020 11:25:55 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AKBPtFk089443; Fri, 20 Nov 2020 11:25:55 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202011201125.0AKBPtFk089443@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Fri, 20 Nov 2020 11:25:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367873 - head/sys/arm/allwinner X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/sys/arm/allwinner X-SVN-Commit-Revision: 367873 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Nov 2020 11:25:55 -0000 Author: manu Date: Fri Nov 20 11:25:54 2020 New Revision: 367873 URL: https://svnweb.freebsd.org/changeset/base/367873 Log: if_awg: Remove the taskqueue for miibus_statchg I guess it was added so we can obtain the device lock but we already have it when the function is called. No functional changes intended Modified: head/sys/arm/allwinner/if_awg.c Modified: head/sys/arm/allwinner/if_awg.c ============================================================================== --- head/sys/arm/allwinner/if_awg.c Fri Nov 20 10:48:19 2020 (r367872) +++ head/sys/arm/allwinner/if_awg.c Fri Nov 20 11:25:54 2020 (r367873) @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include @@ -199,7 +198,6 @@ struct awg_softc { device_t dev; device_t miibus; struct callout stat_ch; - struct task link_task; void *ih; u_int mdc_div_ratio_m; int link; @@ -284,11 +282,14 @@ awg_miibus_writereg(device_t dev, int phy, int reg, in } static void -awg_update_link_locked(struct awg_softc *sc) +awg_miibus_statchg(device_t dev) { + struct awg_softc *sc; struct mii_data *mii; uint32_t val; + sc = device_get_softc(dev); + AWG_ASSERT_LOCKED(sc); if ((if_getdrvflags(sc->ifp) & IFF_DRV_RUNNING) == 0) @@ -346,28 +347,6 @@ awg_update_link_locked(struct awg_softc *sc) } static void -awg_link_task(void *arg, int pending) -{ - struct awg_softc *sc; - - sc = arg; - - AWG_LOCK(sc); - awg_update_link_locked(sc); - AWG_UNLOCK(sc); -} - -static void -awg_miibus_statchg(device_t dev) -{ - struct awg_softc *sc; - - sc = device_get_softc(dev); - - taskqueue_enqueue(taskqueue_swi, &sc->link_task); -} - -static void awg_media_status(if_t ifp, struct ifmediareq *ifmr) { struct awg_softc *sc; @@ -1873,7 +1852,6 @@ awg_attach(device_t dev) mtx_init(&sc->mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); callout_init_mtx(&sc->stat_ch, &sc->mtx, 0); - TASK_INIT(&sc->link_task, 0, awg_link_task, sc); /* Setup clocks and regulators */ error = awg_setup_extres(dev);