linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / connector / connector.c

diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index b49bacf..505677f 100644 (file)
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -26,7 +26,6 @@
 #include <linux/netlink.h>
 #include <linux/moduleparam.h>
 #include <linux/connector.h>
-#include <linux/mutex.h>
 
 #include <net/sock.h>
 
@@ -42,7 +41,7 @@ module_param(cn_val, uint, 0);
 MODULE_PARM_DESC(cn_idx, "Connector's main device idx.");
 MODULE_PARM_DESC(cn_val, "Connector's main device val.");
 
-static DEFINE_MUTEX(notify_lock);
+static DECLARE_MUTEX(notify_lock);
 static LIST_HEAD(notify_list);
 
 static struct cn_dev cdev;
@@ -98,9 +97,6 @@ int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask)
                group = __group;
        }
 
-       if (!netlink_has_listeners(dev->nls, group))
-               return -ESRCH;
-
        size = NLMSG_SPACE(sizeof(*msg) + msg->len);
 
        skb = alloc_skb(size, gfp_mask);
@@ -115,13 +111,14 @@ int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask)
 
        NETLINK_CB(skb).dst_group = group;
 
-       return netlink_broadcast(dev->nls, skb, 0, group, gfp_mask);
+       netlink_broadcast(dev->nls, skb, 0, group, gfp_mask);
+
+       return 0;
 
 nlmsg_failure:
        kfree_skb(skb);
        return -EINVAL;
 }
-EXPORT_SYMBOL_GPL(cn_netlink_send);
 
 /*
  * Callback helper - queues work and setup destructor for given data.
@@ -262,7 +259,7 @@ static void cn_notify(struct cb_id *id, u32 notify_event)
 {
        struct cn_ctl_entry *ent;
 
-       mutex_lock(&notify_lock);
+       down(&notify_lock);
        list_for_each_entry(ent, &notify_list, notify_entry) {
                int i;
                struct cn_notify_req *req;
@@ -295,7 +292,7 @@ static void cn_notify(struct cb_id *id, u32 notify_event)
                        cn_netlink_send(&m, ctl->group, GFP_KERNEL);
                }
        }
-       mutex_unlock(&notify_lock);
+       up(&notify_lock);
 }
 
 /*
@@ -309,9 +306,6 @@ int cn_add_callback(struct cb_id *id, char *name, void (*callback)(void *))
        int err;
        struct cn_dev *dev = &cdev;
 
-       if (!cn_already_initialized)
-               return -EAGAIN;
-
        err = cn_queue_add_callback(dev->cbdev, name, id, callback);
        if (err)
                return err;
@@ -320,7 +314,6 @@ int cn_add_callback(struct cb_id *id, char *name, void (*callback)(void *))
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(cn_add_callback);
 
 /*
  * Callback remove routing - removes callback
@@ -337,7 +330,6 @@ void cn_del_callback(struct cb_id *id)
        cn_queue_del_callback(dev->cbdev, id);
        cn_notify(id, 1);
 }
-EXPORT_SYMBOL_GPL(cn_del_callback);
 
 /*
  * Checks two connector's control messages to be the same.
@@ -414,14 +406,14 @@ static void cn_callback(void *data)
        if (ctl->group == 0) {
                struct cn_ctl_entry *n;
 
-               mutex_lock(&notify_lock);
+               down(&notify_lock);
                list_for_each_entry_safe(ent, n, &notify_list, notify_entry) {
                        if (cn_ctl_msg_equals(ent->msg, ctl)) {
                                list_del(&ent->notify_entry);
                                kfree(ent);
                        }
                }
-               mutex_unlock(&notify_lock);
+               up(&notify_lock);
 
                return;
        }
@@ -436,12 +428,12 @@ static void cn_callback(void *data)
 
        memcpy(ent->msg, ctl, size - sizeof(*ent));
 
-       mutex_lock(&notify_lock);
+       down(&notify_lock);
        list_add(&ent->notify_entry, &notify_list);
-       mutex_unlock(&notify_lock);
+       up(&notify_lock);
 }
 
-static int __devinit cn_init(void)
+static int __init cn_init(void)
 {
        struct cn_dev *dev = &cdev;
        int err;
@@ -462,22 +454,21 @@ static int __devinit cn_init(void)
                        sock_release(dev->nls->sk_socket);
                return -EINVAL;
        }
-       
-       cn_already_initialized = 1;
 
        err = cn_add_callback(&dev->id, "connector", &cn_callback);
        if (err) {
-               cn_already_initialized = 0;
                cn_queue_free_dev(dev->cbdev);
                if (dev->nls->sk_socket)
                        sock_release(dev->nls->sk_socket);
                return -EINVAL;
        }
 
+       cn_already_initialized = 1;
+
        return 0;
 }
 
-static void __devexit cn_fini(void)
+static void __exit cn_fini(void)
 {
        struct cn_dev *dev = &cdev;
 
@@ -489,5 +480,9 @@ static void __devexit cn_fini(void)
                sock_release(dev->nls->sk_socket);
 }
 
-subsys_initcall(cn_init);
+module_init(cn_init);
 module_exit(cn_fini);
+
+EXPORT_SYMBOL_GPL(cn_add_callback);
+EXPORT_SYMBOL_GPL(cn_del_callback);
+EXPORT_SYMBOL_GPL(cn_netlink_send);