Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[pandora-kernel.git] / Documentation / connector / cn_test.c

diff --git a/Documentation/connector/cn_test.c b/Documentation/connector/cn_test.c
index 6a5be5d..1711adc 100644 (file)
--- a/Documentation/connector/cn_test.c
+++ b/Documentation/connector/cn_test.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define pr_fmt(fmt) "cn_test: " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -27,18 +29,17 @@
 
 #include <linux/connector.h>
 
-static struct cb_id cn_test_id = { 0x123, 0x456 };
+static struct cb_id cn_test_id = { CN_NETLINK_USERS + 3, 0x456 };
 static char cn_test_name[] = "cn_test";
 static struct sock *nls;
 static struct timer_list cn_test_timer;
 
-void cn_test_callback(void *data)
+static void cn_test_callback(struct cn_msg *msg)
 {
-       struct cn_msg *msg = (struct cn_msg *)data;
-
-       printk("%s: %lu: idx=%x, val=%x, seq=%u, ack=%u, len=%d: %s.\n",
-              __func__, jiffies, msg->id.idx, msg->id.val,
-              msg->seq, msg->ack, msg->len, (char *)msg->data);
+       pr_info("%s: %lu: idx=%x, val=%x, seq=%u, ack=%u, len=%d: %s.\n",
+               __func__, jiffies, msg->id.idx, msg->id.val,
+               msg->seq, msg->ack, msg->len,
+               msg->len ? (char *)msg->data : "");
 }
 
 /*
@@ -63,9 +64,7 @@ static int cn_test_want_notify(void)
 
        skb = alloc_skb(size, GFP_ATOMIC);
        if (!skb) {
-               printk(KERN_ERR "Failed to allocate new skb with size=%u.\n",
-                      size);
-
+               pr_err("failed to allocate new skb with size=%u\n", size);
                return -ENOMEM;
        }
 
@@ -114,12 +113,12 @@ static int cn_test_want_notify(void)
        //netlink_broadcast(nls, skb, 0, ctl->group, GFP_ATOMIC);
        netlink_unicast(nls, skb, 0, 0);
 
-       printk(KERN_INFO "Request was sent. Group=0x%x.\n", ctl->group);
+       pr_info("request was sent: group=0x%x\n", ctl->group);
 
        return 0;
 
 nlmsg_failure:
-       printk(KERN_ERR "Failed to send %u.%u\n", msg->seq, msg->ack);
+       pr_err("failed to send %u.%u\n", msg->seq, msg->ack);
        kfree_skb(skb);
        return -EINVAL;
 }
@@ -131,6 +130,8 @@ static void cn_test_timer_func(unsigned long __data)
        struct cn_msg *m;
        char data[32];
 
+       pr_debug("%s: timer fired with data %lu\n", __func__, __data);
+
        m = kzalloc(sizeof(*m) + sizeof(data), GFP_ATOMIC);
        if (m) {
 
@@ -150,7 +151,7 @@ static void cn_test_timer_func(unsigned long __data)
 
        cn_test_timer_counter++;
 
-       mod_timer(&cn_test_timer, jiffies + HZ);
+       mod_timer(&cn_test_timer, jiffies + msecs_to_jiffies(1000));
 }
 
 static int cn_test_init(void)
@@ -168,8 +169,10 @@ static int cn_test_init(void)
        }
 
        setup_timer(&cn_test_timer, cn_test_timer_func, 0);
-       cn_test_timer.expires = jiffies + HZ;
-       add_timer(&cn_test_timer);
+       mod_timer(&cn_test_timer, jiffies + msecs_to_jiffies(1000));
+
+       pr_info("initialized with id={%u.%u}\n",
+               cn_test_id.idx, cn_test_id.val);
 
        return 0;