Merge git://git.infradead.org/users/dhowells/workq-2.6

* git://git.infradead.org/users/dhowells/workq-2.6:
  Actually update the fixed up compile failures.
  WorkQueue: Fix up arch-specific work items where possible
  WorkStruct: make allyesconfig
  WorkStruct: Pass the work_struct pointer instead of context data
  WorkStruct: Merge the pending bit into the wq_data pointer
  WorkStruct: Typedef the work function prototype
  WorkStruct: Separate delayable and non-delayable events.

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 7b9859c33018..92eabf88a09b 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -324,9 +324,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));
@@ -419,7 +419,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;