diff options
| author |   tedu <tedu@openbsd.org> | 2015-12-17 19:35:24 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2015-12-17 19:35:24 +0000 |
| commit | 8f64f37008324ce4bfbfbf96a848ec4c76daa3f5 (patch) | |
| tree | a6fd54a381f0abe51c9f6e748c5f9fd1f5ad6293 | |
| parent | Add missing colon after "Peer name" in verbose output. Mentioned on the (diff) | |
| download | wireguard-openbsd-8f64f37008324ce4bfbfbf96a848ec4c76daa3f5.tar.xz wireguard-openbsd-8f64f37008324ce4bfbfbf96a848ec4c76daa3f5.zip | |
sprinkling ifndef __linux__ around two variable declarations could not
possibly make this driver portable
| -rw-r--r-- | sys/dev/ic/aic79xx.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/aic79xx.h | 6 | ||||
| -rw-r--r-- | sys/dev/ic/aic7xxxvar.h | 8 |
3 files changed, 4 insertions, 14 deletions
diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c index e6c6113113d..e2cdb5e828a 100644 --- a/sys/dev/ic/aic79xx.c +++ b/sys/dev/ic/aic79xx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx.c,v 1.58 2015/12/06 02:41:23 mmcc Exp $ */ +/* $OpenBSD: aic79xx.c,v 1.59 2015/12/17 19:35:24 tedu Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -6068,9 +6068,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd) for (i = 0; i < newcount; i++) { struct scb_platform_data *pdata = NULL; u_int col_tag; -#ifndef __linux__ int error; -#endif next_scb = (struct scb *)malloc(sizeof(*next_scb), M_DEVBUF, M_NOWAIT); diff --git a/sys/dev/ic/aic79xx.h b/sys/dev/ic/aic79xx.h index 2b58c9ce61b..a298b4abe22 100644 --- a/sys/dev/ic/aic79xx.h +++ b/sys/dev/ic/aic79xx.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx.h,v 1.24 2015/07/17 21:42:49 krw Exp $ */ +/* $OpenBSD: aic79xx.h,v 1.25 2015/12/17 19:35:24 tedu Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -656,9 +656,7 @@ struct scb { struct ahd_softc *ahd_softc; scb_flag flags; -#ifndef __linux__ bus_dmamap_t dmamap; -#endif struct scb_platform_data *platform_data; struct map_node *hscb_map; struct map_node *sg_map; @@ -1102,9 +1100,7 @@ struct ahd_softc { bus_space_tag_t tags[2]; bus_space_handle_t bshs[2]; -#ifndef __linux__ bus_dma_tag_t buffer_dmat; /* dmat for buffer I/O */ -#endif 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 a875a950a44..26172f95c3b 100644 --- a/sys/dev/ic/aic7xxxvar.h +++ b/sys/dev/ic/aic7xxxvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxxvar.h,v 1.28 2015/11/14 14:47:56 miod Exp $ */ +/* $OpenBSD: aic7xxxvar.h,v 1.29 2015/12/17 19:35:24 tedu 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.28 2015/11/14 14:47:56 miod Exp $ + * $Id: aic7xxxvar.h,v 1.29 2015/12/17 19:35:24 tedu Exp $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.50 2003/12/17 00:02:09 gibbs Exp $ */ @@ -597,9 +597,7 @@ struct scb { struct scsipi_xfer *xs; struct ahc_softc *ahc_softc; scb_flag flags; -#ifndef __linux__ bus_dmamap_t dmamap; -#endif struct scb_platform_data *platform_data; struct sg_map_node *sg_map; struct ahc_dma_seg *sg_list; @@ -949,9 +947,7 @@ struct ahc_softc { bus_space_tag_t tag; bus_space_handle_t bsh; -#ifndef __linux__ bus_dma_tag_t buffer_dmat; /* dmat for buffer I/O */ -#endif struct scb_data *scb_data; struct scb *next_queued_scb; |