X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=samples%2Fmarkers%2Fmarker-example.c;h=e90dc5d04392dcc0f10d6d480dd6a866cc54df0e;hb=ed6dc4981368aa8ac89b0ea61535cfa2b03533cb;hp=e787c6d16dd77ace5f998a3f8a17e50f57b38fe3;hpb=b04cde34cf1d006dfaf8523640f3a18bbb15ebaa;p=linux-2.6-omap-h63xx.git

diff --git a/samples/markers/marker-example.c b/samples/markers/marker-example.c
index e787c6d16dd..e90dc5d0439 100644
--- 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;
 }