Module Name: src Committed By: msaitoh Date: Fri May 6 04:46:17 UTC 2016
Modified Files: src/sys/dev/ic: wdc.c Log Message: KNF. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.280 -r1.281 src/sys/dev/ic/wdc.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/dev/ic/wdc.c diff -u src/sys/dev/ic/wdc.c:1.280 src/sys/dev/ic/wdc.c:1.281 --- src/sys/dev/ic/wdc.c:1.280 Mon Jan 18 04:46:47 2016 +++ src/sys/dev/ic/wdc.c Fri May 6 04:46:17 2016 @@ -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 @@ wdc_reset_channel(struct ata_channel *ch * 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 @@ wdcreset(struct ata_channel *chp, int po #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 @@ wdctimeout(void *arg) 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 @@ __wdccommand_start(struct ata_channel *c 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);