arm64: dts: rockchip: Add rk3399 box dts for drm

[firefly-linux-kernel-4.4.55.git] / drivers / edac / i3200_edac.c

diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
index aa44c1718f50382eac5a87b1c9bef5e33db020e1..1f453382258a9993b577df8b46671917ad2f1b5f 100644 (file)
--- a/drivers/edac/i3200_edac.c
+++ b/drivers/edac/i3200_edac.c
@@ -15,7 +15,7 @@
 #include <linux/io.h>
 #include "edac_core.h"
 
-#include <asm-generic/io-64-nonatomic-lo-hi.h>
+#include <linux/io-64-nonatomic-lo-hi.h>
 
 #define I3200_REVISION        "1.1"
 
@@ -242,11 +242,11 @@ static void i3200_process_error_info(struct mem_ctl_info *mci,
                                             -1, -1,
                                             "i3000 UE", "");
                } else if (log & I3200_ECCERRLOG_CE) {
-                       edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
+                       edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
                                             0, 0, eccerrlog_syndrome(log),
                                             eccerrlog_row(channel, log),
                                             -1, -1,
-                                            "i3000 UE", "");
+                                            "i3000 CE", "");
                }
        }
 }
@@ -260,8 +260,7 @@ static void i3200_check(struct mem_ctl_info *mci)
        i3200_process_error_info(mci, &info);
 }
 
-
-void __iomem *i3200_map_mchbar(struct pci_dev *pdev)
+static void __iomem *i3200_map_mchbar(struct pci_dev *pdev)
 {
        union {
                u64 mchbar;
@@ -465,9 +464,11 @@ static void i3200_remove_one(struct pci_dev *pdev)
        iounmap(priv->window);
 
        edac_mc_free(mci);
+
+       pci_disable_device(pdev);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(i3200_pci_tbl) = {
+static const struct pci_device_id i3200_pci_tbl[] = {
        {
                PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                I3200},
@@ -522,8 +523,7 @@ fail1:
        pci_unregister_driver(&i3200_driver);
 
 fail0:
-       if (mci_pdev)
-               pci_dev_put(mci_pdev);
+       pci_dev_put(mci_pdev);
 
        return pci_rc;
 }