[src/trunk]: src/sys/arch/arm/arm32 More KNF

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3236a4eb4b9d
branches:  trunk
changeset: 358440:3236a4eb4b9d
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Dec 29 08:58:57 2017 +0000

description:
More KNF

diffstat:

 sys/arch/arm/arm32/bus_dma.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (53 lines):

diff -r b64c2460e16f -r 3236a4eb4b9d sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c      Fri Dec 29 08:56:49 2017 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c      Fri Dec 29 08:58:57 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.100 2017/12/29 08:56:49 skrll Exp $      */
+/*     $NetBSD: bus_dma.c,v 1.101 2017/12/29 08:58:57 skrll Exp $      */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 #include "opt_arm_bus_space.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.100 2017/12/29 08:56:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.101 2017/12/29 08:58:57 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -186,7 +186,7 @@
        uint32_t _ds_flags = coherent ? _BUS_DMAMAP_COHERENT : 0;
 
        if (nseg > 0)
-               lastaddr = segs[nseg-1].ds_addr + segs[nseg-1].ds_len;
+               lastaddr = segs[nseg - 1].ds_addr + segs[nseg - 1].ds_len;
        else
                lastaddr = 0xdead;
 
@@ -235,12 +235,12 @@
         * previous segment if possible.
         */
        if (nseg > 0 && curaddr == lastaddr &&
-           segs[nseg-1].ds_len + sgsize <= map->dm_maxsegsz &&
-           ((segs[nseg-1]._ds_flags ^ _ds_flags) & _BUS_DMAMAP_COHERENT) == 0 &&
+           segs[nseg - 1].ds_len + sgsize <= map->dm_maxsegsz &&
+           ((segs[nseg - 1]._ds_flags ^ _ds_flags) & _BUS_DMAMAP_COHERENT) == 0 &&
            (map->_dm_boundary == 0 ||
-            (segs[nseg-1].ds_addr & bmask) == (curaddr & bmask))) {
+            (segs[nseg - 1].ds_addr & bmask) == (curaddr & bmask))) {
                /* coalesce */
-               segs[nseg-1].ds_len += sgsize;
+               segs[nseg - 1].ds_len += sgsize;
        } else if (nseg >= map->_dm_segcnt) {
                return EFBIG;
        } else {
@@ -1617,7 +1617,7 @@
        struct pglist mlist;
        int curseg, error;
 
-       KASSERTMSG(boundary == 0 || (boundary & (boundary-1)) == 0,
+       KASSERTMSG(boundary == 0 || (boundary & (boundary - 1)) == 0,
            "invalid boundary %#lx", boundary);
 
 #ifdef DEBUG_DMA