diff options
| author |   visa <visa@openbsd.org> | 2020-07-04 09:00:09 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2020-07-04 09:00:09 +0000 |
| commit | 55c021f2b30d5247310dc6352230a4d17437e7c3 (patch) | |
| tree | f91eb3a426b420bb49e59694e87d00aea9b34318 | |
| parent | Use klist_invalidate() in knote_processexit() (diff) | |
| download | wireguard-openbsd-55c021f2b30d5247310dc6352230a4d17437e7c3.tar.xz wireguard-openbsd-55c021f2b30d5247310dc6352230a4d17437e7c3.zip | |
Remove no-op cn30xxgmx_reset_board().
| -rw-r--r-- | sys/arch/octeon/dev/cn30xxgmx.c | 9 | ||||
| -rw-r--r-- | sys/arch/octeon/dev/cn30xxgmxvar.h | 3 | ||||
| -rw-r--r-- | sys/arch/octeon/dev/if_cnmac.c | 3 |
3 files changed, 3 insertions, 12 deletions
diff --git a/sys/arch/octeon/dev/cn30xxgmx.c b/sys/arch/octeon/dev/cn30xxgmx.c index 6966e08f2fb..4e15633d22e 100644 --- a/sys/arch/octeon/dev/cn30xxgmx.c +++ b/sys/arch/octeon/dev/cn30xxgmx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxgmx.c,v 1.43 2019/09/28 22:20:25 deraadt Exp $ */ +/* $OpenBSD: cn30xxgmx.c,v 1.44 2020/07/04 09:00:09 visa Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -728,13 +728,6 @@ cn30xxgmx_reset_timing(struct cn30xxgmx_port_softc *sc) } int -cn30xxgmx_reset_board(struct cn30xxgmx_port_softc *sc) -{ - - return 0; -} - -int cn30xxgmx_reset_flowctl(struct cn30xxgmx_port_softc *sc) { struct ifmedia_entry *ife = sc->sc_port_mii->mii_media.ifm_cur; diff --git a/sys/arch/octeon/dev/cn30xxgmxvar.h b/sys/arch/octeon/dev/cn30xxgmxvar.h index e4491dfce1d..53ac130d503 100644 --- a/sys/arch/octeon/dev/cn30xxgmxvar.h +++ b/sys/arch/octeon/dev/cn30xxgmxvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxgmxvar.h,v 1.8 2017/11/03 16:46:17 visa Exp $ */ +/* $OpenBSD: cn30xxgmxvar.h,v 1.9 2020/07/04 09:00:09 visa Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -116,7 +116,6 @@ int cn30xxgmx_port_enable(struct cn30xxgmx_port_softc *, int); int cn30xxgmx_reset_speed(struct cn30xxgmx_port_softc *); int cn30xxgmx_reset_flowctl(struct cn30xxgmx_port_softc *); int cn30xxgmx_reset_timing(struct cn30xxgmx_port_softc *); -int cn30xxgmx_reset_board(struct cn30xxgmx_port_softc *); void cn30xxgmx_stats(struct cn30xxgmx_port_softc *); uint64_t cn30xxgmx_get_rx_int_reg(struct cn30xxgmx_port_softc *sc); uint64_t cn30xxgmx_get_tx_int_reg(struct cn30xxgmx_port_softc *sc); diff --git a/sys/arch/octeon/dev/if_cnmac.c b/sys/arch/octeon/dev/if_cnmac.c index a80d98f8fcc..4be44bf2c9e 100644 --- a/sys/arch/octeon/dev/if_cnmac.c +++ b/sys/arch/octeon/dev/if_cnmac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cnmac.c,v 1.75 2018/01/07 05:30:03 visa Exp $ */ +/* $OpenBSD: if_cnmac.c,v 1.76 2020/07/04 09:00:09 visa Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -1046,7 +1046,6 @@ cnmac_reset(struct cnmac_softc *sc) cn30xxgmx_reset_speed(sc->sc_gmx_port); cn30xxgmx_reset_flowctl(sc->sc_gmx_port); cn30xxgmx_reset_timing(sc->sc_gmx_port); - cn30xxgmx_reset_board(sc->sc_gmx_port); return 0; } |