From owner-svn-src-head@freebsd.org Tue Sep 1 21:21:05 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 48C6D37950F; Tue, 1 Sep 2020 21:21:05 +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 4Bh0Nx1HVfz4JDP; Tue, 1 Sep 2020 21:21:05 +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 0F88B1F752; Tue, 1 Sep 2020 21:21:05 +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 081LL40d020007; Tue, 1 Sep 2020 21:21:04 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LL3Oh019998; Tue, 1 Sep 2020 21:21:03 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012121.081LL3Oh019998@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:21:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365075 - in head/sys/riscv: include riscv X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/riscv: include riscv X-SVN-Commit-Revision: 365075 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:21:05 -0000 Author: mjg Date: Tue Sep 1 21:21:03 2020 New Revision: 365075 URL: https://svnweb.freebsd.org/changeset/base/365075 Log: riscv: clean up empty lines in .c and .h files Modified: head/sys/riscv/include/atomic.h head/sys/riscv/include/bus.h head/sys/riscv/riscv/busdma_bounce.c head/sys/riscv/riscv/identcpu.c head/sys/riscv/riscv/mem.c head/sys/riscv/riscv/nexus.c head/sys/riscv/riscv/pmap.c head/sys/riscv/riscv/sbi.c Modified: head/sys/riscv/include/atomic.h ============================================================================== --- head/sys/riscv/include/atomic.h Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/include/atomic.h Tue Sep 1 21:21:03 2020 (r365075) @@ -117,7 +117,6 @@ ATOMIC_FCMPSET_ACQ_REL(16); #define atomic_fcmpset_acq_char atomic_fcmpset_acq_8 #define atomic_fcmpset_rel_char atomic_fcmpset_rel_8 - #define atomic_cmpset_short atomic_cmpset_16 #define atomic_cmpset_acq_short atomic_cmpset_acq_16 #define atomic_cmpset_rel_short atomic_cmpset_rel_16 Modified: head/sys/riscv/include/bus.h ============================================================================== --- head/sys/riscv/include/bus.h Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/include/bus.h Tue Sep 1 21:21:03 2020 (r365075) @@ -89,7 +89,6 @@ #define BUS_SPACE_BARRIER_READ 0x01 #define BUS_SPACE_BARRIER_WRITE 0x02 - struct bus_space { /* cookie */ void *bs_cookie; @@ -256,7 +255,6 @@ struct bus_space { bus_size_t, const u_int64_t *, bus_size_t); }; - /* * Utility macros; INTERNAL USE ONLY. */ @@ -282,7 +280,6 @@ struct bus_space { #define __bs_nonsingle_s(type, sz, t, h, o, a, c) \ (*(t)->__bs_opname_s(type,sz))((t)->bs_cookie, h, o, a, c) - /* * Mapping and unmapping operations. */ @@ -293,7 +290,6 @@ struct bus_space { #define bus_space_subregion(t, h, o, s, hp) \ (*(t)->bs_subregion)((t)->bs_cookie, (h), (o), (s), (hp)) - /* * Allocation and deallocation operations. */ @@ -309,8 +305,6 @@ struct bus_space { #define bus_space_barrier(t, h, o, l, f) \ (*(t)->bs_barrier)((t)->bs_cookie, (h), (o), (l), (f)) - - /* * Bus read (single) operations. */ @@ -345,7 +339,6 @@ struct bus_space { #define bus_space_read_multi_stream_8(t, h, o, a, c) \ __bs_nonsingle_s(rm,8,(t),(h),(o),(a),(c)) - /* * Bus read region operations. */ @@ -367,7 +360,6 @@ struct bus_space { #define bus_space_read_region_stream_8(t, h, o, a, c) \ __bs_nonsingle_s(rr,8,(t),(h),(o),(a),(c)) - /* * Bus write (single) operations. */ @@ -381,7 +373,6 @@ struct bus_space { #define bus_space_write_stream_4(t, h, o, v) __bs_ws_s(4,(t),(h),(o),(v)) #define bus_space_write_stream_8(t, h, o, v) __bs_ws_s(8,(t),(h),(o),(v)) - /* * Bus write multiple operations. */ @@ -403,7 +394,6 @@ struct bus_space { #define bus_space_write_multi_stream_8(t, h, o, a, c) \ __bs_nonsingle_s(wm,8,(t),(h),(o),(a),(c)) - /* * Bus write region operations. */ @@ -425,7 +415,6 @@ struct bus_space { #define bus_space_write_region_stream_8(t, h, o, a, c) \ __bs_nonsingle_s(wr,8,(t),(h),(o),(a),(c)) - /* * Set multiple operations. */ @@ -438,7 +427,6 @@ struct bus_space { #define bus_space_set_multi_8(t, h, o, v, c) \ __bs_set(sm,8,(t),(h),(o),(v),(c)) - /* * Set region operations. */ @@ -450,7 +438,6 @@ struct bus_space { __bs_set(sr,4,(t),(h),(o),(v),(c)) #define bus_space_set_region_8(t, h, o, v, c) \ __bs_set(sr,8,(t),(h),(o),(v),(c)) - /* * Copy operations. Modified: head/sys/riscv/riscv/busdma_bounce.c ============================================================================== --- head/sys/riscv/riscv/busdma_bounce.c Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/riscv/busdma_bounce.c Tue Sep 1 21:21:03 2020 (r365075) @@ -400,7 +400,6 @@ bounce_bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmam return (0); } - /* * Allocate a piece of memory that can be efficiently mapped into * bus device space based on the constraints lited in the dma tag. @@ -813,7 +812,6 @@ bounce_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_ if (map->sync_count == 0 || (kvaddr != 0 && kvaddr != sl_vend) || (curaddr != sl_pend)) { - if (++map->sync_count > dmat->common.nsegments) goto cleanup; sl++; Modified: head/sys/riscv/riscv/identcpu.c ============================================================================== --- head/sys/riscv/riscv/identcpu.c Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/riscv/identcpu.c Tue Sep 1 21:21:03 2020 (r365075) @@ -173,7 +173,6 @@ fill_elf_hwcap(void *dummy __unused) elf_hwcap &= hwcap; else elf_hwcap = hwcap; - } } Modified: head/sys/riscv/riscv/mem.c ============================================================================== --- head/sys/riscv/riscv/mem.c Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/riscv/mem.c Tue Sep 1 21:21:03 2020 (r365075) @@ -121,4 +121,3 @@ memrw(struct cdev *dev, struct uio *uio, int flags) return (error); } - Modified: head/sys/riscv/riscv/nexus.c ============================================================================== --- head/sys/riscv/riscv/nexus.c Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/riscv/nexus.c Tue Sep 1 21:21:03 2020 (r365075) @@ -117,7 +117,6 @@ static device_method_t nexus_methods[] = { DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), DEVMETHOD(bus_setup_intr, nexus_setup_intr), DEVMETHOD(bus_teardown_intr, nexus_teardown_intr), - { 0, 0 } }; @@ -193,7 +192,6 @@ nexus_add_child(device_t bus, u_int order, const char return (child); } - /* * Allocate a resource on behalf of child. NB: child is usually going to be a * child of one of our descendants, not a direct child of nexus0. @@ -348,7 +346,6 @@ nexus_set_resource(device_t dev, device_t child, int t return(0); } - static int nexus_deactivate_resource(device_t bus, device_t child, int type, int rid, Modified: head/sys/riscv/riscv/pmap.c ============================================================================== --- head/sys/riscv/riscv/pmap.c Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/riscv/pmap.c Tue Sep 1 21:21:03 2020 (r365075) @@ -543,7 +543,6 @@ pmap_bootstrap_l3(vm_offset_t l1pt, vm_offset_t va, vm l3pt += PAGE_SIZE; } - /* Clean the L2 page table */ memset((void *)l3_start, 0, l3pt - l3_start); @@ -641,7 +640,7 @@ pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, virtual_avail = roundup2(freemempos, L2_SIZE); virtual_end = VM_MAX_KERNEL_ADDRESS - L2_SIZE; kernel_vm_end = virtual_avail; - + pa = pmap_early_vtophys(l1pt, freemempos); physmem_exclude_region(kernstart, pa - kernstart, EXFLAG_NOALLOC); @@ -986,7 +985,6 @@ pmap_map(vm_offset_t *virt, vm_paddr_t start, vm_paddr return PHYS_TO_DMAP(start); } - /* * Add a list of wired pages to the kva * this routine is only used for temporary @@ -1100,7 +1098,7 @@ pmap_remove_pt_page(pmap_t pmap, vm_offset_t va) PMAP_LOCK_ASSERT(pmap, MA_OWNED); return (vm_radix_remove(&pmap->pm_root, pmap_l2_pindex(va))); } - + /* * Decrements a page table page's reference count, which is used to record the * number of valid page table entries within the page. If the reference count @@ -1381,7 +1379,6 @@ retry: return (m); } - /*************************************************** * Pmap allocation/deallocation routines. ***************************************************/ @@ -1506,7 +1503,6 @@ pmap_growkernel(vm_offset_t addr) } } } - /*************************************************** * page management routines. Modified: head/sys/riscv/riscv/sbi.c ============================================================================== --- head/sys/riscv/riscv/sbi.c Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/riscv/sbi.c Tue Sep 1 21:21:03 2020 (r365075) @@ -70,7 +70,6 @@ sbi_get_mvendorid(void) return (SBI_CALL0(SBI_EXT_ID_BASE, SBI_BASE_GET_MVENDORID)); } - static struct sbi_ret sbi_get_marchid(void) {