Module Name: src
Committed By: skrll
Date: Wed Jul 22 10:32:17 UTC 2015
Modified Files:
src/sys/arch/arm/amlogic: amlogic_dwctwo.c
src/sys/arch/arm/rockchip: rockchip_dwctwo.c
src/sys/arch/evbarm/conf: GENERIC.common
src/sys/arch/mips/cavium/dev: octeon_dwctwo.c
src/sys/dev: dksubr.c ld.c
Log Message:
Trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/amlogic_dwctwo.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/rockchip/rockchip_dwctwo.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/GENERIC.common
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/dksubr.c
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/ld.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/arm/amlogic/amlogic_dwctwo.c
diff -u src/sys/arch/arm/amlogic/amlogic_dwctwo.c:1.2 src/sys/arch/arm/amlogic/amlogic_dwctwo.c:1.3
--- src/sys/arch/arm/amlogic/amlogic_dwctwo.c:1.2 Sat Feb 28 18:50:57 2015
+++ src/sys/arch/arm/amlogic/amlogic_dwctwo.c Wed Jul 22 10:32:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_dwctwo.c,v 1.2 2015/02/28 18:50:57 jmcneill Exp $ */
+/* $NetBSD: amlogic_dwctwo.c,v 1.3 2015/07/22 10:32:16 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_dwctwo.c,v 1.2 2015/02/28 18:50:57 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_dwctwo.c,v 1.3 2015/07/22 10:32:16 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,7 +70,7 @@ static struct dwc2_core_params amlogic_d
.host_rx_fifo_size = 512, /* 512 DWORDs */
.host_nperio_tx_fifo_size = 500, /* 500 DWORDs */
.host_perio_tx_fifo_size = -1, /* 256 DWORDs */
- .max_transfer_size = -1, /* 2047 to 65,535 */
+ .max_transfer_size = -1, /* 2047 to 65,535 */
.max_packet_count = -1, /* 15 to 511 */
.host_channels = -1, /* 1 to 16 */
.phy_type = 1, /* 1- UTMI+ Phy */
Index: src/sys/arch/arm/rockchip/rockchip_dwctwo.c
diff -u src/sys/arch/arm/rockchip/rockchip_dwctwo.c:1.2 src/sys/arch/arm/rockchip/rockchip_dwctwo.c:1.3
--- src/sys/arch/arm/rockchip/rockchip_dwctwo.c:1.2 Fri Dec 26 19:44:48 2014
+++ src/sys/arch/arm/rockchip/rockchip_dwctwo.c Wed Jul 22 10:32:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_dwctwo.c,v 1.2 2014/12/26 19:44:48 jmcneill Exp $ */
+/* $NetBSD: rockchip_dwctwo.c,v 1.3 2015/07/22 10:32:16 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rockchip_dwctwo.c,v 1.2 2014/12/26 19:44:48 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rockchip_dwctwo.c,v 1.3 2015/07/22 10:32:16 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,7 +69,7 @@ static struct dwc2_core_params rkdwc2_pa
.host_rx_fifo_size = 520, /* 520 DWORDs */
.host_nperio_tx_fifo_size = 128, /* 128 DWORDs */
.host_perio_tx_fifo_size = 256, /* 256 DWORDs */
- .max_transfer_size = 65535,/* 2047 to 65,535 */
+ .max_transfer_size = 65535,/* 2047 to 65,535 */
.max_packet_count = 511, /* 15 to 511 */
.host_channels = 8, /* 1 to 16 */
.phy_type = 1, /* 1- UTMI+ Phy */
@@ -129,7 +129,7 @@ rkdwc2_attach(device_t parent, device_t
IST_LEVEL, dwc2_intr, &sc->sc_dwc2);
#if 0
IST_EDGE, dwc2_intr, &sc->sc_dwc2);
-#endif
+#endif
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt %d\n",
Index: src/sys/arch/evbarm/conf/GENERIC.common
diff -u src/sys/arch/evbarm/conf/GENERIC.common:1.7 src/sys/arch/evbarm/conf/GENERIC.common:1.8
--- src/sys/arch/evbarm/conf/GENERIC.common:1.7 Mon Apr 20 10:09:09 2015
+++ src/sys/arch/evbarm/conf/GENERIC.common Wed Jul 22 10:32:16 2015
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC.common,v 1.7 2015/04/20 10:09:09 jmcneill Exp $
+# $NetBSD: GENERIC.common,v 1.8 2015/07/22 10:32:16 skrll Exp $
#
# GENERIC evbarm kernel config (template)
#
@@ -110,7 +110,7 @@ options KTRACE # system call tracing,
#options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-# Wedge support
+# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
Index: src/sys/arch/mips/cavium/dev/octeon_dwctwo.c
diff -u src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.3 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.4
--- src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.3 Sun Jun 7 06:07:49 2015
+++ src/sys/arch/mips/cavium/dev/octeon_dwctwo.c Wed Jul 22 10:32:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_dwctwo.c,v 1.3 2015/06/07 06:07:49 matt Exp $ */
+/* $NetBSD: octeon_dwctwo.c,v 1.4 2015/07/22 10:32:16 skrll Exp $ */
/*
* Copyright (c) 2015 Masao Uebayashi <[email protected]>
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_dwctwo.c,v 1.3 2015/06/07 06:07:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_dwctwo.c,v 1.4 2015/07/22 10:32:16 skrll Exp $");
#include "opt_octeon.h"
#include "opt_usb.h"
@@ -193,7 +193,7 @@ octeon_dwc2_attach(device_t parent, devi
switch (MIPS_PRID_IMPL(mips_options.mips_cpu_id)) {
case MIPS_CN50XX:
/*
- * 2. Configure the reference clock, PHY, and HCLK:
+ * 2. Configure the reference clock, PHY, and HCLK:
* a. Write USBN_CLK_CTL[POR] = 1 and
* USBN_CLK_CTL[HRST,PRST,HCLK_RST] = 0
*/
Index: src/sys/dev/dksubr.c
diff -u src/sys/dev/dksubr.c:1.66 src/sys/dev/dksubr.c:1.67
--- src/sys/dev/dksubr.c:1.66 Sun Jul 19 08:05:24 2015
+++ src/sys/dev/dksubr.c Wed Jul 22 10:32:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.66 2015/07/19 08:05:24 mlelstv Exp $ */
+/* $NetBSD: dksubr.c,v 1.67 2015/07/22 10:32:16 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.66 2015/07/19 08:05:24 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.67 2015/07/22 10:32:16 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -233,12 +233,12 @@ dk_strategy(struct dk_softc *dksc, struc
/*
* The transfer must be a whole number of blocks and the offset must
* not be negative.
- */
+ */
if ((bp->b_bcount % secsize) != 0 || bp->b_blkno < 0) {
bp->b_error = EINVAL;
biodone(bp);
return;
- }
+ }
/* If there is nothing to do, then we are done */
if (bp->b_bcount == 0) {
@@ -259,7 +259,7 @@ dk_strategy(struct dk_softc *dksc, struc
}
}
- /*
+ /*
* Convert the block number to absolute and put it in terms
* of the device's logical block size.
*/
@@ -470,7 +470,7 @@ dk_ioctl(struct dk_softc *dksc, dev_t de
return 0;
}
-
+
case DIOCSSTRATEGY:
{
struct disk_strategy *dks = (void *)data;
Index: src/sys/dev/ld.c
diff -u src/sys/dev/ld.c:1.83 src/sys/dev/ld.c:1.84
--- src/sys/dev/ld.c:1.83 Sat May 2 08:00:08 2015
+++ src/sys/dev/ld.c Wed Jul 22 10:32:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.83 2015/05/02 08:00:08 mlelstv Exp $ */
+/* $NetBSD: ld.c,v 1.84 2015/07/22 10:32:16 skrll Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.83 2015/05/02 08:00:08 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.84 2015/07/22 10:32:16 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -308,12 +308,12 @@ static int
ld_lastclose(device_t self)
{
struct ld_softc *sc = device_private(self);
-
+
if (sc->sc_flush != NULL && (*sc->sc_flush)(sc, 0) != 0)
aprint_error_dev(self, "unable to flush cache\n");
-
+
return 0;
-}
+}
/* ARGSUSED */
static int
@@ -516,7 +516,7 @@ static int
ld_dumpblocks(device_t dev, void *va, daddr_t blkno, int nblk)
{
struct ld_softc *sc = device_private(dev);
-
+
if (sc->sc_dump == NULL)
return (ENXIO);
