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

Trailing whitespace

This commit is contained in:
skrll 2022-07-07 06:11:08 +00:00
parent 5158c3886d
commit 70867f5283
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/pci/if_mcx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_mcx.c,v 1.23 2021/11/05 23:39:47 andvar Exp $ */
/* $NetBSD: if_mcx.c,v 1.24 2022/07/07 06:11:19 skrll Exp $ */
/* $OpenBSD: if_mcx.c,v 1.101 2021/06/02 19:16:11 patrick Exp $ */
/*
@ -23,7 +23,7 @@
#endif
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_mcx.c,v 1.23 2021/11/05 23:39:47 andvar Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_mcx.c,v 1.24 2022/07/07 06:11:19 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -4052,7 +4052,7 @@ mcx_hca_max_caps(struct mcx_softc *sc)
*/
sc->sc_bf_size = (1 << hca->log_bf_reg_size) / 2;
sc->sc_max_rqt_size = (1 << hca->log_max_rqt_size);
if (hca->local_ca_ack_delay & MCX_CAP_DEVICE_MCAM_REG)
sc->sc_mcam_reg = 1;
@ -8803,7 +8803,7 @@ mcx_kstat_queue_read(struct kstat *ks)
int error = 0;
KERNEL_LOCK();
if (mcx_query_rq(sc, &q->q_rx, &u.rq) != 0) {
error = EIO;
goto out;

28
sys/dev/pci/if_rge.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_rge.c,v 1.22 2021/10/11 15:11:49 msaitoh Exp $ */
/* $NetBSD: if_rge.c,v 1.23 2022/07/07 06:11:08 skrll Exp $ */
/* $OpenBSD: if_rge.c,v 1.9 2020/12/12 11:48:53 jan Exp $ */
/*
@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_rge.c,v 1.22 2021/10/11 15:11:49 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_rge.c,v 1.23 2022/07/07 06:11:08 skrll Exp $");
#include <sys/types.h>
@ -841,7 +841,7 @@ rge_stop(struct ifnet *ifp, int disable)
if (disable) {
callout_halt(&sc->sc_timeout, NULL);
} else
} else
callout_stop(&sc->sc_timeout);
ifp->if_timer = 0;
@ -1771,11 +1771,11 @@ rge_phy_config_mac_cfg4(struct rge_softc *sc)
uint16_t val;
int i;
static const uint16_t mac_cfg4_b87c_value[] =
{ 0x8013, 0x0700, 0x8fb9, 0x2801, 0x8fba, 0x0100, 0x8fbc, 0x1900,
0x8fbe, 0xe100, 0x8fc0, 0x0800, 0x8fc2, 0xe500, 0x8fc4, 0x0f00,
0x8fc6, 0xf100, 0x8fc8, 0x0400, 0x8fca, 0xf300, 0x8fcc, 0xfd00,
0x8fce, 0xff00, 0x8fd0, 0xfb00, 0x8fd2, 0x0100, 0x8fd4, 0xf400,
0x8fd6, 0xff00, 0x8fd8, 0xf600, 0x813d, 0x390e, 0x814f, 0x790e,
{ 0x8013, 0x0700, 0x8fb9, 0x2801, 0x8fba, 0x0100, 0x8fbc, 0x1900,
0x8fbe, 0xe100, 0x8fc0, 0x0800, 0x8fc2, 0xe500, 0x8fc4, 0x0f00,
0x8fc6, 0xf100, 0x8fc8, 0x0400, 0x8fca, 0xf300, 0x8fcc, 0xfd00,
0x8fce, 0xff00, 0x8fd0, 0xfb00, 0x8fd2, 0x0100, 0x8fd4, 0xf400,
0x8fd6, 0xff00, 0x8fd8, 0xf600, 0x813d, 0x390e, 0x814f, 0x790e,
0x80b0, 0x0f31 };
for (i = 0; i < nitems(rtl8125_mac_cfg4_ephy); i++)
@ -1924,8 +1924,8 @@ rge_phy_config_mac_cfg4(struct rge_softc *sc)
val = rge_read_phy_ocp(sc, 0xa438) & ~0xff00;
rge_write_phy_ocp(sc, 0xa438, val | 0xc000);
rge_patch_phy_mcu(sc, 1);
RGE_PHY_CLRBIT(sc, 0xb896, 0x0001);
RGE_PHY_CLRBIT(sc, 0xb892, 0xff00);
RGE_PHY_CLRBIT(sc, 0xb896, 0x0001);
RGE_PHY_CLRBIT(sc, 0xb892, 0xff00);
rge_write_phy_ocp(sc, 0xb88e, 0xc23e);
rge_write_phy_ocp(sc, 0xb890, 0x0000);
rge_write_phy_ocp(sc, 0xb88e, 0xc240);
@ -1940,10 +1940,10 @@ rge_phy_config_mac_cfg4(struct rge_softc *sc)
rge_write_phy_ocp(sc, 0xb890, 0x1012);
rge_write_phy_ocp(sc, 0xb88e, 0xc24a);
rge_write_phy_ocp(sc, 0xb890, 0x1416);
RGE_PHY_SETBIT(sc, 0xb896, 0x0001);
RGE_PHY_SETBIT(sc, 0xb896, 0x0001);
rge_patch_phy_mcu(sc, 0);
RGE_PHY_SETBIT(sc, 0xa86a, 0x0001);
RGE_PHY_SETBIT(sc, 0xa6f0, 0x0001);
RGE_PHY_SETBIT(sc, 0xa86a, 0x0001);
RGE_PHY_SETBIT(sc, 0xa6f0, 0x0001);
rge_write_phy_ocp(sc, 0xbfa0, 0xd70d);
rge_write_phy_ocp(sc, 0xbfa2, 0x4100);
rge_write_phy_ocp(sc, 0xbfa4, 0xe868);
@ -1951,7 +1951,7 @@ rge_phy_config_mac_cfg4(struct rge_softc *sc)
rge_write_phy_ocp(sc, 0xb54c, 0x3c18);
RGE_PHY_CLRBIT(sc, 0xbfa4, 0x0020);
rge_write_phy_ocp(sc, 0xa436, 0x817d);
RGE_PHY_SETBIT(sc, 0xa438, 0x1000);
RGE_PHY_SETBIT(sc, 0xa438, 0x1000);
}
void

10
sys/dev/scsipi/if_se.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_se.c,v 1.115 2022/01/01 10:32:29 msaitoh Exp $ */
/* $NetBSD: if_se.c,v 1.116 2022/07/07 06:11:28 skrll Exp $ */
/*
* Copyright (c) 1997 Ian W. Dall <ian.dall@dsto.defence.gov.au>
@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.115 2022/01/01 10:32:29 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.116 2022/07/07 06:11:28 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@ -465,7 +465,7 @@ se_ifstart(struct ifnet *ifp)
if (!sc->sc_send_work_pending) {
sc->sc_send_work_pending = true;
workqueue_enqueue(sc->sc_send_wq, &sc->sc_send_work, NULL);
}
}
/* else: nothing to do - work is already queued */
mutex_exit(&sc->sc_iflock);
}
@ -915,7 +915,7 @@ se_init(struct se_softc *sc)
sc->sc_recv_work_pending = true;
workqueue_enqueue(sc->sc_recv_wq, &sc->sc_recv_work,
NULL);
}
}
mutex_exit(&sc->sc_iflock);
ifp->if_flags &= ~IFF_OACTIVE;
mutex_enter(&sc->sc_iflock);
@ -923,7 +923,7 @@ se_init(struct se_softc *sc)
sc->sc_send_work_pending = true;
workqueue_enqueue(sc->sc_send_wq, &sc->sc_send_work,
NULL);
}
}
mutex_exit(&sc->sc_iflock);
}
return (error);