ipw2100: fix postfix decrement errors

[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 214112b5e52a4a40adf522ec7642dc6199571a31..031abadc439a37c407d213fd1091b8e9a03b745e 100644 (file)
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -174,10 +174,10 @@ struct i82875p_error_info {
 
 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
+static struct pci_dev *mci_pdev;       /* init dev: in case that AGP code has
                                         * already registered driver
                                         */
 
@@ -186,7 +186,7 @@ static int i82875p_registered = 1;
 static struct edac_pci_ctl_info *i82875p_pci;
 
 static void i82875p_get_error_info(struct mem_ctl_info *mci,
-                                  struct i82875p_error_info *info)
+                               struct i82875p_error_info *info)
 {
        struct pci_dev *pdev;
 
@@ -198,38 +198,39 @@ static void i82875p_get_error_info(struct mem_ctl_info *mci,
         * overwritten by UE.
         */
        pci_read_config_word(pdev, I82875P_ERRSTS, &info->errsts);
+
+       if (!(info->errsts & 0x0081))
+               return;
+
        pci_read_config_dword(pdev, I82875P_EAP, &info->eap);
        pci_read_config_byte(pdev, I82875P_DES, &info->des);
        pci_read_config_byte(pdev, I82875P_DERRSYN, &info->derrsyn);
        pci_read_config_word(pdev, I82875P_ERRSTS, &info->errsts2);
 
-       pci_write_bits16(pdev, I82875P_ERRSTS, 0x0081, 0x0081);
-
        /*
         * If the error is the same then we can for both reads then
         * the first set of reads is valid.  If there is a change then
         * there is a CE no info and the second set of reads is valid
         * and should be UE info.
         */
-       if (!(info->errsts2 & 0x0081))
-               return;
-
        if ((info->errsts ^ info->errsts2) & 0x0081) {
                pci_read_config_dword(pdev, I82875P_EAP, &info->eap);
                pci_read_config_byte(pdev, I82875P_DES, &info->des);
                pci_read_config_byte(pdev, I82875P_DERRSYN, &info->derrsyn);
        }
+
+       pci_write_bits16(pdev, I82875P_ERRSTS, 0x0081, 0x0081);
 }
 
 static int i82875p_process_error_info(struct mem_ctl_info *mci,
-                                     struct i82875p_error_info *info,
-                                     int handle_errors)
+                               struct i82875p_error_info *info,
+                               int handle_errors)
 {
        int row, multi_chan;
 
        multi_chan = mci->csrows[0].nr_channels - 1;
 
-       if (!(info->errsts2 & 0x0081))
+       if (!(info->errsts & 0x0081))
                return 0;
 
        if (!handle_errors)
@@ -247,8 +248,8 @@ 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;
 }
@@ -264,11 +265,12 @@ static void i82875p_check(struct mem_ctl_info *mci)
 
 /* Return 0 on success or 1 on failure. */
 static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
-                                   struct pci_dev **ovrfl_pdev,
-                                   void __iomem ** ovrfl_window)
+                               struct pci_dev **ovrfl_pdev,
+                               void __iomem **ovrfl_window)
 {
        struct pci_dev *dev;
        void __iomem *window;
+       int err;
 
        *ovrfl_pdev = NULL;
        *ovrfl_window = NULL;
@@ -286,14 +288,19 @@ 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;
 
        if (pci_enable_device(dev)) {
                i82875p_printk(KERN_ERR, "%s(): Failed to enable overflow "
-                              "device\n", __func__);
+                       "device\n", __func__);
                return 1;
        }
 
@@ -309,18 +316,18 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
 
        if (window == NULL) {
                i82875p_printk(KERN_ERR, "%s(): Failed to ioremap bar6\n",
-                              __func__);
+                       __func__);
                goto fail1;
        }
 
        *ovrfl_window = window;
        return 0;
 
-      fail1:
+fail1:
        pci_release_regions(dev);
 
 #ifdef CORRECT_BIOS
-      fail0:
+fail0:
        pci_disable_device(dev);
 #endif
        /* NOTE: the ovrfl proc entry and pci_dev are intentionally left */
@@ -393,7 +400,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;
@@ -421,7 +428,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;
        }
@@ -441,10 +448,10 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
        debugf3("%s(): success\n", __func__);
        return 0;
 
-      fail1:
+fail1:
        edac_mc_free(mci);
 
-      fail0:
+fail0:
        iounmap(ovrfl_window);
        pci_release_regions(ovrfl_pdev);
 
@@ -455,7 +462,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
 
 /* 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;
 
@@ -532,7 +539,7 @@ static int __init i82875p_init(void)
 
        if (mci_pdev == NULL) {
                mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
-                                         PCI_DEVICE_ID_INTEL_82875_0, NULL);
+                                       PCI_DEVICE_ID_INTEL_82875_0, NULL);
 
                if (!mci_pdev) {
                        debugf0("875p pci_get_device fail\n");
@@ -551,10 +558,10 @@ static int __init i82875p_init(void)
 
        return 0;
 
-      fail1:
+fail1:
        pci_unregister_driver(&i82875p_driver);
 
-      fail0:
+fail0:
        if (mci_pdev != NULL)
                pci_dev_put(mci_pdev);