From owner-svn-src-all@freebsd.org Tue Sep 1 21:54:01 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 5A5F137C85F; Tue, 1 Sep 2020 21:54:01 +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 4Bh16w2YK3z4Wyw; Tue, 1 Sep 2020 21:54:00 +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 BBD822004B; Tue, 1 Sep 2020 21:53:58 +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 081Lrwgv047088; Tue, 1 Sep 2020 21:53:58 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LrwRl047087; Tue, 1 Sep 2020 21:53:58 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012153.081LrwRl047087@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:53:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365157 - head/sys/dev/sdio X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/sdio X-SVN-Commit-Revision: 365157 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 21:54:01 -0000 Author: mjg Date: Tue Sep 1 21:53:58 2020 New Revision: 365157 URL: https://svnweb.freebsd.org/changeset/base/365157 Log: sdio: clean up empty lines in .c and .h files Modified: head/sys/dev/sdio/sdiob.c Modified: head/sys/dev/sdio/sdiob.c ============================================================================== --- head/sys/dev/sdio/sdiob.c Tue Sep 1 21:53:44 2020 (r365156) +++ head/sys/dev/sdio/sdiob.c Tue Sep 1 21:53:58 2020 (r365157) @@ -388,7 +388,6 @@ sdiob_rw_extended_sc(struct sdiob_softc *sc, uint8_t f */ while (sc->cardinfo.support_multiblk && size > 4 && size >= sc->cardinfo.f[fn].cur_blksize) { - b_count = size / sc->cardinfo.f[fn].cur_blksize; KASSERT(b_count >= 1, ("%s: block count too small %u size %u " "cur_blksize %u\n", __func__, b_count, size, @@ -531,7 +530,6 @@ sdiob_write_ivar(device_t dev, device_t child, int whi return (0); } - /* -------------------------------------------------------------------------- */ /* * Newbus functions for ourselves to probe/attach/detach and become a proper @@ -565,7 +563,6 @@ sdiob_attach(device_t dev) * Do this before any child gets a chance to attach. */ for (i = 0; i < sc->cardinfo.num_funcs; i++) { - sc->child[i] = device_add_child(dev, NULL, -1); if (sc->child[i] == NULL) { device_printf(dev, "%s: failed to add child\n", __func__); @@ -612,7 +609,6 @@ sdiob_detach(device_t dev) return (EOPNOTSUPP); } - /* -------------------------------------------------------------------------- */ /* * driver(9) and device(9) "control plane". @@ -622,7 +618,6 @@ sdiob_detach(device_t dev) */ static device_method_t sdiob_methods[] = { - /* Device interface. */ DEVMETHOD(device_probe, sdiob_probe), DEVMETHOD(device_attach, sdiob_attach), @@ -650,7 +645,6 @@ static driver_t sdiob_driver = { 0 }; - /* -------------------------------------------------------------------------- */ /* * CIS related. @@ -859,7 +853,6 @@ sdiob_get_card_info(struct sdiob_softc *sc) mmcp = &sc->ccb->ccb_h.path->device->mmc_ident_data; fn_max = MIN(mmcp->sdio_func_count + 1, nitems(sc->cardinfo.f)); for (fn = 1; fn < fn_max; fn++) { - fbr_addr = SD_IO_FBR_START * fn + SD_IO_FBR_CIS_OFFSET; error = sdio_read_direct_sc(sc, 0, fbr_addr++, &val); @@ -910,7 +903,6 @@ sdiob_get_card_info(struct sdiob_softc *sc) } return (error); } - /* -------------------------------------------------------------------------- */ /*