drivers/edac: add dev_name getter function

[~andy/linux] / drivers / edac / edac_mc.c

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 1f22d8cad6f78ab4f0a3cd49069b070ab4502e33..d324e1eadd3c06b83acd8d4a4f1a66e0f4d033ee 100644 (file)
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -27,15 +27,16 @@
 #include <linux/list.h>
 #include <linux/sysdev.h>
 #include <linux/ctype.h>
+#include <linux/edac.h>
 #include <asm/uaccess.h>
 #include <asm/page.h>
 #include <asm/edac.h>
-#include "edac_mc.h"
+#include "edac_core.h"
 #include "edac_module.h"
 
 
 /* lock to memory controller's control array */
-static DECLARE_MUTEX(mem_ctls_mutex);
+static DEFINE_MUTEX(mem_ctls_mutex);
 static struct list_head mc_devices = LIST_HEAD_INIT(mc_devices);
 
 #ifdef CONFIG_EDAC_DEBUG
@@ -241,12 +242,13 @@ static int add_mc_to_global_list (struct mem_ctl_info *mci)
        }
 
        list_add_tail_rcu(&mci->link, insert_before);
+       atomic_inc(&edac_handlers);
        return 0;
 
 fail0:
        edac_printk(KERN_WARNING, EDAC_MC,
                    "%s (%s) %s %s already assigned %d\n", p->dev->bus_id,
-                   dev_name(p->dev), p->mod_name, p->ctl_name, p->mc_idx);
+                   dev_name(mci), p->mod_name, p->ctl_name, p->mc_idx);
        return 1;
 
 fail1:
@@ -267,6 +269,7 @@ static void complete_mc_list_del(struct rcu_head *head)
 
 static void del_mc_from_global_list(struct mem_ctl_info *mci)
 {
+       atomic_dec(&edac_handlers);
        list_del_rcu(&mci->link);
        init_completion(&mci->complete);
        call_rcu(&mci->rcu, complete_mc_list_del);
@@ -334,7 +337,7 @@ int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx)
                }
        }
 #endif
-       down(&mem_ctls_mutex);
+       mutex_lock(&mem_ctls_mutex);
 
        if (add_mc_to_global_list(mci))
                goto fail0;
@@ -350,16 +353,16 @@ int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx)
 
        /* Report action taken */
        edac_mc_printk(mci, KERN_INFO, "Giving out device to %s %s: DEV %s\n",
-               mci->mod_name, mci->ctl_name, dev_name(mci->dev));
+               mci->mod_name, mci->ctl_name, dev_name(mci));
 
-       up(&mem_ctls_mutex);
+       mutex_unlock(&mem_ctls_mutex);
        return 0;
 
 fail1:
        del_mc_from_global_list(mci);
 
 fail0:
-       up(&mem_ctls_mutex);
+       mutex_unlock(&mem_ctls_mutex);
        return 1;
 }
 EXPORT_SYMBOL_GPL(edac_mc_add_mc);
@@ -376,19 +379,19 @@ struct mem_ctl_info * edac_mc_del_mc(struct device *dev)
        struct mem_ctl_info *mci;
 
        debugf0("MC: %s()\n", __func__);
-       down(&mem_ctls_mutex);
+       mutex_lock(&mem_ctls_mutex);
 
        if ((mci = find_mci_by_dev(dev)) == NULL) {
-               up(&mem_ctls_mutex);
+               mutex_unlock(&mem_ctls_mutex);
                return NULL;
        }
 
        edac_remove_sysfs_mci_device(mci);
        del_mc_from_global_list(mci);
-       up(&mem_ctls_mutex);
+       mutex_unlock(&mem_ctls_mutex);
        edac_printk(KERN_INFO, EDAC_MC,
                "Removed device %d for %s %s: DEV %s\n", mci->mc_idx,
-               mci->mod_name, mci->ctl_name, dev_name(mci->dev));
+               mci->mod_name, mci->ctl_name, dev_name(mci));
        return mci;
 }
 EXPORT_SYMBOL_GPL(edac_mc_del_mc);
@@ -722,7 +725,7 @@ void edac_check_mc_devices(void)
        struct mem_ctl_info *mci;
 
        debugf3("%s()\n", __func__);
-       down(&mem_ctls_mutex);
+       mutex_lock(&mem_ctls_mutex);
 
        list_for_each(item, &mc_devices) {
                mci = list_entry(item, struct mem_ctl_info, link);
@@ -731,5 +734,5 @@ void edac_check_mc_devices(void)
                        mci->edac_check(mci);
        }
 
-       up(&mem_ctls_mutex);
+       mutex_unlock(&mem_ctls_mutex);
 }