diff options
| -rw-r--r-- | sys/dev/cardbus/if_ral_cardbus.c | 11 | ||||
| -rw-r--r-- | sys/dev/pci/if_ral_pci.c | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/sys/dev/cardbus/if_ral_cardbus.c b/sys/dev/cardbus/if_ral_cardbus.c index 8b4444c0b0c..99a01a8094f 100644 --- a/sys/dev/cardbus/if_ral_cardbus.c +++ b/sys/dev/cardbus/if_ral_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral_cardbus.c,v 1.19 2010/08/25 21:37:59 kettenis Exp $ */ +/* $OpenBSD: if_ral_cardbus.c,v 1.20 2013/11/14 12:28:48 dlg Exp $ */ /*- * Copyright (c) 2005-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -31,7 +31,7 @@ #include <sys/malloc.h> #include <sys/timeout.h> #include <sys/device.h> -#include <sys/workq.h> +#include <sys/task.h> #include <machine/bus.h> #include <machine/intr.h> @@ -103,7 +103,7 @@ struct ral_cardbus_softc { pcireg_t sc_bar_val; int sc_intrline; pci_chipset_tag_t sc_pc; - struct workq_task sc_resume_wqt; + struct task sc_resume_t; }; int ral_cardbus_match(struct device *, void *, void *); @@ -165,6 +165,8 @@ ral_cardbus_attach(struct device *parent, struct device *self, void *aux) bus_addr_t base; int error; + task_set(&csc->sc_resume_t, ral_cardbus_resume, csc, NULL); + if (PCI_VENDOR(ca->ca_id) == PCI_VENDOR_RALINK) { switch (PCI_PRODUCT(ca->ca_id)) { case PCI_PRODUCT_RALINK_RT2560: @@ -252,8 +254,7 @@ ral_cardbus_activate(struct device *self, int act) (*csc->sc_opns->suspend)(sc); break; case DVACT_RESUME: - workq_queue_task(NULL, &csc->sc_resume_wqt, 0, - ral_cardbus_resume, csc, NULL); + task_add(systq, &csc->sc_resume_t); break; } diff --git a/sys/dev/pci/if_ral_pci.c b/sys/dev/pci/if_ral_pci.c index 2601ba711fc..f00950b8742 100644 --- a/sys/dev/pci/if_ral_pci.c +++ b/sys/dev/pci/if_ral_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral_pci.c,v 1.21 2013/08/01 09:21:09 kettenis Exp $ */ +/* $OpenBSD: if_ral_pci.c,v 1.22 2013/11/14 12:28:48 dlg Exp $ */ /*- * Copyright (c) 2005-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -31,7 +31,7 @@ #include <sys/malloc.h> #include <sys/timeout.h> #include <sys/device.h> -#include <sys/workq.h> +#include <sys/task.h> #include <machine/bus.h> #include <machine/intr.h> @@ -97,7 +97,7 @@ struct ral_pci_softc { pci_chipset_tag_t sc_pc; void *sc_ih; bus_size_t sc_mapsize; - struct workq_task sc_resume_wqt; + struct task sc_resume_t; }; /* Base Address Register */ @@ -159,6 +159,8 @@ ral_pci_attach(struct device *parent, struct device *self, void *aux) pcireg_t memtype; int error; + task_set(&psc->sc_resume_t, ral_pci_resume, psc, NULL); + if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_RALINK) { switch (PCI_PRODUCT(pa->pa_id)) { case PCI_PRODUCT_RALINK_RT2560: @@ -241,8 +243,7 @@ ral_pci_activate(struct device *self, int act) (*psc->sc_opns->suspend)(sc); break; case DVACT_RESUME: - workq_queue_task(NULL, &psc->sc_resume_wqt, 0, - ral_pci_resume, psc, NULL); + task_add(systq, &psc->sc_resume_t); break; } |