diff options
| author |   jsg <jsg@openbsd.org> | 2015-10-22 11:51:28 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2015-10-22 11:51:28 +0000 |
| commit | a8042878e97d73eb521f99284474ceea85da3955 (patch) | |
| tree | 0589bf35f0fafbce9402cf31853d15ba34e5e545 | |
| parent | If the pane is still on all_window_panes but not actually connected to (diff) | |
| download | wireguard-openbsd-a8042878e97d73eb521f99284474ceea85da3955.tar.xz wireguard-openbsd-a8042878e97d73eb521f99284474ceea85da3955.zip | |
remove some horrible iwm typedefs
ok stsp@
| -rw-r--r-- | sys/dev/pci/if_iwm.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwmvar.h | 5 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index 600e8c17286..5e3fbe4e4ae 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.60 2015/10/16 12:17:58 stsp Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.61 2015/10/22 11:51:28 jsg Exp $ */ /* * Copyright (c) 2014 genua mbh <info@genua.de> @@ -406,7 +406,7 @@ int iwm_init(struct ifnet *); void iwm_start(struct ifnet *); void iwm_stop(struct ifnet *, int); void iwm_watchdog(struct ifnet *); -int iwm_ioctl(struct ifnet *, u_long, iwm_caddr_t); +int iwm_ioctl(struct ifnet *, u_long, caddr_t); #ifdef IWM_DEBUG const char *iwm_desc_lookup(uint32_t); void iwm_nic_error(struct iwm_softc *); @@ -415,7 +415,7 @@ void iwm_notif_intr(struct iwm_softc *); int iwm_intr(void *); int iwm_match(struct device *, void *, void *); int iwm_preinit(struct iwm_softc *); -void iwm_attach_hook(iwm_hookarg_t); +void iwm_attach_hook(void *); void iwm_attach(struct device *, struct device *, void *); void iwm_init_task(void *); int iwm_activate(struct device *, int); @@ -5685,7 +5685,7 @@ iwm_watchdog(struct ifnet *ifp) } int -iwm_ioctl(struct ifnet *ifp, u_long cmd, iwm_caddr_t data) +iwm_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct iwm_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; @@ -6376,7 +6376,7 @@ iwm_preinit(struct iwm_softc *sc) } void -iwm_attach_hook(iwm_hookarg_t arg) +iwm_attach_hook(void *arg) { struct iwm_softc *sc = arg; diff --git a/sys/dev/pci/if_iwmvar.h b/sys/dev/pci/if_iwmvar.h index 8ac2ce17ed8..d49f928b5ad 100644 --- a/sys/dev/pci/if_iwmvar.h +++ b/sys/dev/pci/if_iwmvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwmvar.h,v 1.11 2015/10/11 10:22:28 stsp Exp $ */ +/* $OpenBSD: if_iwmvar.h,v 1.12 2015/10/22 11:51:28 jsg Exp $ */ /* * Copyright (c) 2014 genua mbh <info@genua.de> @@ -223,9 +223,6 @@ struct iwm_host_cmd { * DMA glue is from iwn */ -typedef caddr_t iwm_caddr_t; -typedef void *iwm_hookarg_t; - struct iwm_dma_info { bus_dma_tag_t tag; bus_dmamap_t map; |