hwmon: (w83781d) Detect alias chips

[linux-2.6-omap-h63xx.git] / net / atm / resources.c

diff --git a/net/atm/resources.c b/net/atm/resources.c
index 224190537c90c3e5816df506e8dc9f234dfa5a7e..a34ba948af96dd5a471adeecd201198556e59340 100644 (file)
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -8,7 +8,6 @@
  *          use the default destruct function initialized by sock_init_data */
 
 
-#include <linux/config.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/atmdev.h>
@@ -18,6 +17,8 @@
 #include <linux/bitops.h>
 #include <linux/capability.h>
 #include <linux/delay.h>
+#include <linux/mutex.h>
+
 #include <net/sock.h>   /* for struct sock */
 
 #include "common.h"
@@ -26,16 +27,15 @@
 
 
 LIST_HEAD(atm_devs);
-DECLARE_MUTEX(atm_dev_mutex);
+DEFINE_MUTEX(atm_dev_mutex);
 
 static struct atm_dev *__alloc_atm_dev(const char *type)
 {
        struct atm_dev *dev;
 
-       dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+       dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (!dev)
                return NULL;
-       memset(dev, 0, sizeof(*dev));
        dev->type = type;
        dev->signal = ATM_PHY_SIG_UNKNOWN;
        dev->link_rate = ATM_OC3_PCR;
@@ -65,9 +65,9 @@ struct atm_dev *atm_dev_lookup(int number)
 {
        struct atm_dev *dev;
 
-       down(&atm_dev_mutex);
+       mutex_lock(&atm_dev_mutex);
        dev = __atm_dev_lookup(number);
-       up(&atm_dev_mutex);
+       mutex_unlock(&atm_dev_mutex);
        return dev;
 }
 
@@ -83,11 +83,11 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
                    type);
                return NULL;
        }
-       down(&atm_dev_mutex);
+       mutex_lock(&atm_dev_mutex);
        if (number != -1) {
                if ((inuse = __atm_dev_lookup(number))) {
                        atm_dev_put(inuse);
-                       up(&atm_dev_mutex);
+                       mutex_unlock(&atm_dev_mutex);
                        kfree(dev);
                        return NULL;
                }
@@ -112,14 +112,27 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
                printk(KERN_ERR "atm_dev_register: "
                       "atm_proc_dev_register failed for dev %s\n",
                       type);
-               up(&atm_dev_mutex);
-               kfree(dev);
-               return NULL;
+               goto out_fail;
+       }
+
+       if (atm_register_sysfs(dev) < 0) {
+               printk(KERN_ERR "atm_dev_register: "
+                      "atm_register_sysfs failed for dev %s\n",
+                      type);
+               atm_proc_dev_deregister(dev);
+               goto out_fail;
        }
+
        list_add_tail(&dev->dev_list, &atm_devs);
-       up(&atm_dev_mutex);
 
+out:
+       mutex_unlock(&atm_dev_mutex);
        return dev;
+
+out_fail:
+       kfree(dev);
+       dev = NULL;
+       goto out;
 }
 
 
@@ -129,15 +142,16 @@ void atm_dev_deregister(struct atm_dev *dev)
        set_bit(ATM_DF_REMOVED, &dev->flags);
 
        /*
-        * if we remove current device from atm_devs list, new device 
-        * with same number can appear, such we need deregister proc, 
+        * if we remove current device from atm_devs list, new device
+        * with same number can appear, such we need deregister proc,
         * release async all vccs and remove them from vccs list too
         */
-       down(&atm_dev_mutex);
+       mutex_lock(&atm_dev_mutex);
        list_del(&dev->dev_list);
-       up(&atm_dev_mutex);
+       mutex_unlock(&atm_dev_mutex);
 
        atm_dev_release_vccs(dev);
+       atm_unregister_sysfs(dev);
        atm_proc_dev_deregister(dev);
 
        atm_dev_put(dev);
@@ -196,16 +210,16 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
                                return -EFAULT;
                        if (get_user(len, &iobuf->length))
                                return -EFAULT;
-                       down(&atm_dev_mutex);
+                       mutex_lock(&atm_dev_mutex);
                        list_for_each(p, &atm_devs)
                                size += sizeof(int);
                        if (size > len) {
-                               up(&atm_dev_mutex);
+                               mutex_unlock(&atm_dev_mutex);
                                return -E2BIG;
                        }
                        tmp_buf = kmalloc(size, GFP_ATOMIC);
                        if (!tmp_buf) {
-                               up(&atm_dev_mutex);
+                               mutex_unlock(&atm_dev_mutex);
                                return -ENOMEM;
                        }
                        tmp_p = tmp_buf;
@@ -213,8 +227,8 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
                                dev = list_entry(p, struct atm_dev, dev_list);
                                *tmp_p++ = dev->number;
                        }
-                       up(&atm_dev_mutex);
-                       error = ((copy_to_user(buf, tmp_buf, size)) ||
+                       mutex_unlock(&atm_dev_mutex);
+                       error = ((copy_to_user(buf, tmp_buf, size)) ||
                                        put_user(size, &iobuf->length))
                                                ? -EFAULT : 0;
                        kfree(tmp_buf);
@@ -233,7 +247,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
        if (!(dev = try_then_request_module(atm_dev_lookup(number),
                                            "atm-device-%d", number)))
                return -ENODEV;
-       
+
        switch (cmd) {
                case ATM_GETTYPE:
                        size = strlen(dev->type) + 1;
@@ -376,7 +390,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg)
                                goto done;
                        }
        }
-       
+
        if (size)
                error = put_user(size, &sioc->length)
                        ? -EFAULT : 0;
@@ -400,19 +414,20 @@ static __inline__ void *dev_get_idx(loff_t left)
 
 void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos)
 {
-       down(&atm_dev_mutex);
-       return *pos ? dev_get_idx(*pos) : (void *) 1;
+       mutex_lock(&atm_dev_mutex);
+       return *pos ? dev_get_idx(*pos) : SEQ_START_TOKEN;
 }
 
 void atm_dev_seq_stop(struct seq_file *seq, void *v)
 {
-       up(&atm_dev_mutex);
+       mutex_unlock(&atm_dev_mutex);
 }
- 
+
 void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
        ++*pos;
-       v = (v == (void *)1) ? atm_devs.next : ((struct list_head *)v)->next;
+       v = (v == SEQ_START_TOKEN)
+               ? atm_devs.next : ((struct list_head *)v)->next;
        return (v == &atm_devs) ? NULL : v;
 }