[src/trunk]: src/sys/dev/ic KNF. No functional change.

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

details:   https://anonhg.NetBSD.org/src/rev/8797f2bcf6fb
branches:  trunk
changeset: 815207:8797f2bcf6fb
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri May 06 04:46:17 2016 +0000

description:
KNF. No functional change.

diffstat:

 sys/dev/ic/wdc.c |  30 +++++++++++++-----------------
 1 files changed, 13 insertions(+), 17 deletions(-)

diffs (76 lines):

diff -r 003db31ff26d -r 8797f2bcf6fb sys/dev/ic/wdc.c
--- a/sys/dev/ic/wdc.c  Fri May 06 03:04:14 2016 +0000
+++ b/sys/dev/ic/wdc.c  Fri May 06 04:46:17 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc.c,v 1.280 2016/01/18 04:46:47 msaitoh Exp $ */
+/*     $NetBSD: wdc.c,v 1.281 2016/05/06 04:46:17 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1998, 2001, 2003 Manuel Bouyer.  All rights reserved.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.280 2016/01/18 04:46:47 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.281 2016/05/06 04:46:17 msaitoh Exp $");
 
 #include "opt_ata.h"
 #include "opt_wdc.h"
@@ -989,10 +989,8 @@
                                 * DMA engine
                                 */
                                if (chp->ch_flags & ATACH_DMA_WAIT) {
-                                       (*wdc->dma_finish)(
-                                           wdc->dma_arg,
-                                           chp->ch_channel,
-                                           xfer->c_drive,
+                                       (*wdc->dma_finish)(wdc->dma_arg,
+                                           chp->ch_channel, xfer->c_drive,
                                            WDC_DMAEND_ABRT_QUIET);
                                        chp->ch_flags &= ~ATACH_DMA_WAIT;
                                }
@@ -1027,10 +1025,11 @@
 #endif
        wdc->reset(chp, poll);
 
-       drv_mask1 = (chp->ch_drive[0].drive_type !=  ATA_DRIVET_NONE) ? 0x01:0x00;
+       drv_mask1 = (chp->ch_drive[0].drive_type !=  ATA_DRIVET_NONE)
+           ? 0x01 : 0x00;
        if (chp->ch_ndrives > 1) 
-               drv_mask1 |=
-                   (chp->ch_drive[1].drive_type != ATA_DRIVET_NONE) ? 0x02:0x00;
+               drv_mask1 |= (chp->ch_drive[1].drive_type != ATA_DRIVET_NONE)
+                   ? 0x02 : 0x00;
        drv_mask2 = __wdcwait_reset(chp, drv_mask1,
            (poll == RESET_SLEEP) ? 0 : 1);
        if (drv_mask2 != drv_mask1) {
@@ -1336,15 +1335,13 @@
        if ((chp->ch_flags & ATACH_IRQ_WAIT) != 0) {
                __wdcerror(chp, "lost interrupt");
                printf("\ttype: %s tc_bcount: %d tc_skip: %d\n",
-                   (xfer->c_flags & C_ATAPI) ?  "atapi" : "ata",
-                   xfer->c_bcount,
-                   xfer->c_skip);
+                   (xfer->c_flags & C_ATAPI) ? "atapi" : "ata",
+                   xfer->c_bcount, xfer->c_skip);
 #if NATA_DMA || NATA_PIOBM
                if (chp->ch_flags & ATACH_DMA_WAIT) {
                        wdc->dma_status =
-                           (*wdc->dma_finish)(wdc->dma_arg,
-                               chp->ch_channel, xfer->c_drive,
-                               WDC_DMAEND_ABRT);
+                           (*wdc->dma_finish)(wdc->dma_arg, chp->ch_channel,
+                               xfer->c_drive, WDC_DMAEND_ABRT);
                        chp->ch_flags &= ~ATACH_DMA_WAIT;
                }
 #endif
@@ -1432,8 +1429,7 @@
 
        ATADEBUG_PRINT(("__wdccommand_start %s:%d:%d\n",
            device_xname(chp->ch_atac->atac_dev), chp->ch_channel,
-           xfer->c_drive),
-           DEBUG_FUNCS);
+           xfer->c_drive), DEBUG_FUNCS);
 
        if (wdc->select)
                wdc->select(chp,drive);