From owner-svn-src-head@freebsd.org Tue Sep 1 21:34:59 2020 Return-Path: Delivered-To: svn-src-head@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 64A5E37A4DC; Tue, 1 Sep 2020 21:34:59 +0000 (UTC) (envelope-from mjg@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 4Bh0hz1qTxz4NDf; Tue, 1 Sep 2020 21:34:59 +0000 (UTC) (envelope-from mjg@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 21CFF1FE74; Tue, 1 Sep 2020 21:34:59 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LYxSV032110; Tue, 1 Sep 2020 21:34:59 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LYwd6032109; Tue, 1 Sep 2020 21:34:58 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012134.081LYwd6032109@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:34:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365101 - head/sys/dev/ae X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/ae X-SVN-Commit-Revision: 365101 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:34:59 -0000 Author: mjg Date: Tue Sep 1 21:34:58 2020 New Revision: 365101 URL: https://svnweb.freebsd.org/changeset/base/365101 Log: if_ae: clean up empty lines in .c and .h files Modified: head/sys/dev/ae/if_ae.c head/sys/dev/ae/if_aevar.h Modified: head/sys/dev/ae/if_ae.c ============================================================================== --- head/sys/dev/ae/if_ae.c Tue Sep 1 21:34:41 2020 (r365100) +++ head/sys/dev/ae/if_ae.c Tue Sep 1 21:34:58 2020 (r365101) @@ -166,7 +166,6 @@ static device_method_t ae_methods[] = { DEVMETHOD(miibus_readreg, ae_miibus_readreg), DEVMETHOD(miibus_writereg, ae_miibus_writereg), DEVMETHOD(miibus_statchg, ae_miibus_statchg), - { NULL, NULL } }; static driver_t ae_driver = { @@ -314,7 +313,7 @@ ae_attach(device_t dev) goto fail; } } - + ae_init_tunables(sc); ae_phy_reset(sc); /* Reset PHY. */ @@ -399,7 +398,7 @@ ae_attach(device_t dev) fail: if (error != 0) ae_detach(dev); - + return (error); } @@ -503,7 +502,7 @@ ae_reset(ae_softc_t *sc) AE_WRITE_4(sc, AE_MASTER_REG, AE_MASTER_SOFT_RESET); bus_barrier(sc->mem[0], AE_MASTER_REG, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); - + /* * Wait for reset to complete. */ @@ -1022,7 +1021,7 @@ ae_get_vpd_eaddr(ae_softc_t *sc, uint32_t *eaddr) if (found < 2) return (ENOENT); - + eaddr[1] &= 0xffff; /* Only last 2 bytes are used. */ if (AE_CHECK_EADDR_VALID(eaddr) != 0) { if (bootverbose) @@ -1288,7 +1287,7 @@ static void ae_powersave_disable(ae_softc_t *sc) { uint32_t val; - + AE_LOCK_ASSERT(sc); AE_PHY_WRITE(sc, AE_PHY_DBG_ADDR, 0); @@ -1304,7 +1303,7 @@ static void ae_powersave_enable(ae_softc_t *sc) { uint32_t val; - + AE_LOCK_ASSERT(sc); /* @@ -1430,7 +1429,7 @@ static unsigned int ae_tx_avail_size(ae_softc_t *sc) { unsigned int avail; - + if (sc->txd_cur >= sc->txd_ack) avail = AE_TXD_BUFSIZE_DEFAULT - (sc->txd_cur - sc->txd_ack); else @@ -1451,7 +1450,7 @@ ae_encap(ae_softc_t *sc, struct mbuf **m_head) m0 = *m_head; len = m0->m_pkthdr.len; - + if ((sc->flags & AE_FLAG_TXAVAIL) == 0 || len + sizeof(ae_txd_t) + 3 > ae_tx_avail_size(sc)) { #ifdef AE_DEBUG @@ -1599,7 +1598,7 @@ ae_link_task(void *arg, int pending) AE_UNLOCK(sc); /* XXX: could happen? */ return; } - + sc->flags &= ~AE_FLAG_LINK; if ((mii->mii_media_status & (IFM_AVALID | IFM_ACTIVE)) == (IFM_AVALID | IFM_ACTIVE)) { Modified: head/sys/dev/ae/if_aevar.h ============================================================================== --- head/sys/dev/ae/if_aevar.h Tue Sep 1 21:34:41 2020 (r365100) +++ head/sys/dev/ae/if_aevar.h Tue Sep 1 21:34:58 2020 (r365101) @@ -123,7 +123,7 @@ typedef struct ae_softc { struct task int_task; struct task link_task; struct taskqueue *tq; - + /* DMA tags. */ bus_dma_tag_t dma_parent_tag; bus_dma_tag_t dma_rxd_tag; @@ -136,7 +136,7 @@ typedef struct ae_softc { bus_addr_t dma_rxd_busaddr; bus_addr_t dma_txd_busaddr; bus_addr_t dma_txs_busaddr; - + char *rxd_base_dma; /* Start of allocated area. */ ae_rxd_t *rxd_base; /* Start of RxD ring. */ char *txd_base; /* Start of TxD ring. */