6 files changed, 42 insertions, 18 deletions

diff --git a/drivers/media/video/cpia_pp.c b/drivers/media/video/cpia_pp.c
index 41f4b8d17559..b12cec94f4cc 100644
--- a/drivers/media/video/cpia_pp.c
+++ b/drivers/media/video/cpia_pp.c
@@ -82,6 +82,8 @@ struct pp_cam_entry {
         struct pardevice *pdev;
         struct parport *port;
         struct work_struct cb_task;
+        void (*cb_func)(void *cbdata);
+        void *cb_data;
         int open_count;
         wait_queue_head_t wq_stream;
         /* image state flags */
@@ -130,6 +132,20 @@ static void cpia_parport_disable_irq( struct parport *port ) {
 #define PARPORT_CHUNK_SIZE      PAGE_SIZE
 
 
+static void cpia_pp_run_callback(struct work_struct *work)
+{
+        void (*cb_func)(void *cbdata);
+        void *cb_data;
+        struct pp_cam_entry *cam;
+
+        cam = container_of(work, struct pp_cam_entry, cb_task);
+        cb_func = cam->cb_func;
+        cb_data = cam->cb_data;
+        work_release(work);
+
+        cb_func(cb_data);
+}
+
 /****************************************************************************
  *
  *  CPiA-specific  low-level parport functions for nibble uploads
@@ -664,7 +680,9 @@ static int cpia_pp_registerCallback(void *privdata, void (*cb)(void *cbdata), vo
         int retval = 0;
 
         if(cam->port->irq != PARPORT_IRQ_NONE) {
-                INIT_WORK(&cam->cb_task, cb, cbdata);
+                cam->cb_func = cb;
+                cam->cb_data = cbdata;
+                INIT_WORK_NAR(&cam->cb_task, cpia_pp_run_callback);
         } else {
                 retval = -1;
         }
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 57e1c024a547..e60a0a52e4b2 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -145,9 +145,9 @@ static void ir_timer(unsigned long data)
         schedule_work(&ir->work);
 }
 
-static void cx88_ir_work(void *data)
+static void cx88_ir_work(struct work_struct *work)
 {
-        struct cx88_IR *ir = data;
+        struct cx88_IR *ir = container_of(work, struct cx88_IR, work);
         unsigned long timeout;
 
         cx88_ir_handle_key(ir);
@@ -308,7 +308,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         core->ir = ir;
 
         if (ir->polling) {
-                INIT_WORK(&ir->work, cx88_ir_work, ir);
+                INIT_WORK(&ir->work, cx88_ir_work);
                 init_timer(&ir->timer);
                 ir->timer.function = ir_timer;
                 ir->timer.data = (unsigned long)ir;
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 1457b1602221..ab87e7bfe84f 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -268,9 +268,9 @@ static void ir_timer(unsigned long data)
         schedule_work(&ir->work);
 }
 
-static void ir_work(void *data)
+static void ir_work(struct work_struct *work)
 {
-        struct IR_i2c *ir = data;
+        struct IR_i2c *ir = container_of(work, struct IR_i2c, work);
         ir_key_poll(ir);
         mod_timer(&ir->timer, jiffies+HZ/10);
 }
@@ -400,7 +400,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
                ir->input->name,ir->input->phys,adap->name);
 
         /* start polling via eventd */
-        INIT_WORK(&ir->work, ir_work, ir);
+        INIT_WORK(&ir->work, ir_work);
         init_timer(&ir->timer);
         ir->timer.function = ir_timer;
         ir->timer.data     = (unsigned long)ir;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.c b/drivers/media/video/pvrusb2/pvrusb2-context.c
index f129f316d20e..cf129746205d 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-context.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-context.c
@@ -45,16 +45,21 @@ static void pvr2_context_trigger_poll(struct pvr2_context *mp)
 }
 
 
-static void pvr2_context_poll(struct pvr2_context *mp)
+static void pvr2_context_poll(struct work_struct *work)
 {
+        struct pvr2_context *mp =
+                container_of(work, struct pvr2_context, workpoll);
         pvr2_context_enter(mp); do {
                 pvr2_hdw_poll(mp->hdw);
         } while (0); pvr2_context_exit(mp);
 }
 
 
-static void pvr2_context_setup(struct pvr2_context *mp)
+static void pvr2_context_setup(struct work_struct *work)
 {
+        struct pvr2_context *mp =
+                container_of(work, struct pvr2_context, workinit);
+
         pvr2_context_enter(mp); do {
                 if (!pvr2_hdw_dev_ok(mp->hdw)) break;
                 pvr2_hdw_setup(mp->hdw);
@@ -92,8 +97,8 @@ struct pvr2_context *pvr2_context_create(
         }
 
         mp->workqueue = create_singlethread_workqueue("pvrusb2");
-        INIT_WORK(&mp->workinit,(void (*)(void*))pvr2_context_setup,mp);
-        INIT_WORK(&mp->workpoll,(void (*)(void*))pvr2_context_poll,mp);
+        INIT_WORK(&mp->workinit, pvr2_context_setup);
+        INIT_WORK(&mp->workpoll, pvr2_context_poll);
         queue_work(mp->workqueue,&mp->workinit);
  done:
         return mp;
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index a81285ca7d5b..8ba05c214ca7 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -322,9 +322,9 @@ static void saa6588_timer(unsigned long data)
         schedule_work(&s->work);
 }
 
-static void saa6588_work(void *data)
+static void saa6588_work(struct work_struct *work)
 {
-        struct saa6588 *s = (struct saa6588 *)data;
+        struct saa6588 *s = container_of(work, struct saa6588, work);
 
         saa6588_i2c_poll(s);
         mod_timer(&s->timer, jiffies + msecs_to_jiffies(20));
@@ -417,7 +417,7 @@ static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind)
         saa6588_configure(s);
 
         /* start polling via eventd */
-        INIT_WORK(&s->work, saa6588_work, s);
+        INIT_WORK(&s->work, saa6588_work);
         init_timer(&s->timer);
         s->timer.function = saa6588_timer;
         s->timer.data = (unsigned long)s;
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 65d044086ce9..daaae870a2c4 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -343,9 +343,10 @@ static struct video_device saa7134_empress_template =
         .minor         = -1,
 };
 
-static void empress_signal_update(void* data)
+static void empress_signal_update(struct work_struct *work)
 {
-        struct saa7134_dev* dev = (struct saa7134_dev*) data;
+        struct saa7134_dev* dev =
+                container_of(work, struct saa7134_dev, empress_workqueue);
 
         if (dev->nosignal) {
                 dprintk("no video signal\n");
@@ -378,7 +379,7 @@ static int empress_init(struct saa7134_dev *dev)
                  "%s empress (%s)", dev->name,
                  saa7134_boards[dev->board].name);
 
-        INIT_WORK(&dev->empress_workqueue, empress_signal_update, (void*) dev);
+        INIT_WORK(&dev->empress_workqueue, empress_signal_update);
 
         err = video_register_device(dev->empress_dev,VFL_TYPE_GRABBER,
                                     empress_nr[dev->nr]);
@@ -399,7 +400,7 @@ static int empress_init(struct saa7134_dev *dev)
                             sizeof(struct saa7134_buf),
                             dev);
 
-        empress_signal_update(dev);
+        empress_signal_update(&dev->empress_workqueue);
         return 0;
 }