From owner-svn-src-head@freebsd.org Tue Sep 1 21:52:50 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 3B71937C6E3; Tue, 1 Sep 2020 21:52:50 +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 4Bh15Y6BzXz4WWk; Tue, 1 Sep 2020 21:52:49 +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 CA21020500; Tue, 1 Sep 2020 21:52:46 +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 081LqkGO046783; Tue, 1 Sep 2020 21:52:46 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lqka1046782; Tue, 1 Sep 2020 21:52:46 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012152.081Lqka1046782@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:52:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365152 - head/sys/dev/smc X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/smc X-SVN-Commit-Revision: 365152 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:52:50 -0000 Author: mjg Date: Tue Sep 1 21:52:46 2020 New Revision: 365152 URL: https://svnweb.freebsd.org/changeset/base/365152 Log: smc: clean up empty lines in .c and .h files Modified: head/sys/dev/smc/if_smc.c head/sys/dev/smc/if_smcvar.h Modified: head/sys/dev/smc/if_smc.c ============================================================================== --- head/sys/dev/smc/if_smc.c Tue Sep 1 21:52:35 2020 (r365151) +++ head/sys/dev/smc/if_smc.c Tue Sep 1 21:52:46 2020 (r365152) @@ -434,10 +434,10 @@ smc_detach(device_t dev) if (sc->smc_ifp != NULL) { ether_ifdetach(sc->smc_ifp); } - + callout_drain(&sc->smc_watchdog); callout_drain(&sc->smc_mii_tick_ch); - + #ifdef DEVICE_POLLING if (sc->smc_ifp->if_capenable & IFCAP_POLLING) ether_poll_deregister(sc->smc_ifp); @@ -491,7 +491,6 @@ static device_method_t smc_methods[] = { DEVMETHOD(miibus_readreg, smc_miibus_readreg), DEVMETHOD(miibus_writereg, smc_miibus_writereg), DEVMETHOD(miibus_statchg, smc_miibus_statchg), - { 0, 0 } }; @@ -603,7 +602,7 @@ smc_task_tx(void *context, int pending) sc = ifp->if_softc; SMC_LOCK(sc); - + if (sc->smc_pending == NULL) { SMC_UNLOCK(sc); goto next_packet; @@ -722,7 +721,7 @@ smc_task_rx(void *context, int pending) m_freem(m); break; } - + /* * Point to the start of the packet. */ @@ -749,14 +748,14 @@ smc_task_rx(void *context, int pending) m_freem(m); break; } - + /* * Set the mbuf up the way we want it. */ m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = len + 2; /* XXX: Is this right? */ m_adj(m, ETHER_ALIGN); - + /* * Pull the packet out of the device. Make sure we're in the * right bank first as things may have changed while we were @@ -865,7 +864,7 @@ smc_task_intr(void *context, int pending) sc = ifp->if_softc; SMC_LOCK(sc); - + smc_select_bank(sc, 2); /* @@ -1255,7 +1254,7 @@ static void smc_watchdog(void *arg) { struct smc_softc *sc; - + sc = (struct smc_softc *)arg; device_printf(sc->smc_dev, "watchdog timeout\n"); taskqueue_enqueue(sc->smc_tq, &sc->smc_intr); Modified: head/sys/dev/smc/if_smcvar.h ============================================================================== --- head/sys/dev/smc/if_smcvar.h Tue Sep 1 21:52:35 2020 (r365151) +++ head/sys/dev/smc/if_smcvar.h Tue Sep 1 21:52:46 2020 (r365152) @@ -53,7 +53,7 @@ struct smc_softc { struct task smc_tx; struct mbuf *smc_pending; struct callout smc_watchdog; - + /* MII support */ device_t smc_miibus; struct callout smc_mii_tick_ch;