Commit 9abff15d authored by Tejun Heo's avatar Tejun Heo Committed by Greg Kroah-Hartman

USB: ueagle-atm: use system_wq instead of dedicated workqueues

With cmwq, there's no reason to use separate workqueues.  Drop
uea_softc->work_q and use system_wq instead.  The used work item is
sync flushed on driver detach.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Stanislaw Gruszka <stf_xl@wp.pl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ef58d97a
...@@ -168,7 +168,6 @@ struct uea_softc { ...@@ -168,7 +168,6 @@ struct uea_softc {
union cmv_dsc cmv_dsc; union cmv_dsc cmv_dsc;
struct work_struct task; struct work_struct task;
struct workqueue_struct *work_q;
u16 pageno; u16 pageno;
u16 ovl; u16 ovl;
...@@ -1879,7 +1878,7 @@ static int uea_start_reset(struct uea_softc *sc) ...@@ -1879,7 +1878,7 @@ static int uea_start_reset(struct uea_softc *sc)
/* start loading DSP */ /* start loading DSP */
sc->pageno = 0; sc->pageno = 0;
sc->ovl = 0; sc->ovl = 0;
queue_work(sc->work_q, &sc->task); schedule_work(&sc->task);
/* wait for modem ready CMV */ /* wait for modem ready CMV */
ret = wait_cmv_ack(sc); ret = wait_cmv_ack(sc);
...@@ -2091,14 +2090,14 @@ static void uea_schedule_load_page_e1(struct uea_softc *sc, ...@@ -2091,14 +2090,14 @@ static void uea_schedule_load_page_e1(struct uea_softc *sc,
{ {
sc->pageno = intr->e1_bSwapPageNo; sc->pageno = intr->e1_bSwapPageNo;
sc->ovl = intr->e1_bOvl >> 4 | intr->e1_bOvl << 4; sc->ovl = intr->e1_bOvl >> 4 | intr->e1_bOvl << 4;
queue_work(sc->work_q, &sc->task); schedule_work(&sc->task);
} }
static void uea_schedule_load_page_e4(struct uea_softc *sc, static void uea_schedule_load_page_e4(struct uea_softc *sc,
struct intr_pkt *intr) struct intr_pkt *intr)
{ {
sc->pageno = intr->e4_bSwapPageNo; sc->pageno = intr->e4_bSwapPageNo;
queue_work(sc->work_q, &sc->task); schedule_work(&sc->task);
} }
/* /*
...@@ -2170,13 +2169,6 @@ static int uea_boot(struct uea_softc *sc) ...@@ -2170,13 +2169,6 @@ static int uea_boot(struct uea_softc *sc)
init_waitqueue_head(&sc->sync_q); init_waitqueue_head(&sc->sync_q);
sc->work_q = create_workqueue("ueagle-dsp");
if (!sc->work_q) {
uea_err(INS_TO_USBDEV(sc), "cannot allocate workqueue\n");
uea_leaves(INS_TO_USBDEV(sc));
return -ENOMEM;
}
if (UEA_CHIP_VERSION(sc) == ADI930) if (UEA_CHIP_VERSION(sc) == ADI930)
load_XILINX_firmware(sc); load_XILINX_firmware(sc);
...@@ -2225,7 +2217,6 @@ static int uea_boot(struct uea_softc *sc) ...@@ -2225,7 +2217,6 @@ static int uea_boot(struct uea_softc *sc)
sc->urb_int = NULL; sc->urb_int = NULL;
kfree(intr); kfree(intr);
err0: err0:
destroy_workqueue(sc->work_q);
uea_leaves(INS_TO_USBDEV(sc)); uea_leaves(INS_TO_USBDEV(sc));
return -ENOMEM; return -ENOMEM;
} }
...@@ -2246,8 +2237,8 @@ static void uea_stop(struct uea_softc *sc) ...@@ -2246,8 +2237,8 @@ static void uea_stop(struct uea_softc *sc)
kfree(sc->urb_int->transfer_buffer); kfree(sc->urb_int->transfer_buffer);
usb_free_urb(sc->urb_int); usb_free_urb(sc->urb_int);
/* stop any pending boot process, when no one can schedule work */ /* flush the work item, when no one can schedule it */
destroy_workqueue(sc->work_q); flush_work_sync(&sc->task);
if (sc->dsp_firm) if (sc->dsp_firm)
release_firmware(sc->dsp_firm); release_firmware(sc->dsp_firm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment