diff options
author | 2015-01-27 03:17:35 +0000 | |
---|---|---|
committer | 2015-01-27 03:17:35 +0000 | |
commit | e419548092f59c20a140404818050eb2ab331a19 (patch) | |
tree | ff250435e8b28c07c967073741c21d374241b774 /sys/dev/ata/atascsi.c | |
parent | Remove an unused and confusing assignment that had been commented out for (diff) | |
download | wireguard-openbsd-e419548092f59c20a140404818050eb2ab331a19.tar.xz wireguard-openbsd-e419548092f59c20a140404818050eb2ab331a19.zip |
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/ata/atascsi.c')
-rw-r--r-- | sys/dev/ata/atascsi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c index eaa2653bd3b..cd74e876511 100644 --- a/sys/dev/ata/atascsi.c +++ b/sys/dev/ata/atascsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atascsi.c,v 1.121 2014/12/09 07:05:06 doug Exp $ */ +/* $OpenBSD: atascsi.c,v 1.122 2015/01/27 03:17:36 dlg Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -121,7 +121,7 @@ void atascsi_disk_vpd_thin(struct scsi_xfer *); void atascsi_disk_write_same_16(struct scsi_xfer *); void atascsi_disk_write_same_16_done(struct ata_xfer *); void atascsi_disk_unmap(struct scsi_xfer *); -void atascsi_disk_unmap_task(void *, void *); +void atascsi_disk_unmap_task(void *); void atascsi_disk_unmap_done(struct ata_xfer *); void atascsi_disk_capacity(struct scsi_xfer *); void atascsi_disk_capacity16(struct scsi_xfer *); @@ -1090,16 +1090,16 @@ atascsi_disk_unmap(struct scsi_xfer *xs) /* let's go */ if (ISSET(xs->flags, SCSI_NOSLEEP)) { - task_set(&xa->task, atascsi_disk_unmap_task, xs, NULL); + task_set(&xa->task, atascsi_disk_unmap_task, xs); task_add(systq, &xa->task); } else { /* we can already sleep for memory */ - atascsi_disk_unmap_task(xs, NULL); + atascsi_disk_unmap_task(xs); } } void -atascsi_disk_unmap_task(void *xxs, void *a) +atascsi_disk_unmap_task(void *xxs) { struct scsi_xfer *xs = xxs; struct scsi_link *link = xs->sc_link; |