connector: replace delayed work with usual work queue.
Subsystems (2)
PATCH 1/1 connector: replace delayed work with usual work queue.
Signed-off-by Evgeniy Polyakov <[email protected]>
drivers/connector/cn_queue.c +2 -3
@@ -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, strucmemcpy (&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);
drivers/connector/connector.c +7 -9
@@ -135,16 +135,15 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), vspin_lock_bh (&dev->cbdev->queue_lock);list_for_each_entry (__cbq, &dev->cbdev->queue_list, callback_entry) {if (cn_cb_equal (&__cbq->id.id, &msg->id)) { -if (likely (!work_pending (&__cbq->work.work) && +if (likely (!work_pending (&__cbq->work) && __cbq->data.ddata ==NULL )) { __cbq->data.callback_priv = msg; __cbq->data.ddata = data; __cbq->data.destruct_data = destruct_data; -if (queue_delayed_work ( - dev->cbdev->cn_queue, - &__cbq->work,0 )) +if (queue_work (dev->cbdev->cn_queue, + &__cbq->work)) err =0 ; }else {struct cn_callback_data *d;
@@ -158,12 +157,11 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v d->destruct_data = destruct_data; d->free = __cbq; -INIT_DELAYED_WORK (&__cbq->work, - &cn_queue_wrapper); +INIT_WORK (&__cbq->work, + &cn_queue_wrapper); -if (queue_delayed_work ( - dev->cbdev->cn_queue, - &__cbq->work,0 )) +if (queue_work (dev->cbdev->cn_queue, + &__cbq->work)) err =0 ;else {kfree (__cbq);
include/linux/connector.h +1 -1
@@ -133,7 +133,7 @@ struct cn_callback_data {struct cn_callback_entry {struct list_head callback_entry;struct cn_callback *cb; -struct delayed_work work; +struct work_struct work;struct cn_queue_dev *pdev;struct cn_callback_id id;
Signature · 1 line
Evgeniy Polyakov
From: Evgeniy Polyakov <[email protected]>
Date: Mon, 18 Dec 2006 12:44:35 +0300
Quoted 1 line
Signed-off-by Evgeniy Polyakov <[email protected]>
Applied, thanks Evegniy.