Use tasklet to schedule printing our default greeting.

[cascardo/kernel/samples/char2/.git] / hellochar.c

diff --git a/hellochar.c b/hellochar.c
index b5cae85..91e8d69 100644 (file)
--- a/hellochar.c
+++ b/hellochar.c
@@ -21,13 +21,13 @@
 #include <linux/cdev.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
-#include <linux/timer.h>
+#include <linux/interrupt.h>
 
 MODULE_LICENSE("GPL");
 
 static dev_t devnum;
 static struct cdev *dev;
-static const char default_greeting[] = "Hello, World!\n";
+static const char def_greeting[] = "Hello, World!\n";
 
 static DEFINE_SPINLOCK(hello_lock);
 
@@ -41,16 +41,13 @@ static void hello_world(unsigned long greeting)
        printk(KERN_INFO "%s", (char *) greeting);
 }
 
-static struct timer_list hello_timer;
+static DECLARE_TASKLET(hello_tasklet, hello_world, def_greeting);
+
 static ssize_t hello_read(struct file *fp, char __user *buf, size_t sz,
        loff_t *pos)
 {
-       printk(KERN_INFO "Adding timer...\n");
-       init_timer(&hello_timer);
-       hello_timer.expires = jiffies + 5 * HZ;
-       hello_timer.function = hello_world;
-       hello_timer.data = (unsigned long) default_greeting;
-       add_timer(&hello_timer);
+       printk(KERN_INFO "Scheduling tasklet...\n");
+       tasklet_schedule(&hello_tasklet);
        return 0;
 }
 
@@ -100,7 +97,7 @@ reg_out:
 
 static void __exit ch_exit(void)
 {
-       del_timer_sync(&hello_timer);
+       tasklet_kill(&hello_tasklet);
        cdev_del(dev);
        unregister_chrdev_region(devnum, 256);
 }