From 528abb89f1fc13fa73f7011bb473e5c3267def47 Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 29 May 2024 00:48:14 +0000 Subject: [PATCH] remove prototypes with no matching function --- sys/dev/ic/aic79xx.h | 8 +------- sys/dev/ic/aic79xx_openbsd.h | 9 +-------- sys/dev/ic/aic7xxx_openbsd.h | 10 +--------- sys/dev/ic/aic7xxxvar.h | 11 ++--------- sys/dev/ic/comvar.h | 3 +-- sys/dev/ic/dp8390var.h | 3 +-- sys/dev/ic/stivar.h | 4 +--- sys/dev/ic/ufshcivar.h | 3 +-- sys/dev/ic/wdcvar.h | 3 +-- sys/dev/isa/gusvar.h | 3 +-- sys/net/pipex_local.h | 3 +-- sys/net80211/ieee80211_proto.h | 4 +--- 12 files changed, 13 insertions(+), 51 deletions(-) diff --git a/sys/dev/ic/aic79xx.h b/sys/dev/ic/aic79xx.h index f629fc66644..291aef605be 100644 --- a/sys/dev/ic/aic79xx.h +++ b/sys/dev/ic/aic79xx.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx.h,v 1.30 2022/10/21 17:45:40 kn Exp $ */ +/* $OpenBSD: aic79xx.h,v 1.31 2024/05/29 00:48:15 jsg Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -1329,8 +1329,6 @@ void ahd_unbusy_tcl(struct ahd_softc *ahd, u_int tcl); /***************************** PCI Front End *********************************/ const struct ahd_pci_identity * ahd_find_pci_device(pcireg_t, pcireg_t); -int ahd_pci_config(struct ahd_softc *, - struct ahd_pci_identity *); int ahd_pci_test_register_access(struct ahd_softc *); /************************** SCB and SCB queue management **********************/ @@ -1405,10 +1403,6 @@ int ahd_search_qinfifo(struct ahd_softc *ahd, int target, char channel, int lun, u_int tag, role_t role, uint32_t status, ahd_search_action action); -int ahd_search_disc_list(struct ahd_softc *ahd, int target, - char channel, int lun, u_int tag, - int stop_on_first, int remove, - int save_state); void ahd_freeze_devq(struct ahd_softc *ahd, struct scb *scb); int ahd_reset_channel(struct ahd_softc *ahd, char channel, int initiate_reset); diff --git a/sys/dev/ic/aic79xx_openbsd.h b/sys/dev/ic/aic79xx_openbsd.h index b3b70353925..4e77e027c8c 100644 --- a/sys/dev/ic/aic79xx_openbsd.h +++ b/sys/dev/ic/aic79xx_openbsd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx_openbsd.h,v 1.21 2020/07/28 21:33:14 krw Exp $ */ +/* $OpenBSD: aic79xx_openbsd.h,v 1.22 2024/05/29 00:48:15 jsg Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -232,9 +232,6 @@ void aic_platform_scb_free(struct ahd_softc *, struct scb *); #define aic_get_pci_function(pci) ((pci)->pa_function) #define aic_get_pci_slot(pci) ((pci)->pa_device) #define aic_get_pci_bus(pci) ((pci)->pa_bus) - -int ahd_pci_map_registers(struct ahd_softc *); -int ahd_pci_map_int(struct ahd_softc *); /*#endif*/ typedef enum @@ -245,15 +242,11 @@ typedef enum AHD_POWER_STATE_D3 } ahd_power_state; -void ahd_power_state_change(struct ahd_softc *, ahd_power_state); - /********************************* Debug **************************************/ void ahd_print_path(struct ahd_softc *, struct scb *); void ahd_platform_dump_card_state(struct ahd_softc *ahd); /**************************** Transfer Settings *******************************/ -void ahd_notify_xfer_settings_change(struct ahd_softc *, - struct ahd_devinfo *); void ahd_platform_set_tags(struct ahd_softc *, struct ahd_devinfo *, ahd_queue_alg); diff --git a/sys/dev/ic/aic7xxx_openbsd.h b/sys/dev/ic/aic7xxx_openbsd.h index 38f7273c0c4..061a1b54cbc 100644 --- a/sys/dev/ic/aic7xxx_openbsd.h +++ b/sys/dev/ic/aic7xxx_openbsd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx_openbsd.h,v 1.31 2020/08/13 12:11:15 krw Exp $ */ +/* $OpenBSD: aic7xxx_openbsd.h,v 1.32 2024/05/29 00:48:15 jsg Exp $ */ /* $NetBSD: aic7xxx_osm.h,v 1.7 2003/11/02 11:07:44 wiz Exp $ */ /* @@ -357,10 +357,6 @@ typedef enum void ahc_power_state_change(struct ahc_softc *, ahc_power_state); #endif -/******************************** VL/EISA *************************************/ -int aic7770_map_registers(struct ahc_softc *, u_int); -int aic7770_map_int(struct ahc_softc *, int); - /********************************* Debug **************************************/ static __inline void ahc_print_path(struct ahc_softc *, struct scb *); static __inline void ahc_platform_dump_card_state(struct ahc_softc *); @@ -379,15 +375,11 @@ ahc_platform_dump_card_state(struct ahc_softc *ahc) ahc->features, ahc->flags, ahc->chip, ahc->bugs); } /**************************** Transfer Settings *******************************/ -void ahc_notify_xfer_settings_change(struct ahc_softc *, - struct ahc_devinfo *); void ahc_platform_set_tags(struct ahc_softc *, struct ahc_devinfo *, int); /************************* Initialization/Teardown ****************************/ -int ahc_map_int(struct ahc_softc *); int ahc_attach(struct ahc_softc *); int ahc_softc_comp(struct ahc_softc *, struct ahc_softc *); -int ahc_detach(struct device *, int); /****************************** Interrupts ************************************/ int ahc_platform_intr(void *); diff --git a/sys/dev/ic/aic7xxxvar.h b/sys/dev/ic/aic7xxxvar.h index 0c4668fad0d..5ef7c3443b0 100644 --- a/sys/dev/ic/aic7xxxvar.h +++ b/sys/dev/ic/aic7xxxvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxxvar.h,v 1.38 2022/10/21 17:45:40 kn Exp $ */ +/* $OpenBSD: aic7xxxvar.h,v 1.39 2024/05/29 00:48:15 jsg Exp $ */ /* * Core definitions and data structures shareable across OS platforms. * @@ -38,7 +38,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic7xxxvar.h,v 1.38 2022/10/21 17:45:40 kn Exp $ + * $Id: aic7xxxvar.h,v 1.39 2024/05/29 00:48:15 jsg Exp $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.50 2003/12/17 00:02:09 gibbs Exp $ */ @@ -1184,15 +1184,8 @@ void ahc_busy_tcl(struct ahc_softc *, u_int, u_int); /***************************** PCI Front End *********************************/ const struct ahc_pci_identity *ahc_find_pci_device(pcireg_t, pcireg_t, u_int); -int ahc_pci_config(struct ahc_softc *, - struct ahc_pci_identity *); int ahc_pci_test_register_access(struct ahc_softc *); -/*************************** EISA/VL Front End ********************************/ -struct aic7770_identity *aic7770_find_device(uint32_t); -int aic7770_config(struct ahc_softc *, - struct aic7770_identity *, u_int); - /************************** SCB and SCB queue management **********************/ int ahc_probe_scbs(struct ahc_softc *); void ahc_run_untagged_queues(struct ahc_softc *ahc); diff --git a/sys/dev/ic/comvar.h b/sys/dev/ic/comvar.h index 12a4ffddc3c..ff92e02d49d 100644 --- a/sys/dev/ic/comvar.h +++ b/sys/dev/ic/comvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: comvar.h,v 1.60 2024/05/12 08:42:13 jsg Exp $ */ +/* $OpenBSD: comvar.h,v 1.61 2024/05/29 00:48:15 jsg Exp $ */ /* $NetBSD: comvar.h,v 1.5 1996/05/05 19:50:47 christos Exp $ */ /* @@ -147,7 +147,6 @@ void com_resume(struct com_softc *); void comdiag(void *); int comspeed(long, long); -u_char com_cflag2lcr(tcflag_t); /* XXX undefined */ int comparam(struct tty *, struct termios *); void comstart(struct tty *); void comsoft(void *); diff --git a/sys/dev/ic/dp8390var.h b/sys/dev/ic/dp8390var.h index 5132b6cdd0a..fa3b8f1f710 100644 --- a/sys/dev/ic/dp8390var.h +++ b/sys/dev/ic/dp8390var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dp8390var.h,v 1.13 2022/01/09 05:42:38 jsg Exp $ */ +/* $OpenBSD: dp8390var.h,v 1.14 2024/05/29 00:48:15 jsg Exp $ */ /* $NetBSD: dp8390var.h,v 1.8 1998/08/12 07:19:09 scottr Exp $ */ /* @@ -173,4 +173,3 @@ void dp8390_rint(struct dp8390_softc *); void dp8390_getmcaf(struct arpcom *, u_int8_t *); struct mbuf *dp8390_get(struct dp8390_softc *, int, u_short); -void dp8390_read(struct dp8390_softc *, int, u_short); diff --git a/sys/dev/ic/stivar.h b/sys/dev/ic/stivar.h index 4c593088e2b..e694d4c5c69 100644 --- a/sys/dev/ic/stivar.h +++ b/sys/dev/ic/stivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stivar.h,v 1.27 2021/05/01 20:04:33 kettenis Exp $ */ +/* $OpenBSD: stivar.h,v 1.28 2024/05/29 00:48:15 jsg Exp $ */ /* * Copyright (c) 2000-2003 Michael Shalayeff @@ -138,8 +138,6 @@ struct sti_softc { int sti_attach_common(struct sti_softc *, bus_space_tag_t, bus_space_tag_t, bus_space_handle_t, u_int); -int sti_cnattach(struct sti_rom *, struct sti_screen *, bus_space_tag_t, - bus_addr_t *, u_int); void sti_describe(struct sti_softc *); void sti_end_attach(void *); u_int sti_rom_size(bus_space_tag_t, bus_space_handle_t); diff --git a/sys/dev/ic/ufshcivar.h b/sys/dev/ic/ufshcivar.h index b2e15e68398..bdd7a210180 100644 --- a/sys/dev/ic/ufshcivar.h +++ b/sys/dev/ic/ufshcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ufshcivar.h,v 1.8 2024/05/24 09:51:14 mglocker Exp $ */ +/* $OpenBSD: ufshcivar.h,v 1.9 2024/05/29 00:48:15 jsg Exp $ */ /* * Copyright (c) 2022 Marcus Glocker @@ -82,6 +82,5 @@ struct ufshci_softc { }; int ufshci_intr(void *); -void ufshci_attach_hook(struct device *); /* XXX: Only for testing */ int ufshci_attach(struct ufshci_softc *); int ufshci_activate(struct ufshci_softc *, int); diff --git a/sys/dev/ic/wdcvar.h b/sys/dev/ic/wdcvar.h index ac4e48b3063..8f4b08d802f 100644 --- a/sys/dev/ic/wdcvar.h +++ b/sys/dev/ic/wdcvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wdcvar.h,v 1.57 2022/01/09 05:42:42 jsg Exp $ */ +/* $OpenBSD: wdcvar.h,v 1.58 2024/05/29 00:48:15 jsg Exp $ */ /* $NetBSD: wdcvar.h,v 1.17 1999/04/11 20:50:29 bouyer Exp $ */ /*- @@ -305,7 +305,6 @@ void wdc_delref(struct channel_softc *); void wdc_disable_intr(struct channel_softc *); void wdc_enable_intr(struct channel_softc *); -int wdc_select_drive(struct channel_softc *, int, int); void wdc_set_drive(struct channel_softc *, int drive); void wdc_output_bytes(struct ata_drive_datas *drvp, void *, unsigned int); void wdc_input_bytes(struct ata_drive_datas *drvp, void *, unsigned int); diff --git a/sys/dev/isa/gusvar.h b/sys/dev/isa/gusvar.h index 1d186dee40f..ac99b5ca1f0 100644 --- a/sys/dev/isa/gusvar.h +++ b/sys/dev/isa/gusvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gusvar.h,v 1.13 2022/11/02 10:41:34 kn Exp $ */ +/* $OpenBSD: gusvar.h,v 1.14 2024/05/29 00:48:14 jsg Exp $ */ /* $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */ /*- @@ -310,7 +310,6 @@ void gusmax_close(void *); int gusintr(void *); int gus_set_in_gain(caddr_t, u_int, u_char); int gus_get_in_gain(caddr_t); -int gus_set_out_gain(caddr_t, u_int, u_char); int gus_get_out_gain(caddr_t); int gus_set_params(void *, int, int, struct audio_params *, struct audio_params *); int gusmax_set_params(void *, int, int, struct audio_params *, struct audio_params *); diff --git a/sys/net/pipex_local.h b/sys/net/pipex_local.h index 01b7c457d62..4cfdb2f7fc0 100644 --- a/sys/net/pipex_local.h +++ b/sys/net/pipex_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex_local.h,v 1.51 2024/01/23 17:57:21 mvs Exp $ */ +/* $OpenBSD: pipex_local.h,v 1.52 2024/05/29 00:48:15 jsg Exp $ */ /* * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -468,7 +468,6 @@ struct mbuf *ip_is_idle_packet (struct mbuf *, int *); void pipex_session_log (struct pipex_session *, int, const char *, ...) __attribute__((__format__(__printf__,3,4))); uint32_t pipex_sockaddr_hash_key(struct sockaddr *); int pipex_sockaddr_compar_addr(struct sockaddr *, struct sockaddr *); -int pipex_ppp_enqueue (struct mbuf *, struct pipex_session *, struct mbuf_queue *); void pipex_timer_start (void); void pipex_timer_stop (void); void pipex_timer (void *); diff --git a/sys/net80211/ieee80211_proto.h b/sys/net80211/ieee80211_proto.h index 83fa8a33399..06978b0babe 100644 --- a/sys/net80211/ieee80211_proto.h +++ b/sys/net80211/ieee80211_proto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_proto.h,v 1.48 2022/03/14 15:07:24 stsp Exp $ */ +/* $OpenBSD: ieee80211_proto.h,v 1.49 2024/05/29 00:48:15 jsg Exp $ */ /* $NetBSD: ieee80211_proto.h,v 1.3 2003/10/13 04:23:56 dyoung Exp $ */ /*- @@ -119,8 +119,6 @@ extern u_int8_t *ieee80211_add_capinfo(u_int8_t *, struct ieee80211com *, extern u_int8_t *ieee80211_add_ssid(u_int8_t *, const u_int8_t *, u_int); extern u_int8_t *ieee80211_add_rates(u_int8_t *, const struct ieee80211_rateset *); -extern u_int8_t *ieee80211_add_fh_params(u_int8_t *, struct ieee80211com *, - const struct ieee80211_node *); extern u_int8_t *ieee80211_add_ds_params(u_int8_t *, struct ieee80211com *, const struct ieee80211_node *); extern u_int8_t *ieee80211_add_tim(u_int8_t *, struct ieee80211com *); -- 2.20.1