i7core_edac: Improve debug to seek for register/remove errors

[pandora-kernel.git] / drivers / edac / i7core_edac.c

diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index 5d15daa..a05f166 100644 (file)
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -666,11 +666,7 @@ static int get_dimm_config(const struct mem_ctl_info *mci, int *csrow)
                                RANKOFFSET(dimm_dod[j]),
                                banks, ranks, rows, cols);
 
-#if PAGE_SHIFT > 20
-                       npages = size >> (PAGE_SHIFT - 20);
-#else
-                       npages = size << (20 - PAGE_SHIFT);
-#endif
+                       npages = MiB_TO_PAGES(size);
 
                        csr = &mci->csrows[*csrow];
                        csr->first_page = last_page + 1;
@@ -1893,7 +1889,8 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev,
        if (unlikely(!mci))
                return -ENOMEM;
 
-       debugf0("MC: " __FILE__ ": %s(): mci = %p\n", __func__, mci);
+       debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n",
+               __func__, mci, &i7core_dev->pdev[0]->dev);
 
        /* record ptr to the generic device */
        mci->dev = &i7core_dev->pdev[0]->dev;
@@ -2061,12 +2058,18 @@ static void __devexit i7core_remove(struct pci_dev *pdev)
        list_for_each_entry_safe(i7core_dev, tmp, &i7core_edac_list, list) {
                mci = find_mci_by_dev(&i7core_dev->pdev[0]->dev);
                if (unlikely(!mci || !mci->pvt_info)) {
-                       i7core_printk(KERN_ERR,
+                       debugf0("MC: " __FILE__ ": %s(): dev = %p\n",
+                               __func__, &i7core_dev->pdev[0]->dev);
+
+                               i7core_printk(KERN_ERR,
                                      "Couldn't find mci hanler\n");
                } else {
                        pvt = mci->pvt_info;
                        i7core_dev = pvt->i7core_dev;
 
+                       debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n",
+                               __func__, mci, &i7core_dev->pdev[0]->dev);
+
                        if (likely(pvt->i7core_pci))
                                edac_pci_release_generic_ctl(pvt->i7core_pci);
                        else