diff options
| author | Masao Uebayashi <uebayasi@cvs.openbsd.org> | 2015-02-11 01:26:53 +0000 |
|---|---|---|
| committer | Masao Uebayashi <uebayasi@cvs.openbsd.org> | 2015-02-11 01:26:53 +0000 |
| commit | c6b7852cbfdabe399a8747a574a270a6ecdf93f0 (patch) | |
| tree | b89fe62ed1de5134c5f0481bc3ce8cc1fc6f3a97 /sys | |
| parent | b5eb64a02959b1f3e5f2c1446283061df7daf176 (diff) | |
Catch up with the new taskq_create(9) API.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/dwc2/dwc2.h | 6 | ||||
| -rw-r--r-- | sys/dev/usb/dwc2/dwc2_hcd.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/dwc2/dwc2.h b/sys/dev/usb/dwc2/dwc2.h index 0366c4dd5ce..98425230343 100644 --- a/sys/dev/usb/dwc2/dwc2.h +++ b/sys/dev/usb/dwc2/dwc2.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dwc2.h,v 1.8 2015/02/10 23:38:13 uebayasi Exp $ */ +/* $OpenBSD: dwc2.h,v 1.9 2015/02/11 01:26:52 uebayasi Exp $ */ /* $NetBSD: dwc2.h,v 1.4 2014/12/23 16:20:06 macallan Exp $ */ /*- @@ -213,13 +213,13 @@ struct delayed_work { struct timeout dw_timer; struct taskq *dw_wq; - void (*dw_fn)(struct task *); + void (*dw_fn)(void *); }; static inline void INIT_DELAYED_WORK(struct delayed_work *dw, void (*fn)(struct task *)) { - dw->dw_fn = fn; + dw->dw_fn = (void (*)(void *))fn; timeout_set(&dw->dw_timer, dw_timeout, dw); } diff --git a/sys/dev/usb/dwc2/dwc2_hcd.c b/sys/dev/usb/dwc2/dwc2_hcd.c index baf41d2b96d..b7859075418 100644 --- a/sys/dev/usb/dwc2/dwc2_hcd.c +++ b/sys/dev/usb/dwc2/dwc2_hcd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dwc2_hcd.c,v 1.10 2015/02/10 23:43:46 uebayasi Exp $ */ +/* $OpenBSD: dwc2_hcd.c,v 1.11 2015/02/11 01:26:52 uebayasi Exp $ */ /* $NetBSD: dwc2_hcd.c,v 1.15 2014/11/24 10:14:14 skrll Exp $ */ /* @@ -2227,7 +2227,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, /* Create new workqueue and init work */ retval = -ENOMEM; - hsotg->wq_otg = taskq_create("dwc2", 1, IPL_USB); + hsotg->wq_otg = taskq_create("dwc2", 1, IPL_USB, 0); if (hsotg->wq_otg == NULL) { dev_err(hsotg->dev, "Failed to create workqueue\n"); goto error2; |