From owner-svn-src-head@freebsd.org Tue Sep 1 21:56:14 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 26BCF37CF14; Tue, 1 Sep 2020 21:56:14 +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 4Bh19T4HDkz4Y3S; Tue, 1 Sep 2020 21:56:13 +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 CF72F2024B; Tue, 1 Sep 2020 21:56:12 +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 081LuCYT047633; Tue, 1 Sep 2020 21:56:12 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LuAmY047625; Tue, 1 Sep 2020 21:56:10 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012156.081LuAmY047625@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:56:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365165 - head/sys/dev/ral X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/ral X-SVN-Commit-Revision: 365165 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:56:14 -0000 Author: mjg Date: Tue Sep 1 21:56:10 2020 New Revision: 365165 URL: https://svnweb.freebsd.org/changeset/base/365165 Log: ral: clean up empty lines in .c and .h files Modified: head/sys/dev/ral/if_ral_pci.c head/sys/dev/ral/rt2560.c head/sys/dev/ral/rt2560reg.h head/sys/dev/ral/rt2661.c head/sys/dev/ral/rt2661reg.h head/sys/dev/ral/rt2661var.h head/sys/dev/ral/rt2860.c head/sys/dev/ral/rt2860reg.h Modified: head/sys/dev/ral/if_ral_pci.c ============================================================================== --- head/sys/dev/ral/if_ral_pci.c Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/if_ral_pci.c Tue Sep 1 21:56:10 2020 (r365165) @@ -231,7 +231,7 @@ ral_pci_attach(device_t dev) sc->sc_st = rman_get_bustag(psc->mem); sc->sc_sh = rman_get_bushandle(psc->mem); sc->sc_invalid = 1; - + rid = 0; if (ral_msi_disable == 0) { count = 1; @@ -265,7 +265,7 @@ ral_pci_attach(device_t dev) return error; } sc->sc_invalid = 0; - + return 0; } @@ -274,7 +274,7 @@ ral_pci_detach(device_t dev) { struct ral_pci_softc *psc = device_get_softc(dev); struct rt2560_softc *sc = &psc->u.sc_rt2560; - + /* check if device was removed */ sc->sc_invalid = !bus_child_present(dev); Modified: head/sys/dev/ral/rt2560.c ============================================================================== --- head/sys/dev/ral/rt2560.c Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/rt2560.c Tue Sep 1 21:56:10 2020 (r365165) @@ -342,7 +342,7 @@ rt2560_detach(void *xsc) { struct rt2560_softc *sc = xsc; struct ieee80211com *ic = &sc->sc_ic; - + rt2560_stop(sc); ieee80211_ifdetach(ic); @@ -2453,7 +2453,6 @@ rt2560_read_config(struct rt2560_softc *sc) DPRINTF(sc, "rssi correction %d, calibrate 0x%02x\n", sc->rssi_corr, val); } - static void rt2560_scan_start(struct ieee80211com *ic) Modified: head/sys/dev/ral/rt2560reg.h ============================================================================== --- head/sys/dev/ral/rt2560reg.h Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/rt2560reg.h Tue Sep 1 21:56:10 2020 (r365165) @@ -115,7 +115,6 @@ #define RT2560_SECCSR1 0x0158 /* WEP control */ #define RT2560_BBPCSR1 0x015c /* BBP TX Configuration */ - /* possible flags for register RXCSR0 */ #define RT2560_DISABLE_RX (1 << 0) #define RT2560_DROP_CRC_ERROR (1 << 1) Modified: head/sys/dev/ral/rt2661.c ============================================================================== --- head/sys/dev/ral/rt2661.c Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/rt2661.c Tue Sep 1 21:56:10 2020 (r365165) @@ -332,7 +332,7 @@ rt2661_detach(void *xsc) { struct rt2661_softc *sc = xsc; struct ieee80211com *ic = &sc->sc_ic; - + RAL_LOCK(sc); rt2661_stop_locked(sc); RAL_UNLOCK(sc); Modified: head/sys/dev/ral/rt2661reg.h ============================================================================== --- head/sys/dev/ral/rt2661reg.h Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/rt2661reg.h Tue Sep 1 21:56:10 2020 (r365165) @@ -119,7 +119,6 @@ #define RT2661_IO_CNTL_CSR 0x3498 #define RT2661_MCU_CODE_BASE 0x4000 - /* possible flags for register HOST_CMD_CSR */ #define RT2661_KICK_CMD (1 << 7) /* Host to MCU (8051) command identifiers */ Modified: head/sys/dev/ral/rt2661var.h ============================================================================== --- head/sys/dev/ral/rt2661var.h Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/rt2661var.h Tue Sep 1 21:56:10 2020 (r365165) @@ -114,7 +114,7 @@ struct rt2661_softc { * The same in both up to here * ------------------------------------------------ */ - + int sc_flags; #define RAL_FW_LOADED 0x1 #define RAL_INPUT_RUNNING 0x2 Modified: head/sys/dev/ral/rt2860.c ============================================================================== --- head/sys/dev/ral/rt2860.c Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/rt2860.c Tue Sep 1 21:56:10 2020 (r365165) @@ -504,7 +504,6 @@ rt2860_dma_map_addr(void *arg, bus_dma_segment_t *segs *(bus_addr_t *)arg = segs[0].ds_addr; } - static int rt2860_alloc_tx_ring(struct rt2860_softc *sc, struct rt2860_tx_ring *ring) { @@ -2591,7 +2590,7 @@ rt5390_set_chan(struct rt2860_softc *sc, u_int chan) rf = MIN(rf, 0x5f); if (tmp != rf) rt2860_mcu_cmd(sc, 0x74, (tmp << 8 ) | rf, 0); - + if (sc->mac_ver == 0x5390) { if (chan <= 4) rf = 0x73; Modified: head/sys/dev/ral/rt2860reg.h ============================================================================== --- head/sys/dev/ral/rt2860reg.h Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/rt2860reg.h Tue Sep 1 21:56:10 2020 (r365165) @@ -210,7 +210,6 @@ #define RT2860_H2M_BBPAGENT 0x7028 #define RT2860_BCN_BASE(vap) (0x7800 + (vap) * 512) - /* possible flags for RT2860_PCI_CFG */ #define RT2860_PCI_CFG_USB (1 << 17) #define RT2860_PCI_CFG_PCI (1 << 16) @@ -699,13 +698,11 @@ #define RT2860_H2M_BUSY (1 << 24) #define RT2860_TOKEN_NO_INTR 0xff - /* possible flags for MCU command RT2860_MCU_CMD_LEDS */ #define RT2860_LED_RADIO (1 << 13) #define RT2860_LED_LINK_2GHZ (1 << 14) #define RT2860_LED_LINK_5GHZ (1 << 15) - /* possible flags for RT3020 RF register 1 */ #define RT3070_RF_BLOCK (1 << 0) #define RT3070_PLL_PD (1 << 1) @@ -896,7 +893,6 @@ struct rt2860_rxwi { uint8_t snr[2]; uint16_t reserved2; } __packed; - /* first DMA segment contains TXWI + 802.11 header + 32-bit padding */ #define RT2860_TXWI_DMASZ \