From owner-svn-src-all@freebsd.org Tue Sep 1 22:10:38 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 7BC6337EB35; Tue, 1 Sep 2020 22:10:38 +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 4Bh1V56Ps7z3SN0; Tue, 1 Sep 2020 22:10:37 +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 E7A8A2070F; Tue, 1 Sep 2020 22:10:35 +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 081MAZqV057522; Tue, 1 Sep 2020 22:10:35 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MAZd1056993; Tue, 1 Sep 2020 22:10:35 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012210.081MAZd1056993@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 22:10:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365217 - head/sys/dev/cfi X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/cfi X-SVN-Commit-Revision: 365217 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.33 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: Tue, 01 Sep 2020 22:10:38 -0000 Author: mjg Date: Tue Sep 1 22:10:34 2020 New Revision: 365217 URL: https://svnweb.freebsd.org/changeset/base/365217 Log: cfi: clean up empty lines in .c and .h files Modified: head/sys/dev/cfi/cfi_bus_nexus.c head/sys/dev/cfi/cfi_core.c head/sys/dev/cfi/cfi_disk.c Modified: head/sys/dev/cfi/cfi_bus_nexus.c ============================================================================== --- head/sys/dev/cfi/cfi_bus_nexus.c Tue Sep 1 22:10:24 2020 (r365216) +++ head/sys/dev/cfi/cfi_bus_nexus.c Tue Sep 1 22:10:34 2020 (r365217) @@ -72,7 +72,6 @@ static device_method_t cfi_nexus_methods[] = { DEVMETHOD(device_probe, cfi_nexus_probe), DEVMETHOD(device_attach, cfi_nexus_attach), DEVMETHOD(device_detach, cfi_detach), - {0, 0} }; Modified: head/sys/dev/cfi/cfi_core.c ============================================================================== --- head/sys/dev/cfi/cfi_core.c Tue Sep 1 22:10:24 2020 (r365216) +++ head/sys/dev/cfi/cfi_core.c Tue Sep 1 22:10:34 2020 (r365217) @@ -162,7 +162,7 @@ uint8_t cfi_read_qry(struct cfi_softc *sc, u_int ofs) { uint8_t val; - + cfi_write(sc, CFI_QRY_CMD_ADDR * sc->sc_width, CFI_QRY_CMD_DATA); val = cfi_read(sc, ofs * sc->sc_width); cfi_reset_default(sc); @@ -751,12 +751,10 @@ cfi_write_block(struct cfi_softc *sc) /* Fall through to single word case */ break; } - } /* Write the block one byte/word at a time. */ for (i = 0; i < sc->sc_wrbufsz; i += sc->sc_width) { - /* Avoid writing unless we are actually changing bits */ if (!neederase) { switch (sc->sc_width) { Modified: head/sys/dev/cfi/cfi_disk.c ============================================================================== --- head/sys/dev/cfi/cfi_disk.c Tue Sep 1 22:10:24 2020 (r365216) +++ head/sys/dev/cfi/cfi_disk.c Tue Sep 1 22:10:34 2020 (r365217) @@ -309,7 +309,6 @@ cfi_disk_getattr(struct bio *bp) return (0); } - static void cfi_disk_strategy(struct bio *bp) { @@ -350,7 +349,6 @@ static device_method_t cfi_disk_methods[] = { DEVMETHOD(device_probe, cfi_disk_probe), DEVMETHOD(device_attach, cfi_disk_attach), DEVMETHOD(device_detach, cfi_disk_detach), - { 0, 0 } }; static driver_t cfi_disk_driver = {