1 files changed, 5 insertions, 26 deletions

diff --git a/linux/drivers/media/video/ir-kbd-i2c.c b/linux/drivers/media/video/ir-kbd-i2c.c
index fa5480f64..7bae57ad3 100644
--- a/linux/drivers/media/video/ir-kbd-i2c.c
+++ b/linux/drivers/media/video/ir-kbd-i2c.c
@@ -47,9 +47,9 @@
 #include <linux/i2c-id.h>
 #include <linux/workqueue.h>
 
+#include "compat.h"
 #include <media/ir-common.h>
 #include <media/ir-kbd-i2c.h>
-#include "compat.h"
 
 /* ----------------------------------------------------------------------- */
 /* insmod parameters                                                       */
@@ -281,12 +281,6 @@ static void ir_key_poll(struct IR_i2c *ir)
 }
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-static void ir_timer(unsigned long data)
-{
-	struct IR_i2c *ir = (struct IR_i2c*)data;
-	schedule_work(&ir->work);
-}
-
 static void ir_work(void *data)
 #else
 static void ir_work(struct work_struct *work)
@@ -295,9 +289,7 @@ static void ir_work(struct work_struct *work)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
 	struct IR_i2c *ir = data;
 #else
-	struct delayed_work *dwork = container_of(work, struct delayed_work,
-						  work);
-	struct IR_i2c *ir = container_of(dwork, struct IR_i2c, work);
+	struct IR_i2c *ir = container_of(work, struct IR_i2c, work.work);
 #endif
 	int polling_interval = 100;
 
@@ -307,11 +299,7 @@ static void ir_work(struct work_struct *work)
 		polling_interval = 50;
 
 	ir_key_poll(ir);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-	mod_timer(&ir->timer, jiffies + msecs_to_jiffies(polling_interval));
-#else
-	schedule_delayed_work(dwork, msecs_to_jiffies(polling_interval));
-#endif
+	schedule_delayed_work(&ir->work, msecs_to_jiffies(polling_interval));
 }
 
 /* ----------------------------------------------------------------------- */
@@ -468,15 +456,11 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
 
 	/* start polling via eventd */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-	INIT_WORK(&ir->work, ir_work, ir);
-	init_timer(&ir->timer);
-	ir->timer.function = ir_timer;
-	ir->timer.data     = (unsigned long)ir;
-	schedule_work(&ir->work);
+	INIT_DELAYED_WORK(&ir->work, ir_work, ir);
 #else
 	INIT_DELAYED_WORK(&ir->work, ir_work);
-	schedule_delayed_work(&ir->work, msecs_to_jiffies(100));
 #endif
+	schedule_delayed_work(&ir->work, 0);
 
 	return 0;
 
@@ -493,12 +477,7 @@ static int ir_detach(struct i2c_client *client)
 	struct IR_i2c *ir = i2c_get_clientdata(client);
 
 	/* kill outstanding polls */
-#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
 
 	/* unregister devices */
 	input_unregister_device(ir->input);