Module Name: src
Committed By: skrll
Date: Fri Apr 26 18:37:24 UTC 2019
Modified Files:
src/sys/arch/hppa/hppa: mainbus.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/hppa/mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/hppa/mainbus.c
diff -u src/sys/arch/hppa/hppa/mainbus.c:1.3 src/sys/arch/hppa/hppa/mainbus.c:1.4
--- src/sys/arch/hppa/hppa/mainbus.c:1.3 Mon Apr 15 20:45:08 2019
+++ src/sys/arch/hppa/hppa/mainbus.c Fri Apr 26 18:37:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.3 2019/04/15 20:45:08 skrll Exp $ */
+/* $NetBSD: mainbus.c,v 1.4 2019/04/26 18:37:24 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3 2019/04/15 20:45:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2019/04/26 18:37:24 skrll Exp $");
#include "locators.h"
#include "power.h"
@@ -249,7 +249,7 @@ mbus_map(void *v, bus_addr_t bpa, bus_si
*/
error = extent_alloc_region(hppa_io_extent, bpa, size, EX_NOWAIT);
if (error)
- return (error);
+ return error;
/*
* Map the region of I/O space.
@@ -301,7 +301,7 @@ mbus_alloc(void *v, bus_addr_t rstart, b
error = extent_alloc_subregion1(hppa_io_extent, rstart, rend, size,
align, 0, boundary, EX_NOWAIT, &bpa);
if (error)
- return (error);
+ return error;
/*
* Map the region of I/O space.
@@ -758,7 +758,7 @@ mbus_dmamap_create(void *v, bus_size_t s
map = malloc(mapsize, M_DMAMAP,
(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
if (!map)
- return (ENOMEM);
+ return ENOMEM;
memset(map, 0, mapsize);
map->_dm_size = size;
@@ -770,7 +770,7 @@ mbus_dmamap_create(void *v, bus_size_t s
map->dm_nsegs = 0;
*dmamp = map;
- return (0);
+ return 0;
}
/*
@@ -808,7 +808,7 @@ mbus_dmamap_load(void *v, bus_dmamap_t m
map->dm_nsegs = 0;
if (buflen > map->_dm_size)
- return (EINVAL);
+ return EINVAL;
if (p != NULL) {
vm = p->p_vmspace;
@@ -823,7 +823,7 @@ mbus_dmamap_load(void *v, bus_dmamap_t m
map->dm_mapsize = buflen;
map->dm_nsegs = seg + 1;
}
- return (error);
+ return error;
}
/*
@@ -846,7 +846,7 @@ mbus_dmamap_load_mbuf(void *v, bus_dmama
KASSERT(m0->m_flags & M_PKTHDR);
if (m0->m_pkthdr.len > map->_dm_size)
- return (EINVAL);
+ return EINVAL;
first = 1;
seg = 0;
@@ -862,7 +862,7 @@ mbus_dmamap_load_mbuf(void *v, bus_dmama
map->dm_mapsize = m0->m_pkthdr.len;
map->dm_nsegs = seg + 1;
}
- return (error);
+ return error;
}
/*
@@ -908,7 +908,7 @@ mbus_dmamap_load_uio(void *v, bus_dmamap
map->dm_mapsize = uio->uio_resid;
map->dm_nsegs = seg + 1;
}
- return (error);
+ return error;
}
/*
@@ -960,7 +960,7 @@ mbus_dmamap_load_raw(void *v, bus_dmamap
map->dm_nsegs = seg + 1;
map->dm_mapsize = mapsize;
- return (0);
+ return 0;
}
/*
@@ -1070,7 +1070,7 @@ mbus_dmamem_alloc(void *v, bus_size_t si
if ((mlist = malloc(sizeof(*mlist), M_DEVBUF,
(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL)
- return (ENOMEM);
+ return ENOMEM;
/*
* Allocate physical pages from the VM system.
@@ -1085,7 +1085,7 @@ mbus_dmamem_alloc(void *v, bus_size_t si
" failed", __func__, size, low, high, mlist, nsegs,
(flags & BUS_DMA_NOWAIT) == 0));
free(mlist, M_DEVBUF);
- return (error);
+ return error;
}
pa_next = 0;
@@ -1097,7 +1097,7 @@ mbus_dmamem_alloc(void *v, bus_size_t si
if (++seg >= nsegs) {
uvm_pglistfree(mlist);
free(mlist, M_DEVBUF);
- return (ENOMEM);
+ return ENOMEM;
}
segs[seg].ds_addr = pa;
segs[seg].ds_len = PAGE_SIZE;
@@ -1122,7 +1122,7 @@ mbus_dmamem_alloc(void *v, bus_size_t si
* We now have physical pages, but no kernel virtual addresses yet.
* These may be allocated in bus_dmamap_map.
*/
- return (0);
+ return 0;
}
void
@@ -1161,7 +1161,7 @@ mbus_dmamem_map(void *v, bus_dma_segment
/* Get a chunk of kernel virtual space. */
va = uvm_km_alloc(kernel_map, size, 0, UVM_KMF_VAONLY | kmflags);
if (__predict_false(va == 0))
- return (ENOMEM);
+ return ENOMEM;
*kvap = (void *)va;
@@ -1180,7 +1180,7 @@ mbus_dmamem_map(void *v, bus_dma_segment
}
}
pmap_update(pmap_kernel());
- return (0);
+ return 0;
}
/*
@@ -1219,11 +1219,11 @@ mbus_dmamem_mmap(void *v, bus_dma_segmen
continue;
}
- return (btop((u_long)segs[i].ds_addr + off));
+ return btop((u_long)segs[i].ds_addr + off);
}
/* Page not found. */
- return (-1);
+ return -1;
}
int
@@ -1304,8 +1304,8 @@ _bus_dmamap_load_buffer(bus_dma_tag_t t,
* Did we fit?
*/
if (buflen != 0)
- return (EFBIG); /* XXX better return value here? */
- return (0);
+ return EFBIG; /* XXX better return value here? */
+ return 0;
}
const struct hppa_bus_dma_tag hppa_dmatag = {
@@ -1476,7 +1476,7 @@ mbprint(void *aux, const char *pnp)
}
}
- return (UNCONF);
+ return UNCONF;
}
int
