summaryrefslogtreecommitdiff
path: root/sys/dev/pci/if_wpi.c
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2015-01-27 03:17:38 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2015-01-27 03:17:38 +0000
commit7ac4ce62e2476f05331d3c5341c866ed14b81a70 (patch)
tree21042b557424b93c264a0a6a7e93f1512d1351c8 /sys/dev/pci/if_wpi.c
parentc2499bdb5b4f1bd235843fb845b156cfeae25b83 (diff)
remove the second void * argument on tasks.
when workqs were introduced, we provided a second argument so you could pass a thing and some context to work on it in. there were very few things that took advantage of the second argument, so when i introduced pools i suggested removing it. since tasks were meant to replace workqs, it was requested that we keep the second argument to make porting from workqs to tasks easier. now that workqs are gone, i had a look at the use of the second argument again and found only one good use of it (vdsp(4) on sparc64 if you're interested) and a tiny handful of questionable uses. the vast majority of tasks only used a single argument. i have since modified all tasks that used two args to only use one, so now we can remove the second argument. so this is a mechanical change. all tasks only passed NULL as their second argument, so we can just remove it. ok krw@
Diffstat (limited to 'sys/dev/pci/if_wpi.c')
-rw-r--r--sys/dev/pci/if_wpi.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index 4fba795d4a9..40957698ff1 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wpi.c,v 1.122 2014/12/22 02:28:52 tedu Exp $ */
+/* $OpenBSD: if_wpi.c,v 1.123 2015/01/27 03:17:36 dlg Exp $ */
/*-
* Copyright (c) 2006-2008
@@ -74,7 +74,7 @@ void wpi_radiotap_attach(struct wpi_softc *);
int wpi_detach(struct device *, int);
int wpi_activate(struct device *, int);
void wpi_wakeup(struct wpi_softc *);
-void wpi_init_task(void *, void *);
+void wpi_init_task(void *);
int wpi_nic_lock(struct wpi_softc *);
int wpi_read_prom_data(struct wpi_softc *, uint32_t, void *, int);
int wpi_dma_contig_alloc(bus_dma_tag_t, struct wpi_dma_info *,
@@ -324,7 +324,7 @@ wpi_attach(struct device *parent, struct device *self, void *aux)
wpi_radiotap_attach(sc);
#endif
timeout_set(&sc->calib_to, wpi_calib_timeout, sc);
- task_set(&sc->init_task, wpi_init_task, sc, NULL);
+ task_set(&sc->init_task, wpi_init_task, sc);
return;
/* Free allocated memory if something failed during attachment. */
@@ -412,11 +412,11 @@ wpi_wakeup(struct wpi_softc *sc)
reg &= ~0xff00;
pci_conf_write(sc->sc_pct, sc->sc_pcitag, 0x40, reg);
- wpi_init_task(sc, NULL);
+ wpi_init_task(sc);
}
void
-wpi_init_task(void *arg1, void *args2)
+wpi_init_task(void *arg1)
{
struct wpi_softc *sc = arg1;
struct ifnet *ifp = &sc->sc_ic.ic_if;