---

yaml
---
r: 161410
b: refs/heads/master
c: 721f59e
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 227423904c709a8e60245c97081bbeb4fb500655
+refs/heads/master: 721f59ed612477a9f83f3f3a222a14d16505c1a4

trunk/Documentation/00-INDEX

@@ -82,8 +82,6 @@ block/
 	- info on the Block I/O (BIO) layer.
 blockdev/
 	- info on block devices & drivers
-btmrvl.txt
-	- info on Marvell Bluetooth driver usage.
 cachetlb.txt
 	- describes the cache/TLB flushing interfaces Linux uses.
 cdrom/

trunk/Documentation/connector/Makefile

@@ -9,8 +9,3 @@ hostprogs-y := ucon
 always := $(hostprogs-y)
 
 HOSTCFLAGS_ucon.o += -I$(objtree)/usr/include
-
-all: modules
-
-modules clean:
-	$(MAKE) -C ../.. SUBDIRS=$(PWD) $@

trunk/Documentation/connector/cn_test.c

@@ -19,8 +19,6 @@
  * 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>
@@ -29,17 +27,18 @@
 
 #include <linux/connector.h>
 
-static struct cb_id cn_test_id = { CN_NETLINK_USERS + 3, 0x456 };
+static struct cb_id cn_test_id = { 0x123, 0x456 };
 static char cn_test_name[] = "cn_test";
 static struct sock *nls;
 static struct timer_list cn_test_timer;
 
-static void cn_test_callback(struct cn_msg *msg)
+void cn_test_callback(void *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 : "");
+	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);
 }
 
 /*
@@ -64,7 +63,9 @@ static int cn_test_want_notify(void)
 
 	skb = alloc_skb(size, GFP_ATOMIC);
 	if (!skb) {
-		pr_err("failed to allocate new skb with size=%u\n", size);
+		printk(KERN_ERR "Failed to allocate new skb with size=%u.\n",
+		       size);
+
 		return -ENOMEM;
 	}
 
@@ -113,12 +114,12 @@ static int cn_test_want_notify(void)
 	//netlink_broadcast(nls, skb, 0, ctl->group, GFP_ATOMIC);
 	netlink_unicast(nls, skb, 0, 0);
 
-	pr_info("request was sent: group=0x%x\n", ctl->group);
+	printk(KERN_INFO "Request was sent. Group=0x%x.\n", ctl->group);
 
 	return 0;
 
 nlmsg_failure:
-	pr_err("failed to send %u.%u\n", msg->seq, msg->ack);
+	printk(KERN_ERR "Failed to send %u.%u\n", msg->seq, msg->ack);
 	kfree_skb(skb);
 	return -EINVAL;
 }
@@ -130,8 +131,6 @@ 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) {
 
@@ -151,7 +150,7 @@ static void cn_test_timer_func(unsigned long __data)
 
 	cn_test_timer_counter++;
 
-	mod_timer(&cn_test_timer, jiffies + msecs_to_jiffies(1000));
+	mod_timer(&cn_test_timer, jiffies + HZ);
 }
 
 static int cn_test_init(void)
@@ -169,10 +168,8 @@ static int cn_test_init(void)
 	}
 
 	setup_timer(&cn_test_timer, cn_test_timer_func, 0);
-	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);
+	cn_test_timer.expires = jiffies + HZ;
+	add_timer(&cn_test_timer);
 
 	return 0;