From a8b581972213782bec450017fe45a05ea431addf Mon Sep 17 00:00:00 2001 From: jsg Date: Mon, 20 May 2024 23:13:33 +0000 Subject: [PATCH] remove prototypes with no matching function; ok visa@ --- sys/arch/octeon/dev/amdcf.c | 3 +-- sys/arch/octeon/dev/cn30xxasxvar.h | 3 +-- sys/arch/octeon/dev/cn30xxfauvar.h | 22 +--------------------- sys/arch/octeon/dev/cn30xxfpa.c | 3 +-- sys/arch/octeon/dev/cn30xxfpavar.h | 3 +-- sys/arch/octeon/dev/cn30xxgmx.c | 3 +-- sys/arch/octeon/dev/cn30xxgmxvar.h | 4 +--- sys/arch/octeon/dev/cn30xxpipvar.h | 3 +-- sys/arch/octeon/dev/cn30xxpkovar.h | 4 +--- sys/arch/octeon/dev/cn30xxpowvar.h | 3 +-- sys/arch/octeon/dev/cn30xxsmi.c | 4 +--- sys/arch/octeon/dev/if_cnmac.c | 4 +--- sys/arch/octeon/dev/if_ogx.c | 3 +-- sys/arch/octeon/dev/iobusvar.h | 6 +----- sys/arch/octeon/dev/octcf.c | 3 +-- sys/arch/octeon/dev/octeon_iobus.c | 7 +------ sys/arch/octeon/include/pci_machdep.h | 9 +-------- 17 files changed, 17 insertions(+), 70 deletions(-) diff --git a/sys/arch/octeon/dev/amdcf.c b/sys/arch/octeon/dev/amdcf.c index 35a60f03fb4..8a52db606a2 100644 --- a/sys/arch/octeon/dev/amdcf.c +++ b/sys/arch/octeon/dev/amdcf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdcf.c,v 1.9 2022/10/23 19:33:39 krw Exp $ */ +/* $OpenBSD: amdcf.c,v 1.10 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2007, Juniper Networks, Inc. @@ -202,7 +202,6 @@ int cfi_block_finish(struct amdcf_softc *); void cfi_array_write(struct amdcf_softc *sc, u_int, u_int, u_int); void cfi_amd_write(struct amdcf_softc *, u_int, u_int, u_int); -uint8_t cfi_read_qry(struct amdcf_softc *, uint64_t); uint8_t cfi_read(struct amdcf_softc *, bus_size_t, bus_size_t); void cfi_write(struct amdcf_softc *, bus_size_t, bus_size_t, uint8_t); int cfi_wait_ready(struct amdcf_softc *, u_int, u_int, u_int); diff --git a/sys/arch/octeon/dev/cn30xxasxvar.h b/sys/arch/octeon/dev/cn30xxasxvar.h index fbb599eb98d..d8d08f3d94e 100644 --- a/sys/arch/octeon/dev/cn30xxasxvar.h +++ b/sys/arch/octeon/dev/cn30xxasxvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxasxvar.h,v 1.4 2022/12/28 01:39:21 yasuoka Exp $ */ +/* $OpenBSD: cn30xxasxvar.h,v 1.5 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -46,6 +46,5 @@ void cn30xxasx_init(struct cn30xxasx_attach_args *, struct cn30xxasx_softc **); int cn30xxasx_enable(struct cn30xxasx_softc *, int); int cn30xxasx_clk_set(struct cn30xxasx_softc *, int, int); -uint64_t cn30xxasx_int_summary(struct cn30xxasx_softc *sc); #endif diff --git a/sys/arch/octeon/dev/cn30xxfauvar.h b/sys/arch/octeon/dev/cn30xxfauvar.h index 66b9d20169a..748e3e62928 100644 --- a/sys/arch/octeon/dev/cn30xxfauvar.h +++ b/sys/arch/octeon/dev/cn30xxfauvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxfauvar.h,v 1.4 2022/12/28 01:39:21 yasuoka Exp $ */ +/* $OpenBSD: cn30xxfauvar.h,v 1.5 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -42,29 +42,9 @@ void cn30xxfau_op_init(struct cn30xxfau_desc *, size_t, size_t); uint64_t cn30xxfau_op_save(struct cn30xxfau_desc *); void cn30xxfau_op_restore(struct cn30xxfau_desc *, uint64_t); int64_t cn30xxfau_op_inc_8(struct cn30xxfau_desc *, int64_t); -int32_t cn30xxfau_op_inc_4(struct cn30xxfau_desc *, int32_t); -int16_t cn30xxfau_op_inc_2(struct cn30xxfau_desc *, int16_t); -int8_t cn30xxfau_op_inc_1(struct cn30xxfau_desc *, int8_t); int64_t cn30xxfau_op_incwait_8(struct cn30xxfau_desc *, int); -int32_t cn30xxfau_op_incwait_4(struct cn30xxfau_desc *, int); -int16_t cn30xxfau_op_incwait_2(struct cn30xxfau_desc *, int); -int8_t cn30xxfau_op_incwait_1(struct cn30xxfau_desc *, int); -int64_t cn30xxfau_op_get_8(struct cn30xxfau_desc *); -int32_t cn30xxfau_op_get_4(struct cn30xxfau_desc *); -int16_t cn30xxfau_op_get_2(struct cn30xxfau_desc *); -int8_t cn30xxfau_op_get_1(struct cn30xxfau_desc *); -int64_t cn30xxfau_op_getwait_8(struct cn30xxfau_desc *); -int32_t cn30xxfau_op_getwait_4(struct cn30xxfau_desc *); -int16_t cn30xxfau_op_getwait_2(struct cn30xxfau_desc *); -int8_t cn30xxfau_op_getwait_1(struct cn30xxfau_desc *); void cn30xxfau_op_add_8(struct cn30xxfau_desc *, int64_t); -void cn30xxfau_op_add_4(struct cn30xxfau_desc *, int32_t); -void cn30xxfau_op_add_2(struct cn30xxfau_desc *, int16_t); -void cn30xxfau_op_add_1(struct cn30xxfau_desc *, int8_t); void cn30xxfau_op_set_8(struct cn30xxfau_desc *, int64_t); -void cn30xxfau_op_set_4(struct cn30xxfau_desc *, int32_t); -void cn30xxfau_op_set_2(struct cn30xxfau_desc *, int16_t); -void cn30xxfau_op_set_1(struct cn30xxfau_desc *, int8_t); /* ---- old API */ diff --git a/sys/arch/octeon/dev/cn30xxfpa.c b/sys/arch/octeon/dev/cn30xxfpa.c index fddf029f76a..7d99f032029 100644 --- a/sys/arch/octeon/dev/cn30xxfpa.c +++ b/sys/arch/octeon/dev/cn30xxfpa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxfpa.c,v 1.10 2022/12/28 01:39:21 yasuoka Exp $ */ +/* $OpenBSD: cn30xxfpa.c,v 1.11 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -48,7 +48,6 @@ struct cn30xxfpa_softc { void cn30xxfpa_bootstrap(struct octeon_config *); void cn30xxfpa_reset(void); -void cn30xxfpa_int_enable(struct cn30xxfpa_softc *, int); void cn30xxfpa_buf_dma_alloc(struct cn30xxfpa_buf *); void cn30xxfpa_init(struct cn30xxfpa_softc *); diff --git a/sys/arch/octeon/dev/cn30xxfpavar.h b/sys/arch/octeon/dev/cn30xxfpavar.h index c0641e389e7..a319fcc2cad 100644 --- a/sys/arch/octeon/dev/cn30xxfpavar.h +++ b/sys/arch/octeon/dev/cn30xxfpavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxfpavar.h,v 1.8 2022/12/28 01:39:21 yasuoka Exp $ */ +/* $OpenBSD: cn30xxfpavar.h,v 1.9 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. * All rights reserved. @@ -45,7 +45,6 @@ struct cn30xxfpa_buf { int fb_dma_nsegs; }; -uint64_t cn30xxfpa_int_summary(void); int cn30xxfpa_buf_init(int, size_t, size_t, struct cn30xxfpa_buf **); void *cn30xxfpa_buf_get(struct cn30xxfpa_buf *); uint64_t cn30xxfpa_query(int); diff --git a/sys/arch/octeon/dev/cn30xxgmx.c b/sys/arch/octeon/dev/cn30xxgmx.c index 32797f87402..5775a1b8367 100644 --- a/sys/arch/octeon/dev/cn30xxgmx.c +++ b/sys/arch/octeon/dev/cn30xxgmx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxgmx.c,v 1.53 2022/12/28 01:39:21 yasuoka Exp $ */ +/* $OpenBSD: cn30xxgmx.c,v 1.54 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -87,7 +87,6 @@ struct cn30xxgmx_port_ops { int cn30xxgmx_match(struct device *, void *, void *); void cn30xxgmx_attach(struct device *, struct device *, void *); int cn30xxgmx_print(void *, const char *); -int cn30xxgmx_port_phy_addr(int); void cn30xxgmx_init(struct cn30xxgmx_softc *); int cn30xxgmx_rx_frm_ctl_xable(struct cn30xxgmx_port_softc *, uint64_t, int); diff --git a/sys/arch/octeon/dev/cn30xxgmxvar.h b/sys/arch/octeon/dev/cn30xxgmxvar.h index 2436ffd3d06..a3c90560815 100644 --- a/sys/arch/octeon/dev/cn30xxgmxvar.h +++ b/sys/arch/octeon/dev/cn30xxgmxvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxgmxvar.h,v 1.13 2022/12/28 01:39:21 yasuoka Exp $ */ +/* $OpenBSD: cn30xxgmxvar.h,v 1.14 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -115,8 +115,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 *); -uint64_t cn30xxgmx_get_rx_int_reg(struct cn30xxgmx_port_softc *sc); -uint64_t cn30xxgmx_get_tx_int_reg(struct cn30xxgmx_port_softc *sc); #if NKSTAT > 0 void cn30xxgmx_kstat_read(struct cn30xxgmx_port_softc *, struct kstat_kv *); diff --git a/sys/arch/octeon/dev/cn30xxpipvar.h b/sys/arch/octeon/dev/cn30xxpipvar.h index e5ebe12f091..42f3bef23a3 100644 --- a/sys/arch/octeon/dev/cn30xxpipvar.h +++ b/sys/arch/octeon/dev/cn30xxpipvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxpipvar.h,v 1.5 2022/12/28 01:39:21 yasuoka Exp $ */ +/* $OpenBSD: cn30xxpipvar.h,v 1.6 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -55,7 +55,6 @@ struct cn30xxpip_attach_args { void cn30xxpip_init(struct cn30xxpip_attach_args *, struct cn30xxpip_softc **); -void cn30xxpip_gbl_ctl_debug(struct cn30xxpip_softc *); int cn30xxpip_port_config(struct cn30xxpip_softc *); void cn30xxpip_prt_cfg_enable(struct cn30xxpip_softc *, uint64_t, int); diff --git a/sys/arch/octeon/dev/cn30xxpkovar.h b/sys/arch/octeon/dev/cn30xxpkovar.h index 41f28bfeb5d..49d25af23ab 100644 --- a/sys/arch/octeon/dev/cn30xxpkovar.h +++ b/sys/arch/octeon/dev/cn30xxpkovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxpkovar.h,v 1.6 2022/12/28 01:39:21 yasuoka Exp $ */ +/* $OpenBSD: cn30xxpkovar.h,v 1.7 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -82,8 +82,6 @@ int cn30xxpko_reset(struct cn30xxpko_softc *); void cn30xxpko_config(struct cn30xxpko_softc *); int cn30xxpko_port_enable(struct cn30xxpko_softc *, int); int cn30xxpko_port_config(struct cn30xxpko_softc *); -void cn30xxpko_int_enable(struct cn30xxpko_softc *, int); -uint64_t cn30xxpko_int_summary(struct cn30xxpko_softc *); static inline uint64_t cn30xxpko_cmd_word0(int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int); static inline uint64_t cn30xxpko_cmd_word1(int, int, int, int, paddr_t); diff --git a/sys/arch/octeon/dev/cn30xxpowvar.h b/sys/arch/octeon/dev/cn30xxpowvar.h index 5b782187825..d8dfc1ec072 100644 --- a/sys/arch/octeon/dev/cn30xxpowvar.h +++ b/sys/arch/octeon/dev/cn30xxpowvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxpowvar.h,v 1.6 2022/12/28 01:39:21 yasuoka Exp $ */ +/* $OpenBSD: cn30xxpowvar.h,v 1.7 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -363,7 +363,6 @@ cn30xxpow_tag_sw_wait(void) void cn30xxpow_work_request_async(uint64_t, uint64_t); uint64_t *cn30xxpow_work_response_async(uint64_t); void cn30xxpow_ops_swtag(int, uint32_t); -void cn30xxpow_intr_set_freedback_queue(int, void *); static inline void cn30xxpow_config_int_pc(struct cn30xxpow_softc *sc, int unit) diff --git a/sys/arch/octeon/dev/cn30xxsmi.c b/sys/arch/octeon/dev/cn30xxsmi.c index e3da9d9bb5f..39cbadf167a 100644 --- a/sys/arch/octeon/dev/cn30xxsmi.c +++ b/sys/arch/octeon/dev/cn30xxsmi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cn30xxsmi.c,v 1.11 2022/12/28 01:39:21 yasuoka Exp $ */ +/* $OpenBSD: cn30xxsmi.c,v 1.12 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -42,8 +42,6 @@ int cn30xxsmi_match(struct device *, void *, void *); void cn30xxsmi_attach(struct device *, struct device *, void *); -void cn30xxsmi_enable(struct cn30xxsmi_softc *); - const struct cfattach octsmi_ca = { sizeof(struct cn30xxsmi_softc), cn30xxsmi_match, cn30xxsmi_attach }; diff --git a/sys/arch/octeon/dev/if_cnmac.c b/sys/arch/octeon/dev/if_cnmac.c index 9172358e31c..e9bbea055d6 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.85 2023/11/10 15:51:19 bluhm Exp $ */ +/* $OpenBSD: if_cnmac.c,v 1.86 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -113,7 +113,6 @@ void cnmac_attach(struct device *, struct device *, void *); void cnmac_pip_init(struct cnmac_softc *); void cnmac_ipd_init(struct cnmac_softc *); void cnmac_pko_init(struct cnmac_softc *); -void cnmac_smi_init(struct cnmac_softc *); void cnmac_board_mac_addr(uint8_t *); @@ -134,7 +133,6 @@ void cnmac_send_queue_add(struct cnmac_softc *, void cnmac_send_queue_del(struct cnmac_softc *, struct mbuf **, uint64_t **); int cnmac_buf_free_work(struct cnmac_softc *, uint64_t *); -void cnmac_buf_ext_free(caddr_t, u_int, void *); int cnmac_ioctl(struct ifnet *, u_long, caddr_t); void cnmac_watchdog(struct ifnet *); diff --git a/sys/arch/octeon/dev/if_ogx.c b/sys/arch/octeon/dev/if_ogx.c index d75abf0b142..e28afcf353c 100644 --- a/sys/arch/octeon/dev/if_ogx.c +++ b/sys/arch/octeon/dev/if_ogx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ogx.c,v 1.6 2021/07/29 14:11:53 visa Exp $ */ +/* $OpenBSD: if_ogx.c,v 1.7 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2019-2020 Visa Hankala @@ -253,7 +253,6 @@ void ogx_fpa3_pool_init(struct ogx_node *, struct fpa3pool *, uint32_t, int ogx_sgmii_link_init(struct ogx_softc *); void ogx_sgmii_link_down(struct ogx_softc *); void ogx_sgmii_link_change(struct ogx_softc *); -int ogx_sgmii_link_status(struct ogx_softc *); static inline paddr_t ogx_kvtophys(vaddr_t kva) diff --git a/sys/arch/octeon/dev/iobusvar.h b/sys/arch/octeon/dev/iobusvar.h index a6061174f98..9ad29b8ef59 100644 --- a/sys/arch/octeon/dev/iobusvar.h +++ b/sys/arch/octeon/dev/iobusvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iobusvar.h,v 1.3 2015/07/19 23:46:50 jasper Exp $ */ +/* $OpenBSD: iobusvar.h,v 1.4 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -53,9 +53,5 @@ struct octeon_iobus_addrs { int iobus_space_map(bus_space_tag_t, bus_addr_t, bus_size_t, int, bus_space_handle_t *); void iobus_space_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t); -int iobus_space_region(bus_space_tag_t, bus_space_handle_t, bus_size_t, - bus_size_t, bus_space_handle_t *); - -void *iobus_space_vaddr(bus_space_tag_t, bus_space_handle_t); #endif /* _IOBUSVAR_H_ */ diff --git a/sys/arch/octeon/dev/octcf.c b/sys/arch/octeon/dev/octcf.c index 002d82d07c6..383c51fd11d 100644 --- a/sys/arch/octeon/dev/octcf.c +++ b/sys/arch/octeon/dev/octcf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octcf.c,v 1.35 2022/10/23 19:33:39 krw Exp $ */ +/* $OpenBSD: octcf.c,v 1.36 2024/05/20 23:13:33 jsg Exp $ */ /* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */ /* @@ -123,7 +123,6 @@ int octcfprobe(struct device *, void *, void *); void octcfattach(struct device *, struct device *, void *); int octcfdetach(struct device *, int); int octcfactivate(struct device *, int); -int octcfprint(void *, char *); const struct cfattach octcf_ca = { sizeof(struct octcf_softc), octcfprobe, octcfattach, diff --git a/sys/arch/octeon/dev/octeon_iobus.c b/sys/arch/octeon/dev/octeon_iobus.c index 00ade446394..6ab79615203 100644 --- a/sys/arch/octeon/dev/octeon_iobus.c +++ b/sys/arch/octeon/dev/octeon_iobus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octeon_iobus.c,v 1.26 2022/04/06 18:59:27 naddy Exp $ */ +/* $OpenBSD: octeon_iobus.c,v 1.27 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2000-2004 Opsycon AB (www.opsycon.se) @@ -59,11 +59,6 @@ int iobusprint(void *, const char *); int iobussubmatch(struct device *, void *, void *); int iobussearch(struct device *, void *, void *); -u_int8_t iobus_read_1(bus_space_tag_t, bus_space_handle_t, bus_size_t); -u_int16_t iobus_read_2(bus_space_tag_t, bus_space_handle_t, bus_size_t); -u_int32_t iobus_read_4(bus_space_tag_t, bus_space_handle_t, bus_size_t); -u_int64_t iobus_read_8(bus_space_tag_t, bus_space_handle_t, bus_size_t); - void iobus_write_1(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int8_t); void iobus_write_2(bus_space_tag_t, bus_space_handle_t, bus_size_t, diff --git a/sys/arch/octeon/include/pci_machdep.h b/sys/arch/octeon/include/pci_machdep.h index ae8c85aad32..350048590c0 100644 --- a/sys/arch/octeon/include/pci_machdep.h +++ b/sys/arch/octeon/include/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.12 2022/01/08 05:34:54 visa Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.13 2024/05/20 23:13:33 jsg Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -130,11 +130,4 @@ pci_conf_write_db(void *cookie, pcitag_t tag, int reg, pcireg_t val, #define pci_min_powerstate(c, t) (PCI_PMCSR_STATE_D3) #define pci_set_powerstate_md(c, t, s, p) -/* - * Functions used during early system configuration. - */ - -pcitag_t pci_make_tag_early(int, int, int); -pcireg_t pci_conf_read_early(pcitag_t, int); - #define pci_dev_postattach(a, b) -- 2.20.1