From 477a5076d53c52d88e13957a3e245ff937d539b4 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 18 Jan 2004 18:53:17 -0800 Subject: [PATCH] [PATCH] sn: Error devenable not used - delete defs From: Pat Gefre Error devenable not used - delete defs --- arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c | 1 - arch/ia64/sn/io/sn2/pic.c | 1 - arch/ia64/sn/io/sn2/xtalk.c | 7 ------- include/asm-ia64/sn/pci/pcibr.h | 3 --- include/asm-ia64/sn/pci/pciio.h | 5 ----- include/asm-ia64/sn/xtalk/xtalk.h | 9 --------- 6 files changed, 26 deletions(-) diff --git a/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c index 3934b28a7f7fe..3fe4e6b2b3a0b 100644 --- a/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c +++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c @@ -3766,7 +3766,6 @@ pciio_provider_t pcibr_provider = (pciio_priority_set_f *) pcibr_priority_set, (pciio_config_get_f *) pcibr_config_get, (pciio_config_set_f *) pcibr_config_set, - (pciio_error_devenable_f *) 0, (pciio_error_extract_f *) 0, (pciio_driver_reg_callback_f *) 0, (pciio_driver_unreg_callback_f *) 0, diff --git a/arch/ia64/sn/io/sn2/pic.c b/arch/ia64/sn/io/sn2/pic.c index 76425da51ce51..204b782132dec 100644 --- a/arch/ia64/sn/io/sn2/pic.c +++ b/arch/ia64/sn/io/sn2/pic.c @@ -267,7 +267,6 @@ pciio_provider_t pci_pic_provider = (pciio_priority_set_f *) pcibr_priority_set, (pciio_config_get_f *) pcibr_config_get, (pciio_config_set_f *) pcibr_config_set, - (pciio_error_devenable_f *) 0, (pciio_error_extract_f *) 0, (pciio_driver_reg_callback_f *) pcibr_driver_reg_callback, (pciio_driver_unreg_callback_f *) pcibr_driver_unreg_callback, diff --git a/arch/ia64/sn/io/sn2/xtalk.c b/arch/ia64/sn/io/sn2/xtalk.c index a6516ef235d16..27a825e2ea637 100644 --- a/arch/ia64/sn/io/sn2/xtalk.c +++ b/arch/ia64/sn/io/sn2/xtalk.c @@ -64,7 +64,6 @@ int xtalk_intr_connect(xtalk_intr_t, intr_func_t, intr_arg_t void xtalk_intr_disconnect(xtalk_intr_t); vertex_hdl_t xtalk_intr_cpu_get(xtalk_intr_t); int xtalk_error_handler(vertex_hdl_t, int, ioerror_mode_t, ioerror_t *); -int xtalk_error_devenable(vertex_hdl_t, int, int); void xtalk_provider_startup(vertex_hdl_t); void xtalk_provider_shutdown(vertex_hdl_t); vertex_hdl_t xtalk_intr_dev_get(xtalk_intr_t); @@ -560,12 +559,6 @@ xtalk_error_handler( return IOERROR_UNHANDLED; } -int -xtalk_error_devenable(vertex_hdl_t xconn_vhdl, int devnum, int error_code) -{ - return DEV_FUNC(xconn_vhdl, error_devenable) (xconn_vhdl, devnum, error_code); -} - /* ===================================================================== * CONFIGURATION MANAGEMENT diff --git a/include/asm-ia64/sn/pci/pcibr.h b/include/asm-ia64/sn/pci/pcibr.h index a713d74d3bf1a..5ae5814a3e2ed 100644 --- a/include/asm-ia64/sn/pci/pcibr.h +++ b/include/asm-ia64/sn/pci/pcibr.h @@ -211,9 +211,6 @@ extern void pcibr_config_set(vertex_hdl_t conn, unsigned size, uint64_t value); -extern int pcibr_error_devenable(vertex_hdl_t pconn_vhdl, - int error_code); - extern int pcibr_wrb_flush(vertex_hdl_t pconn_vhdl); extern int pcibr_rrb_check(vertex_hdl_t pconn_vhdl, int *count_vchan0, diff --git a/include/asm-ia64/sn/pci/pciio.h b/include/asm-ia64/sn/pci/pciio.h index 8c9b501be9344..4519a84dda6cc 100644 --- a/include/asm-ia64/sn/pci/pciio.h +++ b/include/asm-ia64/sn/pci/pciio.h @@ -456,9 +456,6 @@ pciio_config_set_f (vertex_hdl_t conn, /* pci connection point */ unsigned size, /* width in bytes (1..4) */ uint64_t value); /* value to store */ -typedef int -pciio_error_devenable_f (vertex_hdl_t pconn_vhdl, int error_code); - typedef pciio_slot_t pciio_error_extract_f (vertex_hdl_t vhdl, pciio_space_t *spacep, @@ -523,7 +520,6 @@ typedef struct pciio_provider_s { pciio_config_set_f *config_set; /* Error handling interface */ - pciio_error_devenable_f *error_devenable; pciio_error_extract_f *error_extract; /* Callback support */ @@ -565,7 +561,6 @@ extern pciio_endian_set_f pciio_endian_set; extern pciio_priority_set_f pciio_priority_set; extern pciio_config_get_f pciio_config_get; extern pciio_config_set_f pciio_config_set; -extern pciio_error_devenable_f pciio_error_devenable; extern pciio_error_extract_f pciio_error_extract; /* Widgetdev in the IOERROR structure is encoded as follows. diff --git a/include/asm-ia64/sn/xtalk/xtalk.h b/include/asm-ia64/sn/xtalk/xtalk.h index 669e94c548c49..c15de0469e661 100644 --- a/include/asm-ia64/sn/xtalk/xtalk.h +++ b/include/asm-ia64/sn/xtalk/xtalk.h @@ -234,13 +234,6 @@ xtalk_widgetdev_enable_f (vertex_hdl_t, int); typedef void xtalk_widgetdev_shutdown_f (vertex_hdl_t, int); -/* Error Management */ - -typedef int -xtalk_error_devenable_f (vertex_hdl_t xconn_vhdl, - int devnum, - int error_code); - /* Early Action Support */ typedef caddr_t xtalk_early_piotrans_addr_f (xwidget_part_num_t part_num, @@ -285,7 +278,6 @@ typedef struct xtalk_provider_s { xtalk_provider_shutdown_f *provider_shutdown; /* Error Management */ - xtalk_error_devenable_f *error_devenable; } xtalk_provider_t; /* Crosstalk devices use these standard Crosstalk provider interfaces */ @@ -314,7 +306,6 @@ extern xtalk_provider_startup_f xtalk_provider_startup; extern xtalk_provider_shutdown_f xtalk_provider_shutdown; extern xtalk_widgetdev_enable_f xtalk_widgetdev_enable; extern xtalk_widgetdev_shutdown_f xtalk_widgetdev_shutdown; -extern xtalk_error_devenable_f xtalk_error_devenable; extern xtalk_early_piotrans_addr_f xtalk_early_piotrans_addr; /* error management */ -- 2.53.0