From d9537d4bdd76416b3a0fc8a1b009bf7d908849ea Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sat, 7 Mar 2009 07:44:12 -0300 Subject: [PATCH] --- yaml --- r: 138139 b: refs/heads/master c: fb6991d417a9f06978119ea597dc5955b3eb784d h: refs/heads/master i: 138137: 49ead471357b6fcda91395c0c7a1a653ff5ee5d2 138135: eb5bb2aa0dbb766c3885a9140e5e93f1d1d66929 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa6588.c | 24 ++++++------------------ 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 5423955834d4..3a404e816588 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1089bdc07f06b90f0bc50d0789c2a4833097df7 +refs/heads/master: fb6991d417a9f06978119ea597dc5955b3eb784d diff --git a/trunk/drivers/media/video/saa6588.c b/trunk/drivers/media/video/saa6588.c index 0067b281d503..2ce758c1ebb1 100644 --- a/trunk/drivers/media/video/saa6588.c +++ b/trunk/drivers/media/video/saa6588.c @@ -76,8 +76,7 @@ MODULE_LICENSE("GPL"); struct saa6588 { struct v4l2_subdev sd; - struct work_struct work; - struct timer_list timer; + struct delayed_work work; spinlock_t lock; unsigned char *buffer; unsigned int buf_size; @@ -322,19 +321,12 @@ static void saa6588_i2c_poll(struct saa6588 *s) wake_up_interruptible(&s->read_queue); } -static void saa6588_timer(unsigned long data) -{ - struct saa6588 *s = (struct saa6588 *)data; - - schedule_work(&s->work); -} - static void saa6588_work(struct work_struct *work) { - struct saa6588 *s = container_of(work, struct saa6588, work); + struct saa6588 *s = container_of(work, struct saa6588, work.work); saa6588_i2c_poll(s); - mod_timer(&s->timer, jiffies + msecs_to_jiffies(20)); + schedule_delayed_work(&s->work, msecs_to_jiffies(20)); } static int saa6588_configure(struct saa6588 *s) @@ -490,11 +482,8 @@ static int saa6588_probe(struct i2c_client *client, saa6588_configure(s); /* start polling via eventd */ - INIT_WORK(&s->work, saa6588_work); - init_timer(&s->timer); - s->timer.function = saa6588_timer; - s->timer.data = (unsigned long)s; - schedule_work(&s->work); + INIT_DELAYED_WORK(&s->work, saa6588_work); + schedule_delayed_work(&s->work, 0); return 0; } @@ -505,8 +494,7 @@ static int saa6588_remove(struct i2c_client *client) v4l2_device_unregister_subdev(sd); - del_timer_sync(&s->timer); - flush_scheduled_work(); + cancel_delayed_work_sync(&s->work); kfree(s->buffer); kfree(s);