[PATCH] EDAC: formatting cleanup

Cosmetic indentation/formatting cleanup for EDAC code.  Make sure we
are using tabs rather than spaces to indent, etc.

Signed-off-by: David S. Peterson <dsp@llnl.gov>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 36 insertions, 55 deletions

diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
index 87bd8b4d561f..53423ad6d4a3 100644
--- a/drivers/edac/amd76x_edac.c
+++ b/drivers/edac/amd76x_edac.c
@@ -12,33 +12,26 @@
  *
  */
 
-
 #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 amd76x_printk(level, fmt, arg...) \
-    edac_printk(level, "amd76x", fmt, ##arg)
-
+        edac_printk(level, "amd76x", fmt, ##arg)
 
 #define amd76x_mc_printk(mci, level, fmt, arg...) \
-    edac_mc_chipset_printk(mci, level, "amd76x", fmt, ##arg)
-
+        edac_mc_chipset_printk(mci, level, "amd76x", fmt, ##arg)
 
 #define AMD76X_NR_CSROWS 8
 #define AMD76X_NR_CHANS  1
 #define AMD76X_NR_DIMMS  4
 
-
 /* AMD 76x register addresses - device 0 function 0 - PCI bridge */
+
 #define AMD76X_ECC_MODE_STATUS  0x48    /* Mode and status of ECC (32b)
                                          *
                                          * 31:16 reserved
@@ -50,6 +43,7 @@
                                          *  7:4  UE cs row
                                          *  3:0  CE cs row
                                          */
+
 #define AMD76X_DRAM_MODE_STATUS 0x58    /* DRAM Mode and status (32b)
                                          *
                                          * 31:26 clock disable 5 - 0
@@ -64,6 +58,7 @@
                                          * 15:8  reserved
                                          *  7:0  x4 mode enable 7 - 0
                                          */
+
 #define AMD76X_MEM_BASE_ADDR    0xC0    /* Memory base address (8 x 32b)
                                          *
                                          * 31:23 chip-select base
@@ -74,29 +69,28 @@
                                          *  0    chip-select enable
                                          */
 
-
 struct amd76x_error_info {
         u32 ecc_mode_status;
 };
 
-
 enum amd76x_chips {
         AMD761 = 0,
         AMD762
 };
 
-
 struct amd76x_dev_info {
         const char *ctl_name;
 };
 
-
 static const struct amd76x_dev_info amd76x_devs[] = {
-        [AMD761] = {.ctl_name = "AMD761"},
-        [AMD762] = {.ctl_name = "AMD762"},
+        [AMD761] = {
+                .ctl_name = "AMD761"
+        },
+        [AMD762] = {
+                .ctl_name = "AMD762"
+        },
 };
 
-
 /**
  *      amd76x_get_error_info   -       fetch error information
  *      @mci: Memory controller
@@ -105,23 +99,21 @@ static const struct amd76x_dev_info amd76x_devs[] = {
  *      Fetch and store the AMD76x ECC status. Clear pending status
  *      on the chip so that further errors will be reported
  */
-
-static void amd76x_get_error_info (struct mem_ctl_info *mci,
-                                   struct amd76x_error_info *info)
+static void amd76x_get_error_info(struct mem_ctl_info *mci,
+                struct amd76x_error_info *info)
 {
         pci_read_config_dword(mci->pdev, AMD76X_ECC_MODE_STATUS,
                                 &info->ecc_mode_status);
 
         if (info->ecc_mode_status & BIT(8))
                 pci_write_bits32(mci->pdev, AMD76X_ECC_MODE_STATUS,
-                                   (u32) BIT(8), (u32) BIT(8));
+                                (u32) BIT(8), (u32) BIT(8));
 
         if (info->ecc_mode_status & BIT(9))
                 pci_write_bits32(mci->pdev, AMD76X_ECC_MODE_STATUS,
-                                   (u32) BIT(9), (u32) BIT(9));
+                                (u32) BIT(9), (u32) BIT(9));
 }
 
-
 /**
  *      amd76x_process_error_info       -       Error check
  *      @mci: Memory controller
@@ -132,8 +124,7 @@ static void amd76x_get_error_info (struct mem_ctl_info *mci,
  *      A return of 1 indicates an error. Also if handle_errors is true
  *      then attempt to handle and clean up after the error
  */
-
-static int amd76x_process_error_info (struct mem_ctl_info *mci,
+static int amd76x_process_error_info(struct mem_ctl_info *mci,
                 struct amd76x_error_info *info, int handle_errors)
 {
         int error_found;
@@ -149,9 +140,8 @@ static int amd76x_process_error_info (struct mem_ctl_info *mci,
 
                 if (handle_errors) {
                         row = (info->ecc_mode_status >> 4) & 0xf;
-                        edac_mc_handle_ue(mci,
-                            mci->csrows[row].first_page, 0, row,
-                            mci->ctl_name);
+                        edac_mc_handle_ue(mci, mci->csrows[row].first_page, 0,
+                                row, mci->ctl_name);
                 }
         }
 
@@ -163,11 +153,11 @@ static int amd76x_process_error_info (struct mem_ctl_info *mci,
 
                 if (handle_errors) {
                         row = info->ecc_mode_status & 0xf;
-                        edac_mc_handle_ce(mci,
-                            mci->csrows[row].first_page, 0, 0, row, 0,
-                            mci->ctl_name);
+                        edac_mc_handle_ce(mci, mci->csrows[row].first_page, 0,
+                                0, row, 0, mci->ctl_name);
                 }
         }
+
         return error_found;
 }
 
@@ -178,7 +168,6 @@ static int amd76x_process_error_info (struct mem_ctl_info *mci,
  *      Called by the poll handlers this function reads the status
  *      from the controller and checks for errors.
  */
-
 static void amd76x_check(struct mem_ctl_info *mci)
 {
         struct amd76x_error_info info;
@@ -187,7 +176,6 @@ static void amd76x_check(struct mem_ctl_info *mci)
         amd76x_process_error_info(mci, &info, 1);
 }
 
-
 /**
  *      amd76x_probe1   -       Perform set up for detected device
  *      @pdev; PCI device detected
@@ -197,7 +185,6 @@ static void amd76x_check(struct mem_ctl_info *mci)
  *      controller status reporting. We configure and set up the
  *      memory controller reporting and claim the device.
  */
-
 static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
 {
         int rc = -ENODEV;
@@ -214,10 +201,8 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
         struct amd76x_error_info discard;
 
         debugf0("%s()\n", __func__);
-
         pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS, &ems);
         ems_mode = (ems >> 10) & 0x3;
-
         mci = edac_mc_alloc(0, AMD76X_NR_CSROWS, AMD76X_NR_CHANS);
 
         if (mci == NULL) {
@@ -226,14 +211,11 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
         }
 
         debugf0("%s(): mci = %p\n", __func__, mci);
-
         mci->pdev = pdev;
         mci->mtype_cap = MEM_FLAG_RDDR;
-
         mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
         mci->edac_cap = ems_mode ?
-            (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
-
+                        (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
         mci->mod_name = EDAC_MOD_STR;
         mci->mod_ver = "$Revision: 1.4.2.5 $";
         mci->ctl_name = amd76x_devs[dev_idx].ctl_name;
@@ -249,18 +231,15 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
 
                 /* find the DRAM Chip Select Base address and mask */
                 pci_read_config_dword(mci->pdev,
-                                      AMD76X_MEM_BASE_ADDR + (index * 4),
-                                      &mba);
+                                AMD76X_MEM_BASE_ADDR + (index * 4), &mba);
 
                 if (!(mba & BIT(0)))
                         continue;
 
                 mba_base = mba & 0xff800000UL;
                 mba_mask = ((mba & 0xff80) << 16) | 0x7fffffUL;
-
                 pci_read_config_dword(mci->pdev, AMD76X_DRAM_MODE_STATUS,
-                                      &dms);
-
+                                &dms);
                 csrow->first_page = mba_base >> PAGE_SHIFT;
                 csrow->nr_pages = (mba_mask + 1) >> PAGE_SHIFT;
                 csrow->last_page = csrow->first_page + csrow->nr_pages - 1;
@@ -290,7 +269,7 @@ fail:
 
 /* returns count (>= 0), or negative on error */
 static int __devinit amd76x_init_one(struct pci_dev *pdev,
-                                     const struct pci_device_id *ent)
+                const struct pci_device_id *ent)
 {
         debugf0("%s()\n", __func__);
 
@@ -298,7 +277,6 @@ static int __devinit amd76x_init_one(struct pci_dev *pdev,
         return amd76x_probe1(pdev, ent->driver_data);
 }
 
-
 /**
  *      amd76x_remove_one       -       driver shutdown
  *      @pdev: PCI device being handed back
@@ -307,7 +285,6 @@ static int __devinit amd76x_init_one(struct pci_dev *pdev,
  *      structure for the device then delete the mci and free the
  *      resources.
  */
-
 static void __devexit amd76x_remove_one(struct pci_dev *pdev)
 {
         struct mem_ctl_info *mci;
@@ -320,18 +297,22 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev)
         edac_mc_free(mci);
 }
 
-
 static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
-        {PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-         AMD762},
-        {PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-         AMD761},
-        {0,}                    /* 0 terminated list. */
+        {
+                PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                AMD762
+        },
+        {
+                PCI_VEND_DEV(AMD, FE_GATE_700E), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                AMD761
+        },
+        {
+                0,
+        }       /* 0 terminated list. */
 };
 
 MODULE_DEVICE_TABLE(pci, amd76x_pci_tbl);
 
-
 static struct pci_driver amd76x_driver = {
         .name = EDAC_MOD_STR,
         .probe = amd76x_init_one,