diff options
| author | Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 2006-12-18 12:53:58 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-12-18 12:53:58 +0300 |
| commit | a240d9f1d8e6421cb970632b93e71b2f66c2cd70 (patch) | |
| tree | e3d103d3c3637c074d0a2bf48fbcb07dce04b70a /drivers/connector/cn_queue.c | |
| parent | 14fb8a764786e37ac26a2175638115f21980e5a3 (diff) | |
| download | linux-a240d9f1d8e6421cb970632b93e71b2f66c2cd70.tar.xz | |
[CONNECTOR]: Replace delayed work with usual work queue.
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/connector/cn_queue.c')
| -rw-r--r-- | drivers/connector/cn_queue.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c index b418b16e910e..296f51002b55 100644 --- a/drivers/connector/cn_queue.c +++ b/drivers/connector/cn_queue.c @@ -34,7 +34,7 @@ void cn_queue_wrapper(struct work_struct *work) { struct cn_callback_entry *cbq = - container_of(work, struct cn_callback_entry, work.work); + container_of(work, struct cn_callback_entry, work); struct cn_callback_data *d = &cbq->data; d->callback(d->callback_priv); @@ -59,13 +59,12 @@ static struct cn_callback_entry *cn_queue_alloc_callback_entry(char *name, struc memcpy(&cbq->id.id, id, sizeof(struct cb_id)); cbq->data.callback = callback; - INIT_DELAYED_WORK(&cbq->work, &cn_queue_wrapper); + INIT_WORK(&cbq->work, &cn_queue_wrapper); return cbq; } static void cn_queue_free_callback(struct cn_callback_entry *cbq) { - cancel_delayed_work(&cbq->work); flush_workqueue(cbq->pdev->cn_queue); kfree(cbq); |