1 files changed, 51 insertions, 61 deletions

diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index aad1900a4689..0aec92698f17 100644
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -13,26 +13,19 @@
  * Note: E7210 appears same as D82875P - zhenyu.z.wang at intel.com
  */
 
-
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
-
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
-
 #include <linux/slab.h>
-
 #include "edac_mc.h"
 
-
 #define i82875p_printk(level, fmt, arg...) \
-    edac_printk(level, "i82875p", fmt, ##arg)
-
+        edac_printk(level, "i82875p", fmt, ##arg)
 
 #define i82875p_mc_printk(mci, level, fmt, arg...) \
-    edac_mc_chipset_printk(mci, level, "i82875p", fmt, ##arg)
-
+        edac_mc_chipset_printk(mci, level, "i82875p", fmt, ##arg)
 
 #ifndef PCI_DEVICE_ID_INTEL_82875_0
 #define PCI_DEVICE_ID_INTEL_82875_0     0x2578
@@ -42,11 +35,9 @@
 #define PCI_DEVICE_ID_INTEL_82875_6     0x257e
 #endif                          /* PCI_DEVICE_ID_INTEL_82875_6 */
 
-
 /* four csrows in dual channel, eight in single channel */
 #define I82875P_NR_CSROWS(nr_chans) (8/(nr_chans))
 
-
 /* Intel 82875p register addresses - device 0 function 0 - DRAM Controller */
 #define I82875P_EAP             0x58    /* Error Address Pointer (32b)
                                          *
@@ -95,7 +86,6 @@
                                          *  0    reserved
                                          */
 
-
 /* Intel 82875p register addresses - device 6 function 0 - DRAM Controller */
 #define I82875P_PCICMD6         0x04    /* PCI Command Register (16b)
                                          *
@@ -159,23 +149,19 @@
                                          *  1:0  DRAM type 01=DDR
                                          */
 
-
 enum i82875p_chips {
         I82875P = 0,
 };
 
-
 struct i82875p_pvt {
         struct pci_dev *ovrfl_pdev;
         void __iomem *ovrfl_window;
 };
 
-
 struct i82875p_dev_info {
         const char *ctl_name;
 };
 
-
 struct i82875p_error_info {
         u16 errsts;
         u32 eap;
@@ -184,17 +170,19 @@ struct i82875p_error_info {
         u16 errsts2;
 };
 
-
 static const struct i82875p_dev_info i82875p_devs[] = {
         [I82875P] = {
-                     .ctl_name = "i82875p"},
+                .ctl_name = "i82875p"
+        },
 };
 
-static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code
-                                           has already registered driver */
+static struct pci_dev *mci_pdev = NULL; /* init dev: in case that AGP code has
+                                         * already registered driver
+                                         */
+
 static int i82875p_registered = 1;
 
-static void i82875p_get_error_info (struct mem_ctl_info *mci,
+static void i82875p_get_error_info(struct mem_ctl_info *mci,
                 struct i82875p_error_info *info)
 {
         /*
@@ -218,15 +206,16 @@ static void i82875p_get_error_info (struct mem_ctl_info *mci,
          */
         if (!(info->errsts2 & 0x0081))
                 return;
+
         if ((info->errsts ^ info->errsts2) & 0x0081) {
                 pci_read_config_dword(mci->pdev, I82875P_EAP, &info->eap);
                 pci_read_config_byte(mci->pdev, I82875P_DES, &info->des);
                 pci_read_config_byte(mci->pdev, I82875P_DERRSYN,
-                    &info->derrsyn);
+                                &info->derrsyn);
         }
 }
 
-static int i82875p_process_error_info (struct mem_ctl_info *mci,
+static int i82875p_process_error_info(struct mem_ctl_info *mci,
                 struct i82875p_error_info *info, int handle_errors)
 {
         int row, multi_chan;
@@ -251,13 +240,12 @@ static int i82875p_process_error_info (struct mem_ctl_info *mci,
                 edac_mc_handle_ue(mci, info->eap, 0, row, "i82875p UE");
         else
                 edac_mc_handle_ce(mci, info->eap, 0, info->derrsyn, row,
-                                       multi_chan ? (info->des & 0x1) : 0,
-                                       "i82875p CE");
+                                multi_chan ? (info->des & 0x1) : 0,
+                                "i82875p CE");
 
         return 1;
 }
 
-
 static void i82875p_check(struct mem_ctl_info *mci)
 {
         struct i82875p_error_info info;
@@ -267,7 +255,6 @@ static void i82875p_check(struct mem_ctl_info *mci)
         i82875p_process_error_info(mci, &info, 1);
 }
 
-
 #ifdef CONFIG_PROC_FS
 extern int pci_proc_attach_device(struct pci_dev *);
 #endif
@@ -281,7 +268,6 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
         unsigned long last_cumul_size;
         struct pci_dev *ovrfl_pdev;
         void __iomem *ovrfl_window = NULL;
-
         u32 drc;
         u32 drc_chan;           /* Number of channels 0=1chan,1=2chan */
         u32 nr_chans;
@@ -289,7 +275,6 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
         struct i82875p_error_info discard;
 
         debugf0("%s()\n", __func__);
-
         ovrfl_pdev = pci_get_device(PCI_VEND_DEV(INTEL, 82875_6), NULL);
 
         if (!ovrfl_pdev) {
@@ -301,22 +286,23 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
                  */
                 pci_write_bits8(pdev, 0xf4, 0x2, 0x2);
                 ovrfl_pdev =
-                    pci_scan_single_device(pdev->bus, PCI_DEVFN(6, 0));
+                        pci_scan_single_device(pdev->bus, PCI_DEVFN(6, 0));
+
                 if (!ovrfl_pdev)
                         return -ENODEV;
         }
+
 #ifdef CONFIG_PROC_FS
         if (!ovrfl_pdev->procent && pci_proc_attach_device(ovrfl_pdev)) {
                 i82875p_printk(KERN_ERR,
-                               "%s(): Failed to attach overflow device\n",
-                               __func__);
+                        "%s(): Failed to attach overflow device\n", __func__);
                 return -ENODEV;
         }
-#endif                          /* CONFIG_PROC_FS */
+#endif
+                                /* CONFIG_PROC_FS */
         if (pci_enable_device(ovrfl_pdev)) {
                 i82875p_printk(KERN_ERR,
-                               "%s(): Failed to enable overflow device\n",
-                               __func__);
+                        "%s(): Failed to enable overflow device\n", __func__);
                 return -ENODEV;
         }
 
@@ -325,13 +311,14 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
                 goto fail0;
 #endif
         }
+
         /* cache is irrelevant for PCI bus reads/writes */
         ovrfl_window = ioremap_nocache(pci_resource_start(ovrfl_pdev, 0),
-                                       pci_resource_len(ovrfl_pdev, 0));
+                                pci_resource_len(ovrfl_pdev, 0));
 
         if (!ovrfl_window) {
                 i82875p_printk(KERN_ERR, "%s(): Failed to ioremap bar6\n",
-                               __func__);
+                        __func__);
                 goto fail1;
         }
 
