diff options
author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-07-09 12:56:29 +0000 |
---|---|---|
committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-07-09 12:56:29 +0000 |
commit | 9d6e49c32728d84d40b35c129f648bdf82133b7b (patch) | |
tree | b037ac9356db4fc7ab2fae3003b14f43e3ff5514 /sys | |
parent | 5dc68cb0372f3fe4aebed8b6ae127900c177f3f8 (diff) |
Kill unused shutdown hook pointers.
ok miod@, deraadt@, tedu@
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arch/octeon/dev/if_cnmacvar.h | 4 | ||||
-rw-r--r-- | sys/dev/ata/wdvar.h | 3 | ||||
-rw-r--r-- | sys/dev/ic/aic79xx.h | 3 | ||||
-rw-r--r-- | sys/dev/ic/aic7xxxvar.h | 6 |
4 files changed, 5 insertions, 11 deletions
diff --git a/sys/arch/octeon/dev/if_cnmacvar.h b/sys/arch/octeon/dev/if_cnmacvar.h index 6b6fdf18523..7d71fa56763 100644 --- a/sys/arch/octeon/dev/if_cnmacvar.h +++ b/sys/arch/octeon/dev/if_cnmacvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cnmacvar.h,v 1.3 2013/09/16 20:52:14 jmatthew Exp $ */ +/* $OpenBSD: if_cnmacvar.h,v 1.4 2014/07/09 12:56:28 mpi Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -72,8 +72,6 @@ struct octeon_eth_softc { struct arpcom sc_arpcom; struct mii_data sc_mii; - void *sc_sdhook; - struct timeout sc_tick_misc_ch; struct timeout sc_tick_free_ch; struct timeout sc_resume_ch; diff --git a/sys/dev/ata/wdvar.h b/sys/dev/ata/wdvar.h index 5196a8ac8e6..8ac3680ba0f 100644 --- a/sys/dev/ata/wdvar.h +++ b/sys/dev/ata/wdvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wdvar.h,v 1.20 2013/06/11 16:42:14 deraadt Exp $ */ +/* $OpenBSD: wdvar.h,v 1.21 2014/07/09 12:56:28 mpi Exp $ */ /* $NetBSD: wdvar.h,v 1.3 1998/11/11 19:38:27 bouyer Exp $ */ /* @@ -87,7 +87,6 @@ struct wd_softc { int sectors; int retries; /* number of xfer retry */ struct timeout sc_restart_timeout; - void *sc_sdhook; }; /* drive states stored in ata_drive_datas */ diff --git a/sys/dev/ic/aic79xx.h b/sys/dev/ic/aic79xx.h index a3578cd4d1e..c07e40c8e24 100644 --- a/sys/dev/ic/aic79xx.h +++ b/sys/dev/ic/aic79xx.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx.h,v 1.22 2012/02/24 06:19:00 guenther Exp $ */ +/* $OpenBSD: aic79xx.h,v 1.23 2014/07/09 12:56:28 mpi Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -1105,7 +1105,6 @@ struct ahd_softc { #ifndef __linux__ bus_dma_tag_t buffer_dmat; /* dmat for buffer I/O */ #endif - void *shutdown_hook; struct scb_data scb_data; struct hardware_scb *next_queued_hscb; diff --git a/sys/dev/ic/aic7xxxvar.h b/sys/dev/ic/aic7xxxvar.h index d386a0d9d4e..ee58bd6c894 100644 --- a/sys/dev/ic/aic7xxxvar.h +++ b/sys/dev/ic/aic7xxxvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxxvar.h,v 1.25 2012/02/24 06:19:00 guenther Exp $ */ +/* $OpenBSD: aic7xxxvar.h,v 1.26 2014/07/09 12:56:28 mpi 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.25 2012/02/24 06:19:00 guenther Exp $ + * $Id: aic7xxxvar.h,v 1.26 2014/07/09 12:56:28 mpi Exp $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.50 2003/12/17 00:02:09 gibbs Exp $ */ @@ -1142,8 +1142,6 @@ struct ahc_softc { uint16_t user_tagenable;/* Tagged Queuing allowed */ struct ahc_pci_busdata *bd; - - void *shutdown_hook; }; TAILQ_HEAD(ahc_softc_tailq, ahc_softc); |