hvc_console: Remove __devexit annotation of hvc_remove()

[linux-2.6-omap-h63xx.git] / drivers / edac / i82875p_edac.c

diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index 089ec397ca6a610751a1c70b01efaa708dfc7f74..e43bdc43a1bf09732a7f9037b76852968c24c4f5 100644 (file)
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -18,6 +18,7 @@
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <linux/slab.h>
+#include <linux/edac.h>
 #include "edac_core.h"
 
 #define I82875P_REVISION       " Ver: 2.0.2 " __DATE__
@@ -177,7 +178,7 @@ static const struct i82875p_dev_info i82875p_devs[] = {
                .ctl_name = "i82875p"},
 };
 
-static struct pci_dev *mci_pdev = NULL;        /* init dev: in case that AGP code has
+static struct pci_dev *mci_pdev;       /* init dev: in case that AGP code has
                                         * already registered driver
                                         */
 
@@ -270,6 +271,7 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
 {
        struct pci_dev *dev;
        void __iomem *window;
+       int err;
 
        *ovrfl_pdev = NULL;
        *ovrfl_window = NULL;
@@ -287,7 +289,12 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
                if (dev == NULL)
                        return 1;
 
-               pci_bus_add_device(dev);
+               err = pci_bus_add_device(dev);
+               if (err) {
+                       i82875p_printk(KERN_ERR,
+                               "%s(): pci_bus_add_device() Failed\n",
+                               __func__);
+               }
        }
 
        *ovrfl_pdev = dev;
@@ -387,6 +394,7 @@ 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 (i82875p_setup_overfl_dev(pdev, &ovrfl_pdev, &ovrfl_window))
@@ -394,7 +402,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
        drc = readl(ovrfl_window + I82875P_DRC);
        nr_chans = dual_channel_active(drc) + 1;
        mci = edac_mc_alloc(sizeof(*pvt), I82875P_NR_CSROWS(nr_chans),
-                       nr_chans);
+                       nr_chans, 0);
 
        if (!mci) {
                rc = -ENOMEM;
@@ -422,7 +430,7 @@ static int i82875p_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 fail1;
        }
@@ -526,6 +534,10 @@ static int __init i82875p_init(void)
        int pci_rc;
 
        debugf3("%s()\n", __func__);
+
+       /* Ensure that the OPSTATE is set correctly for POLL or NMI */
+       opstate_init();
+
        pci_rc = pci_register_driver(&i82875p_driver);
 
        if (pci_rc < 0)
@@ -580,3 +592,6 @@ 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");
+
+module_param(edac_op_state, int, 0444);
+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");