@@ -339,10 +326,10 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
         drc = readl(ovrfl_window + I82875P_DRC);
         drc_chan = ((drc >> 21) & 0x1);
         nr_chans = drc_chan + 1;
-        drc_ddim = (drc >> 18) & 0x1;
 
+        drc_ddim = (drc >> 18) & 0x1;
         mci = edac_mc_alloc(sizeof(*pvt), I82875P_NR_CSROWS(nr_chans),
-                                 nr_chans);
+                                nr_chans);
 
         if (!mci) {
                 rc = -ENOMEM;
@@ -350,10 +337,8 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
         }
 
         debugf3("%s(): init mci\n", __func__);
-
         mci->pdev = pdev;
         mci->mtype_cap = MEM_FLAG_DDR;
-
         mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
         mci->edac_cap = EDAC_FLAG_UNKNOWN;
         /* adjust FLAGS */
@@ -363,9 +348,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
         mci->ctl_name = i82875p_devs[dev_idx].ctl_name;
         mci->edac_check = i82875p_check;
         mci->ctl_page_to_phys = NULL;
-
         debugf3("%s(): init pvt\n", __func__);
-
         pvt = (struct i82875p_pvt *) mci->pvt_info;
         pvt->ovrfl_pdev = ovrfl_pdev;
         pvt->ovrfl_window = ovrfl_window;
