Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Whilespace fix. No functional change.

This commit is contained in:
msaitoh 2019-05-24 06:26:38 +00:00
parent b13dbe890e
commit fad27932dd
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/dev/ic/elink3.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: elink3.c,v 1.147 2019/04/22 07:51:16 msaitoh Exp $ */
/* $NetBSD: elink3.c,v 1.148 2019/05/24 06:26:38 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.147 2019/04/22 07:51:16 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.148 2019/05/24 06:26:38 msaitoh Exp $");
#include "opt_inet.h"
@ -363,7 +363,7 @@ epconfig(struct ep_softc *sc, u_short chipset, u_int8_t *enaddr)
GO_WINDOW(5);
i = bus_space_read_2(iot, ioh, ELINK_W5_TX_AVAIL_THRESH);
GO_WINDOW(1);
switch (i) {
switch (i) {
case ELINK_LARGEWIN_PROBE:
case (ELINK_LARGEWIN_PROBE & ELINK_LARGEWIN_MASK):
sc->ep_pktlenshift = 0;
@ -1179,9 +1179,9 @@ startagain:
bus_space_write_2(iot, ioh, txreg, 0xffff); /* Second is meaningless */
if (ELINK_IS_BUS_32(sc->bustype)) {
for (m = m0; m;) {
if (m->m_len > 3) {
if (m->m_len > 3) {
/* align our reads from core */
if (mtod(m, u_long) & 3) {
if (mtod(m, u_long) & 3) {
u_long count =
4 - (mtod(m, u_long) & 3);
bus_space_write_multi_1(iot, ioh,
@ -1196,7 +1196,7 @@ startagain:
(u_long)(m->m_len & ~3));
m->m_len -= m->m_len & ~3;
}
if (m->m_len) {
if (m->m_len) {
bus_space_write_multi_1(iot, ioh,
txreg, mtod(m, u_int8_t *), m->m_len);
}
@ -1204,8 +1204,8 @@ startagain:
}
} else {
for (m = m0; m;) {
if (m->m_len > 1) {
if (mtod(m, u_long) & 1) {
if (m->m_len > 1) {
if (mtod(m, u_long) & 1) {
bus_space_write_1(iot, ioh,
txreg, *(mtod(m, u_int8_t *)));
m->m_data =
@ -1216,7 +1216,7 @@ startagain:
txreg, mtod(m, u_int16_t *),
m->m_len >> 1);
}
if (m->m_len & 1) {
if (m->m_len & 1) {
bus_space_write_1(iot, ioh, txreg,
*(mtod(m, u_int8_t *) + m->m_len - 1));
}
@ -1614,7 +1614,7 @@ epget(struct ep_softc *sc, int totlen)
* (We can align to 4 bytes, rather than ALIGNBYTES,
* here because we're later reading 4-byte chunks.)
*/
if ((remaining > 3) && (offset & 3)) {
if ((remaining > 3) && (offset & 3)) {
int count = (4 - (offset & 3));
bus_space_read_multi_1(iot, ioh,
rxreg, (u_int8_t *) offset, count);
@ -1628,12 +1628,12 @@ epget(struct ep_softc *sc, int totlen)
offset += remaining & ~3;
remaining &= 3;
}
if (remaining) {
if (remaining) {
bus_space_read_multi_1(iot, ioh,
rxreg, (u_int8_t *) offset, remaining);
}
} else {
if ((remaining > 1) && (offset & 1)) {
if ((remaining > 1) && (offset & 1)) {
bus_space_read_multi_1(iot, ioh,
rxreg, (u_int8_t *) offset, 1);
remaining -= 1;
@ -1645,7 +1645,7 @@ epget(struct ep_softc *sc, int totlen)
remaining >> 1);
offset += remaining & ~1;
}
if (remaining & 1) {
if (remaining & 1) {
bus_space_read_multi_1(iot, ioh,
rxreg, (u_int8_t *) offset, remaining & 1);
}

6
sys/dev/ic/gem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gem.c,v 1.117 2019/05/23 10:51:39 msaitoh Exp $ */
/* $NetBSD: gem.c,v 1.118 2019/05/24 06:26:38 msaitoh Exp $ */
/*
*
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.117 2019/05/23 10:51:39 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.118 2019/05/24 06:26:38 msaitoh Exp $");
#include "opt_inet.h"
@ -1326,7 +1326,7 @@ gem_init_regs(struct gem_softc *sc)
*/
sc->sc_mif_config = bus_space_read_4(t, h, GEM_MIF_CONFIG);
v = GEM_MAC_XIF_TX_MII_ENA;
if ((sc->sc_flags & (GEM_SERDES | GEM_SERIAL)) == 0) {
if ((sc->sc_flags & (GEM_SERDES | GEM_SERIAL)) == 0) {
if (sc->sc_mif_config & GEM_MIF_CONFIG_MDI1) {
v |= GEM_MAC_XIF_FDPLX_LED;
if (sc->sc_flags & GEM_GIGABIT)

6
sys/dev/marvell/if_mvxpe.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_mvxpe.c,v 1.25 2019/05/23 13:10:51 msaitoh Exp $ */
/* $NetBSD: if_mvxpe.c,v 1.26 2019/05/24 06:26:38 msaitoh Exp $ */
/*
* Copyright (c) 2015 Internet Initiative Japan Inc.
* All rights reserved.
@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.25 2019/05/23 13:10:51 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.26 2019/05/24 06:26:38 msaitoh Exp $");
#include "opt_multiprocessor.h"
@ -1209,7 +1209,7 @@ mvxpe_ring_sync_tx(struct mvxpe_softc *sc, int q, int idx, int count, int ops)
KASSERT(idx >= 0 && idx < MVXPE_TX_RING_CNT);
wrap = (idx + count) - MVXPE_TX_RING_CNT;
if (wrap > 0) {
if (wrap > 0) {
count -= wrap;
bus_dmamap_sync(sc->sc_dmat, MVXPE_TX_RING_MEM_MAP(sc, q),
0, sizeof(struct mvxpe_tx_desc) * wrap, ops);

4
sys/dev/pci/if_bnxreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_bnxreg.h,v 1.25 2019/04/05 07:29:24 msaitoh Exp $ */
/* $NetBSD: if_bnxreg.h,v 1.26 2019/05/24 06:26:39 msaitoh Exp $ */
/* $OpenBSD: if_bnxreg.h,v 1.33 2009/09/05 16:02:28 claudio Exp $ */
/*-
@ -4715,7 +4715,7 @@ struct bnx_rv2p_header {
* The default value is 0xFF.
*/
#define BNX_RV2P_PROC2_MAX_BD_PAGE_LOC 5
#define BNX_RV2P_PROC2_CHG_MAX_BD_PAGE(_rv2p, _v) { \
#define BNX_RV2P_PROC2_CHG_MAX_BD_PAGE(_rv2p, _v) { \
_rv2p[BNX_RV2P_PROC2_MAX_BD_PAGE_LOC] = \
(_rv2p[BNX_RV2P_PROC2_MAX_BD_PAGE_LOC] & ~0xFFFF) | (_v); \
}