aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bt8xx/bttv-input.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-24 10:14:20 -0500
committerTejun Heo <tj@kernel.org>2010-12-24 10:14:20 -0500
commit8c71778cbf2c8beaefaa2dee5478aa0622d96682 (patch)
tree706fbdc96f696454d96538834b0d459967232e91 /drivers/media/video/bt8xx/bttv-input.c
parent707bcf326bd50c875d82bd2e7c31dcfb92b7e813 (diff)
media/video: don't use flush_scheduled_work()
This patch converts the remaining users of flush_scheduled_work() in media/video. * bttv-input.c and cx23885-input.c don't use workqueue at all. No need to flush. * Make omap24xxcam.c and saa7134-empress.c flush the used work directly. * In fd_defio.c, replace cancel_delayed_work() + flush_scheduled_work() with cancel_delayed_work_sync(). While at it, replace the deprecated cancel_rearming_delayed_work() with cancel_delayed_work_sync(). Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-input.c')
-rw-r--r--drivers/media/video/bt8xx/bttv-input.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index 6bf05a7dc5f9..1989f002898b 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -229,16 +229,13 @@ static void bttv_ir_start(struct bttv *btv, struct card_ir *ir)
229 229
230static void bttv_ir_stop(struct bttv *btv) 230static void bttv_ir_stop(struct bttv *btv)
231{ 231{
232 if (btv->remote->polling) { 232 if (btv->remote->polling)
233 del_timer_sync(&btv->remote->timer); 233 del_timer_sync(&btv->remote->timer);
234 flush_scheduled_work();
235 }
236 234
237 if (btv->remote->rc5_gpio) { 235 if (btv->remote->rc5_gpio) {
238 u32 gpio; 236 u32 gpio;
239 237
240 del_timer_sync(&btv->remote->timer_end); 238 del_timer_sync(&btv->remote->timer_end);
241 flush_scheduled_work();
242 239
243 gpio = bttv_gpio_read(&btv->c); 240 gpio = bttv_gpio_read(&btv->c);
244 bttv_gpio_write(&btv->c, gpio & ~(1 << 4)); 241 bttv_gpio_write(&btv->c, gpio & ~(1 << 4));