@@ -385,6 +368,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
                 cumul_size = value << (I82875P_DRB_SHIFT - PAGE_SHIFT);
                 debugf3("%s(): (%d) cumul_size 0x%x\n", __func__, index,
                         cumul_size);
+
                 if (cumul_size == last_cumul_size)
                         continue;       /* not populated */
 
@@ -392,7 +376,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
                 csrow->last_page = cumul_size - 1;
                 csrow->nr_pages = cumul_size - last_cumul_size;
                 last_cumul_size = cumul_size;
-                csrow->grain = 1 << 12; /* I82875P_EAP has 4KiB reolution */
+                csrow->grain = 1 << 12;  /* I82875P_EAP has 4KiB reolution */
                 csrow->mtype = MEM_DDR;
                 csrow->dtype = DEV_UNKNOWN;
                 csrow->edac_mode = drc_ddim ? EDAC_SECDED : EDAC_NONE;
@@ -426,25 +410,26 @@ fail0:
         return rc;
 }
 
-
 /* returns count (>= 0), or negative on error */
 static int __devinit i82875p_init_one(struct pci_dev *pdev,
-                                      const struct pci_device_id *ent)
+                const struct pci_device_id *ent)
 {
         int rc;
 
         debugf0("%s()\n", __func__);
-
         i82875p_printk(KERN_INFO, "i82875p init one\n");
-        if(pci_enable_device(pdev) < 0)
+
+        if (pci_enable_device(pdev) < 0)
                 return -EIO;
+
         rc = i82875p_probe1(pdev, ent->driver_data);
+
         if (mci_pdev == NULL)
                 mci_pdev = pci_dev_get(pdev);
+
         return rc;
 }
 
-
 static void __devexit i82875p_remove_one(struct pci_dev *pdev)
 {
         struct mem_ctl_info *mci;
@@ -456,6 +441,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
                 return;
 
         pvt = (struct i82875p_pvt *) mci->pvt_info;
+
         if (pvt->ovrfl_window)
                 iounmap(pvt->ovrfl_window);
 
@@ -470,16 +456,18 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
         edac_mc_free(mci);
 }
 
-
 static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = {
-        {PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-         I82875P},
-        {0,}                    /* 0 terminated list. */
+        {
+                PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                I82875P
+        },
+        {
+                0,
+        }       /* 0 terminated list. */
 };
 
 MODULE_DEVICE_TABLE(pci, i82875p_pci_tbl);
 
-
 static struct pci_driver i82875p_driver = {
         .name = EDAC_MOD_STR,
         .probe = i82875p_init_one,
@@ -487,31 +475,35 @@ static struct pci_driver i82875p_driver = {
         .id_table = i82875p_pci_tbl,
 };
 
-
 static int __init i82875p_init(void)
 {
         int pci_rc;
 
         debugf3("%s()\n", __func__);
         pci_rc = pci_register_driver(&i82875p_driver);
+
         if (pci_rc < 0)
                 goto fail0;
+
         if (mci_pdev == NULL) {
-                mci_pdev =
-                    pci_get_device(PCI_VENDOR_ID_INTEL,
-                                   PCI_DEVICE_ID_INTEL_82875_0, NULL);
+                mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                PCI_DEVICE_ID_INTEL_82875_0, NULL);
+
                 if (!mci_pdev) {
                         debugf0("875p pci_get_device fail\n");
                         pci_rc = -ENODEV;
                         goto fail1;
                 }
+
                 pci_rc = i82875p_init_one(mci_pdev, i82875p_pci_tbl);
+
                 if (pci_rc < 0) {
                         debugf0("875p init fail\n");
                         pci_rc = -ENODEV;
                         goto fail1;
                 }
         }
+
         return 0;
 
 fail1:
@@ -524,23 +516,21 @@ fail0:
         return pci_rc;
 }
 
-
 static void __exit i82875p_exit(void)
 {
         debugf3("%s()\n", __func__);
 
         pci_unregister_driver(&i82875p_driver);
+
         if (!i82875p_registered) {
                 i82875p_remove_one(mci_pdev);
                 pci_dev_put(mci_pdev);
         }
 }
 
-
 module_init(i82875p_init);
 module_exit(i82875p_exit);
 
-
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Linux Networx (http://lnxi.com) Thayne Harbaugh");
 MODULE_DESCRIPTION("MC support for Intel 82875 memory hub controllers");