Start using the new '%pS' infrastructure to print symbols

[pandora-kernel.git] / samples / markers / marker-example.c

diff --git a/samples/markers/marker-example.c b/samples/markers/marker-example.c
index e787c6d..e90dc5d 100644 (file)
--- a/samples/markers/marker-example.c
+++ b/samples/markers/marker-example.c
@@ -19,7 +19,8 @@ static int my_open(struct inode *inode, struct file *file)
 {
        int i;
 
-       trace_mark(subsystem_event, "%d %s", 123, "example string");
+       trace_mark(subsystem_event, "integer %d string %s", 123,
+               "example string");
        for (i = 0; i < 10; i++)
                trace_mark(subsystem_eventb, MARK_NOARGS);
        return -EPERM;
@@ -32,10 +33,8 @@ static struct file_operations mark_ops = {
 static int example_init(void)
 {
        printk(KERN_ALERT "example init\n");
-       pentry_example = create_proc_entry("marker-example", 0444, NULL);
-       if (pentry_example)
-               pentry_example->proc_fops = &mark_ops;
-       else
+       pentry_example = proc_create("marker-example", 0444, NULL, &mark_ops);
+       if (!pentry_example)
                return -EPERM;
        return 0;
 }