1 files changed, 4 insertions, 29 deletions

diff --git a/linux/drivers/media/video/em28xx/em28xx-input.c b/linux/drivers/media/video/em28xx/em28xx-input.c
index b1344499e..5382a6064 100644
--- a/linux/drivers/media/video/em28xx/em28xx-input.c
+++ b/linux/drivers/media/video/em28xx/em28xx-input.c
@@ -69,12 +69,7 @@ struct em28xx_IR {
 
 	/* poll external decoder */
 	int polling;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
-	struct work_struct work;
-	struct timer_list timer;
-#else
 	struct delayed_work work;
-#endif
 	unsigned int last_toggle:1;
 	unsigned int last_readcount;
 	unsigned int repeat_interval;
@@ -303,13 +298,6 @@ static void em28xx_ir_handle_key(struct em28xx_IR *ir)
 }
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
-static void ir_timer(unsigned long data)
-{
-	struct em28xx_IR *ir = (struct em28xx_IR *)data;
-
-	schedule_work(&ir->work);
-}
-
 static void em28xx_ir_work(void *data)
 #else
 static void em28xx_ir_work(struct work_struct *work)
@@ -318,39 +306,26 @@ static void em28xx_ir_work(struct work_struct *work)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
 	struct em28xx_IR *ir = data;
 #else
-	struct delayed_work *dwork = container_of(work, struct delayed_work,
-						  work);
-	struct em28xx_IR *ir = container_of(dwork, struct em28xx_IR, work);
+	struct em28xx_IR *ir = container_of(work, struct em28xx_IR, work.work);
 #endif
 
 	em28xx_ir_handle_key(ir);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
-	mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
-#else
-	schedule_delayed_work(dwork, msecs_to_jiffies(ir->polling));
-#endif
+	schedule_delayed_work(&ir->work, msecs_to_jiffies(ir->polling));
 }
 
 static void em28xx_ir_start(struct em28xx_IR *ir)
 {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
-	setup_timer(&ir->timer, ir_timer, (unsigned long)ir);
-	INIT_WORK(&ir->work, em28xx_ir_work, ir);
-	schedule_work(&ir->work);
+	INIT_DELAYED_WORK(&ir->work, em28xx_ir_work, ir);
 #else
 	INIT_DELAYED_WORK(&ir->work, em28xx_ir_work);
-	schedule_delayed_work(&ir->work, msecs_to_jiffies(ir->polling));
 #endif
+	schedule_delayed_work(&ir->work, 0);
 }
 
 static void em28xx_ir_stop(struct em28xx_IR *ir)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
-	del_timer_sync(&ir->timer);
-	flush_scheduled_work();
-#else
 	cancel_delayed_work_sync(&ir->work);
-#endif
 }
 
 int em28xx_ir_init(struct em28xx *dev)