WorkStruct: make allyesconfig

Fix up for make allyesconfig.

Signed-Off-By: David Howells <dhowells@redhat.com>

2 files changed, 20 insertions, 19 deletions

diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index 05f8ce2cfb4a..b418b16e910e 100644
--- a/drivers/connector/cn_queue.c
+++ b/drivers/connector/cn_queue.c
@@ -31,9 +31,11 @@
 #include <linux/connector.h>
 #include <linux/delay.h>
 
-void cn_queue_wrapper(void *data)
+void cn_queue_wrapper(struct work_struct *work)
 {
-        struct cn_callback_data *d = data;
+        struct cn_callback_entry *cbq =
+                container_of(work, struct cn_callback_entry, work.work);
+        struct cn_callback_data *d = &cbq->data;
 
         d->callback(d->callback_priv);
 
@@ -57,7 +59,7 @@ 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_WORK(&cbq->work, &cn_queue_wrapper, &cbq->data);
+        INIT_DELAYED_WORK(&cbq->work, &cn_queue_wrapper);
         return cbq;
 }
 
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index b49bacfd8de8..5e7cd45d10ee 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -135,40 +135,39 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v
         spin_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(!test_bit(0, &__cbq->work.pending) &&
+                        if (likely(!test_bit(WORK_STRUCT_PENDING,
+                                             &__cbq->work.work.management) &&
                                         __cbq->data.ddata == NULL)) {
                                 __cbq->data.callback_priv = msg;
 
                                 __cbq->data.ddata = data;
                                 __cbq->data.destruct_data = destruct_data;
 
-                                if (queue_work(dev->cbdev->cn_queue,
-                                                &__cbq->work))
+                                if (queue_delayed_work(
+                                            dev->cbdev->cn_queue,
+                                            &__cbq->work, 0))
                                         err = 0;
                         } else {
-                                struct work_struct *w;
                                 struct cn_callback_data *d;
                                 
-                                w = kzalloc(sizeof(*w) + sizeof(*d), GFP_ATOMIC);
-                                if (w) {
-                                        d = (struct cn_callback_data *)(w+1);
-
+                                __cbq = kzalloc(sizeof(*__cbq), GFP_ATOMIC);
+                                if (__cbq) {
+                                        d = &__cbq->data;
                                         d->callback_priv = msg;
                                         d->callback = __cbq->data.callback;
                                         d->ddata = data;
                                         d->destruct_data = destruct_data;
-                                        d->free = w;
+                                        d->free = __cbq;
 
-                                        INIT_LIST_HEAD(&w->entry);
-                                        w->pending = 0;
-                                        w->func = &cn_queue_wrapper;
-                                        w->data = d;
-                                        init_timer(&w->timer);
+                                        INIT_DELAYED_WORK(&__cbq->work,
+                                                          &cn_queue_wrapper);
                                         
-                                        if (queue_work(dev->cbdev->cn_queue, w))
+                                        if (queue_delayed_work(
+                                                    dev->cbdev->cn_queue,
+                                                    &__cbq->work, 0))
                                                 err = 0;
                                         else {
-                                                kfree(w);
+                                                kfree(__cbq);
                                                 err = -EINVAL;
                                         }
                                 } else