From owner-svn-src-head@freebsd.org Tue Sep 1 21:43: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 C779D37B47A; Tue, 1 Sep 2020 21:43: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 4Bh0vB4NZtz4RcH; Tue, 1 Sep 2020 21:43:50 +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 531E0200B9; Tue, 1 Sep 2020 21:43:50 +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 081LhopX039639; Tue, 1 Sep 2020 21:43:50 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lhn7s039634; Tue, 1 Sep 2020 21:43:49 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012143.081Lhn7s039634@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:43:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365126 - head/sys/dev/bwn X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/bwn X-SVN-Commit-Revision: 365126 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:43:50 -0000 Author: mjg Date: Tue Sep 1 21:43:48 2020 New Revision: 365126 URL: https://svnweb.freebsd.org/changeset/base/365126 Log: bwn: clean up empty lines in .c and .h files Modified: head/sys/dev/bwn/if_bwn.c head/sys/dev/bwn/if_bwn_pci.c head/sys/dev/bwn/if_bwn_pcivar.h head/sys/dev/bwn/if_bwn_phy_g.c head/sys/dev/bwn/if_bwnvar.h Modified: head/sys/dev/bwn/if_bwn.c ============================================================================== --- head/sys/dev/bwn/if_bwn.c Tue Sep 1 21:43:36 2020 (r365125) +++ head/sys/dev/bwn/if_bwn.c Tue Sep 1 21:43:48 2020 (r365126) @@ -580,7 +580,7 @@ bwn_attach(device_t dev) device_printf(sc->sc_dev, "couldn't allocate registers\n"); return (error); } - + if ((error = bhnd_alloc_pmu(sc->sc_dev))) { bus_release_resource(sc->sc_dev, SYS_RES_MEMORY, sc->sc_mem_rid, sc->sc_mem_res); @@ -685,7 +685,7 @@ fail: free(mac, M_DEVBUF); bhnd_release_pmu(dev); bwn_release_bus_providers(sc); - + if (sc->sc_mem_res != NULL) { bus_release_resource(sc->sc_dev, SYS_RES_MEMORY, sc->sc_mem_rid, sc->sc_mem_res); @@ -1307,7 +1307,6 @@ bwn_attach_core(struct bwn_mac *mac) have_bg = 1; have_a = 1; } - #if 0 device_printf(sc->sc_dev, "%s: iost=0x%04hx, have_a=%d, have_bg=%d," @@ -3041,7 +3040,7 @@ bwn_dma_32_setdesc(struct bwn_dma_ring *dr, struct bhnd_dma_translation *dt; uint32_t addr, addrext, ctl; int slot; - + descbase = dr->dr_ring_descbase; dma = &dr->dr_mac->mac_method.dma; dt = &dma->translation; @@ -3137,8 +3136,7 @@ bwn_dma_64_setdesc(struct bwn_dma_ring *dr, uint32_t addrext; uint32_t ctl0, ctl1; int slot; - - + descbase = dr->dr_ring_descbase; dma = &dr->dr_mac->mac_method.dma; dt = &dma->translation; @@ -3686,7 +3684,6 @@ bwn_gpio_control(struct bwn_mac *mac, uint32_t pins) return (0); } - static int bwn_gpio_init(struct bwn_mac *mac) { @@ -4527,7 +4524,6 @@ bwn_fwinitvals_write(struct bwn_mac *mac, const struct BWN_WRITE_4(mac, offset, be32toh(iv->data.d32)); iv = GET_NEXTIV32(iv); } else { - if (array_size < sizeof(iv->data.d16)) goto fail; array_size -= sizeof(iv->data.d16); @@ -6008,7 +6004,6 @@ bwn_rxeof(struct bwn_mac *mac, struct mbuf *m, const v break; } - phytype = chanstat & BWN_RX_CHAN_PHYTYPE; if (macstat & BWN_RX_MAC_FCSERR) @@ -7171,7 +7166,6 @@ bwn_dma_attach(struct bwn_mac *mac) mac->mac_dmatype); return (ENXIO); } - /* Fetch our device->host DMA translation and tag */ error = bhnd_get_dma_translation(sc->sc_dev, addr_width, 0, &dmat, Modified: head/sys/dev/bwn/if_bwn_pci.c ============================================================================== --- head/sys/dev/bwn/if_bwn_pci.c Tue Sep 1 21:43:36 2020 (r365125) +++ head/sys/dev/bwn/if_bwn_pci.c Tue Sep 1 21:43:48 2020 (r365126) @@ -90,7 +90,6 @@ static const struct bwn_pci_device siba_devices[] = { BWN_QUIRK_UNTESTED), BWN_BCM_DEV(BCM4328_D11G, "BCM4328/4312 802.11g", 0), - { 0, 0, NULL, 0 } }; @@ -102,7 +101,6 @@ static const struct bwn_pci_device bcma_devices[] = { BWN_BCM_DEV(BCM43224_D11N, "BCM43224 802.11n Dual-Band", 0), BWN_BCM_DEV(BCM43224_D11N_ID_VEN1, "BCM43224 802.11n Dual-Band",0), BWN_BCM_DEV(BCM43225_D11N2G, "BCM43225 802.11n 2GHz", 0), - { 0, 0, NULL, 0} }; Modified: head/sys/dev/bwn/if_bwn_pcivar.h ============================================================================== --- head/sys/dev/bwn/if_bwn_pcivar.h Tue Sep 1 21:43:36 2020 (r365125) +++ head/sys/dev/bwn/if_bwn_pcivar.h Tue Sep 1 21:43:48 2020 (r365126) @@ -91,7 +91,6 @@ struct bwn_pci_device { uint32_t quirks; }; - #define BWN_BCM_DEV(_devid, _desc, _quirks) \ { PCI_VENDOR_BROADCOM, PCI_DEVID_ ## _devid, \ "Broadcom " _desc " Wireless", _quirks } Modified: head/sys/dev/bwn/if_bwn_phy_g.c ============================================================================== --- head/sys/dev/bwn/if_bwn_phy_g.c Tue Sep 1 21:43:36 2020 (r365125) +++ head/sys/dev/bwn/if_bwn_phy_g.c Tue Sep 1 21:43:48 2020 (r365126) @@ -1689,7 +1689,6 @@ bwn_wa_grev1(struct bwn_mac *mac) bwn_ofdmtab_write_2(mac, BWN_OFDMTAB_AGC2, i, bwn_tab_noise_g2[i]); - for (i = 0; i < N(bwn_tab_rotor); i++) bwn_ofdmtab_write_4(mac, BWN_OFDMTAB_ROTOR, i, bwn_tab_rotor[i]); Modified: head/sys/dev/bwn/if_bwnvar.h ============================================================================== --- head/sys/dev/bwn/if_bwnvar.h Tue Sep 1 21:43:36 2020 (r365125) +++ head/sys/dev/bwn/if_bwnvar.h Tue Sep 1 21:43:48 2020 (r365126) @@ -161,7 +161,6 @@ struct bwn_mac; #define BWN_DMA_WRITE(dr, offset, value) \ (BWN_WRITE_4(dr->dr_mac, dr->dr_base + offset, value)) - typedef enum { BWN_PHY_BAND_2G = 0, BWN_PHY_BAND_5G_LO = 1,