ext4: More buffer head reference leaks

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

diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
index 8097f2faaa8cb186bdb5cbaab4a09641408d261b..9900675e9598c25006dd696f6f4d20af3694a223 100644 (file)
--- a/drivers/edac/r82600_edac.c
+++ b/drivers/edac/r82600_edac.c
@@ -20,6 +20,7 @@
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <linux/slab.h>
+#include <linux/edac.h>
 #include "edac_core.h"
 
 #define R82600_REVISION        " Ver: 2.0.2 " __DATE__
@@ -131,12 +132,12 @@ struct r82600_error_info {
        u32 eapr;
 };
 
-static unsigned int disable_hardware_scrub = 0;
+static unsigned int disable_hardware_scrub;
 
 static struct edac_pci_ctl_info *r82600_pci;
 
 static void r82600_get_error_info(struct mem_ctl_info *mci,
-                                 struct r82600_error_info *info)
+                               struct r82600_error_info *info)
 {
        struct pci_dev *pdev;
 
@@ -157,8 +158,8 @@ static void r82600_get_error_info(struct mem_ctl_info *mci,
 }
 
 static int r82600_process_error_info(struct mem_ctl_info *mci,
-                                    struct r82600_error_info *info,
-                                    int handle_errors)
+                               struct r82600_error_info *info,
+                               int handle_errors)
 {
        int error_found;
        u32 eapaddr, page;
@@ -180,8 +181,9 @@ static int r82600_process_error_info(struct mem_ctl_info *mci,
 
                if (handle_errors)
                        edac_mc_handle_ce(mci, page, 0, /* not avail */
-                                         syndrome, edac_mc_find_csrow_by_page(mci, page), 0,   /* channel */
-                                         mci->ctl_name);
+                                       syndrome,
+                                       edac_mc_find_csrow_by_page(mci, page),
+                                       0, mci->ctl_name);
        }
 
        if (info->eapr & BIT(1)) {      /* UE? */
@@ -190,8 +192,8 @@ static int r82600_process_error_info(struct mem_ctl_info *mci,
                if (handle_errors)
                        /* 82600 doesn't give enough info */
                        edac_mc_handle_ue(mci, page, 0,
-                                         edac_mc_find_csrow_by_page(mci, page),
-                                         mci->ctl_name);
+                                       edac_mc_find_csrow_by_page(mci, page),
+                                       mci->ctl_name);
        }
 
        return error_found;
@@ -212,7 +214,7 @@ static inline int ecc_enabled(u8 dramcr)
 }
 
 static void r82600_init_csrows(struct mem_ctl_info *mci, struct pci_dev *pdev,
-                              u8 dramcr)
+                       u8 dramcr)
 {
        struct csrow_info *csrow;
        int index;
@@ -277,7 +279,7 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
        debugf2("%s(): sdram refresh rate = %#0x\n", __func__,
                sdram_refresh_rate);
        debugf2("%s(): DRAMC register = %#0x\n", __func__, dramcr);
-       mci = edac_mc_alloc(0, R82600_NR_CSROWS, R82600_NR_CHANS);
+       mci = edac_mc_alloc(0, R82600_NR_CSROWS, R82600_NR_CHANS, 0);
 
        if (mci == NULL)
                return -ENOMEM;
@@ -315,7 +317,7 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
        /* Here we assume that we will never see multiple instances of this
         * type of memory controller.  The ID is therefore hardcoded to 0.
         */
-       if (edac_mc_add_mc(mci, 0)) {
+       if (edac_mc_add_mc(mci)) {
                debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
                goto fail;
        }
@@ -342,14 +344,14 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
        debugf3("%s(): success\n", __func__);
        return 0;
 
-      fail:
+fail:
        edac_mc_free(mci);
        return -ENODEV;
 }
 
 /* returns count (>= 0), or negative on error */
 static int __devinit r82600_init_one(struct pci_dev *pdev,
-                                    const struct pci_device_id *ent)
+                               const struct pci_device_id *ent)
 {
        debugf0("%s()\n", __func__);
 
@@ -392,6 +394,9 @@ static struct pci_driver r82600_driver = {
 
 static int __init r82600_init(void)
 {
+       /* Ensure that the OPSTATE is set correctly for POLL or NMI */
+       opstate_init();
+
        return pci_register_driver(&r82600_driver);
 }
 
@@ -405,9 +410,12 @@ module_exit(r82600_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Tim Small <tim@buttersideup.com> - WPAD Ltd. "
-             "on behalf of EADS Astrium");
+               "on behalf of EADS Astrium");
 MODULE_DESCRIPTION("MC support for Radisys 82600 memory controllers");
 
 module_param(disable_hardware_scrub, bool, 0644);
 MODULE_PARM_DESC(disable_hardware_scrub,
                 "If set, disable the chipset's automatic scrub for CEs");
+
+module_param(edac_op_state, int, 0444);
+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");