1 files changed, 24 insertions, 25 deletions

diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
index 97f5064e3992..e164c555a337 100644
--- a/drivers/edac/edac_pci_sysfs.c
+++ b/drivers/edac/edac_pci_sysfs.c
@@ -78,7 +78,7 @@ static void edac_pci_instance_release(struct kobject *kobj)
 {
         struct edac_pci_ctl_info *pci;
 
-        debugf0("%s()\n", __func__);
+        edac_dbg(0, "\n");
 
         /* Form pointer to containing struct, the pci control struct */
         pci = to_instance(kobj);
@@ -161,7 +161,7 @@ static int edac_pci_create_instance_kobj(struct edac_pci_ctl_info *pci, int idx)
         struct kobject *main_kobj;
         int err;
 
-        debugf0("%s()\n", __func__);
+        edac_dbg(0, "\n");
 
         /* First bump the ref count on the top main kobj, which will
          * track the number of PCI instances we have, and thus nest
@@ -177,14 +177,13 @@ static int edac_pci_create_instance_kobj(struct edac_pci_ctl_info *pci, int idx)
         err = kobject_init_and_add(&pci->kobj, &ktype_pci_instance,
                                    edac_pci_top_main_kobj, "pci%d", idx);
         if (err != 0) {
-                debugf2("%s() failed to register instance pci%d\n",
-                        __func__, idx);
+                edac_dbg(2, "failed to register instance pci%d\n", idx);
                 kobject_put(edac_pci_top_main_kobj);
                 goto error_out;
         }
 
         kobject_uevent(&pci->kobj, KOBJ_ADD);
-        debugf1("%s() Register instance 'pci%d' kobject\n", __func__, idx);
+        edac_dbg(1, "Register instance 'pci%d' kobject\n", idx);
 
         return 0;
 
@@ -201,7 +200,7 @@ error_out:
 static void edac_pci_unregister_sysfs_instance_kobj(
                         struct edac_pci_ctl_info *pci)
 {
-        debugf0("%s()\n", __func__);
+        edac_dbg(0, "\n");
 
         /* Unregister the instance kobject and allow its release
          * function release the main reference count and then
@@ -317,7 +316,7 @@ static struct edac_pci_dev_attribute *edac_pci_attr[] = {
  */
 static void edac_pci_release_main_kobj(struct kobject *kobj)
 {
-        debugf0("%s() here to module_put(THIS_MODULE)\n", __func__);
+        edac_dbg(0, "here to module_put(THIS_MODULE)\n");
 
         kfree(kobj);
 
@@ -345,7 +344,7 @@ static int edac_pci_main_kobj_setup(void)
         int err;
         struct bus_type *edac_subsys;
 
-        debugf0("%s()\n", __func__);
+        edac_dbg(0, "\n");
 
         /* check and count if we have already created the main kobject */
         if (atomic_inc_return(&edac_pci_sysfs_refcount) != 1)
@@ -356,7 +355,7 @@ static int edac_pci_main_kobj_setup(void)
          */
         edac_subsys = edac_get_sysfs_subsys();
         if (edac_subsys == NULL) {
-                debugf1("%s() no edac_subsys\n", __func__);
+                edac_dbg(1, "no edac_subsys\n");
                 err = -ENODEV;
                 goto decrement_count_fail;
         }
@@ -366,14 +365,14 @@ static int edac_pci_main_kobj_setup(void)
          * level main kobj for EDAC PCI
          */
         if (!try_module_get(THIS_MODULE)) {
-                debugf1("%s() try_module_get() failed\n", __func__);
+                edac_dbg(1, "try_module_get() failed\n");
                 err = -ENODEV;
                 goto mod_get_fail;
         }
 
         edac_pci_top_main_kobj = kzalloc(sizeof(struct kobject), GFP_KERNEL);
         if (!edac_pci_top_main_kobj) {
-                debugf1("Failed to allocate\n");
+                edac_dbg(1, "Failed to allocate\n");
                 err = -ENOMEM;
                 goto kzalloc_fail;
         }
@@ -383,7 +382,7 @@ static int edac_pci_main_kobj_setup(void)
                                    &ktype_edac_pci_main_kobj,
                                    &edac_subsys->dev_root->kobj, "pci");
         if (err) {
-                debugf1("Failed to register '.../edac/pci'\n");
+                edac_dbg(1, "Failed to register '.../edac/pci'\n");
                 goto kobject_init_and_add_fail;
         }
 
@@ -392,7 +391,7 @@ static int edac_pci_main_kobj_setup(void)
          * must be used, for resources to be cleaned up properly
          */
         kobject_uevent(edac_pci_top_main_kobj, KOBJ_ADD);
-        debugf1("Registered '.../edac/pci' kobject\n");
+        edac_dbg(1, "Registered '.../edac/pci' kobject\n");
 
         return 0;
 
@@ -421,15 +420,14 @@ decrement_count_fail:
  */
 static void edac_pci_main_kobj_teardown(void)
 {
-        debugf0("%s()\n", __func__);
+        edac_dbg(0, "\n");
 
         /* Decrement the count and only if no more controller instances
          * are connected perform the unregisteration of the top level
          * main kobj
          */
         if (atomic_dec_return(&edac_pci_sysfs_refcount) == 0) {
-                debugf0("%s() called kobject_put on main kobj\n",
-                        __func__);
+                edac_dbg(0, "called kobject_put on main kobj\n");
                 kobject_put(edac_pci_top_main_kobj);
         }
         edac_put_sysfs_subsys();
@@ -446,7 +444,7 @@ int edac_pci_create_sysfs(struct edac_pci_ctl_info *pci)
         int err;
         struct kobject *edac_kobj = &pci->kobj;
 
-        debugf0("%s() idx=%d\n", __func__, pci->pci_idx);
+        edac_dbg(0, "idx=%d\n", pci->pci_idx);
 
         /* create the top main EDAC PCI kobject, IF needed */
         err = edac_pci_main_kobj_setup();
@@ -460,8 +458,7 @@ int edac_pci_create_sysfs(struct edac_pci_ctl_info *pci)
 
         err = sysfs_create_link(edac_kobj, &pci->dev->kobj, EDAC_PCI_SYMLINK);
         if (err) {
-                debugf0("%s() sysfs_create_link() returned err= %d\n",
-                        __func__, err);
+                edac_dbg(0, "sysfs_create_link() returned err= %d\n", err);
                 goto symlink_fail;
         }
 
@@ -484,7 +481,7 @@ unregister_cleanup:
  */
 void edac_pci_remove_sysfs(struct edac_pci_ctl_info *pci)
 {
-        debugf0("%s() index=%d\n", __func__, pci->pci_idx);
+        edac_dbg(0, "index=%d\n", pci->pci_idx);
 
         /* Remove the symlink */
         sysfs_remove_link(&pci->kobj, EDAC_PCI_SYMLINK);
@@ -496,7 +493,7 @@ void edac_pci_remove_sysfs(struct edac_pci_ctl_info *pci)
          * if this 'pci' is the last instance.
          * If it is, the main kobject will be unregistered as a result
          */
-        debugf0("%s() calling edac_pci_main_kobj_teardown()\n", __func__);
+        edac_dbg(0, "calling edac_pci_main_kobj_teardown()\n");
         edac_pci_main_kobj_teardown();
 }
 
@@ -572,7 +569,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
 
         local_irq_restore(flags);
 
-        debugf4("PCI STATUS= 0x%04x %s\n", status, dev_name(&dev->dev));
+        edac_dbg(4, "PCI STATUS= 0x%04x %s\n", status, dev_name(&dev->dev));
 
         /* check the status reg for errors on boards NOT marked as broken
          * if broken, we cannot trust any of the status bits
@@ -603,13 +600,15 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
         }
 
 
-        debugf4("PCI HEADER TYPE= 0x%02x %s\n", header_type, dev_name(&dev->dev));
+        edac_dbg(4, "PCI HEADER TYPE= 0x%02x %s\n",
+                 header_type, dev_name(&dev->dev));
 
         if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) {
                 /* On bridges, need to examine secondary status register  */
                 status = get_pci_parity_status(dev, 1);
 
-                debugf4("PCI SEC_STATUS= 0x%04x %s\n", status, dev_name(&dev->dev));
+                edac_dbg(4, "PCI SEC_STATUS= 0x%04x %s\n",
+                         status, dev_name(&dev->dev));
 
                 /* check the secondary status reg for errors,
                  * on NOT broken boards
@@ -671,7 +670,7 @@ void edac_pci_do_parity_check(void)
 {
         int before_count;
 
-        debugf3("%s()\n", __func__);
+        edac_dbg(3, "\n");
 
         /* if policy has PCI check off, leave now */
         if (!check_pci_errors)