Merge tag 'edac_for_3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

Pull EDAC updates from Borislav Petkov:
 "EDAC updates all over the place:

   - Enablement for AMD F15h models 0x60 CPUs.  Most notably DDR4 RAM
     support.  Out of tree stuff is adding the required PCI IDs.  From
     Aravind Gopalakrishnan.

   - Enable amd64_edac for 32-bit due to popular demand.  From Tomasz
     Pala.

   - Convert the AMD MCE injection module to debugfs, where it belongs.

   - Misc EDAC cleanups"

* tag 'edac_for_3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, MCE, AMD: Correct formatting of decoded text
  EDAC, mce_amd_inj: Add an injector function
  EDAC, mce_amd_inj: Add hw-injection attributes
  EDAC, mce_amd_inj: Enable direct writes to MCE MSRs
  EDAC, mce_amd_inj: Convert mce_amd_inj module to debugfs
  EDAC: Delete unnecessary check before calling pci_dev_put()
  EDAC, pci_sysfs: remove unneccessary ifdef around entire file
  ghes_edac: Use snprintf() to silence a static checker warning
  amd64_edac: Build module on x86-32
  EDAC, MCE, AMD: Add decoding table for MC6 xec
  amd64_edac: Add F15h M60h support
  {mv64x60,ppc4xx}_edac,: Remove deprecated IRQF_DISABLED
  EDAC: Sync memory types and names
  EDAC: Add DDR3 LRDIMM entries to edac_mem_types
  x86, amd_nb: Add device IDs to NB tables for F15h M60h
  pci_ids: Add PCI device IDs for F15h M60h

diff --combined drivers/edac/i3200_edac.c
index aa98b136f5d0426eb1626901ce3dedd2ff1aa137,d1ff0ea2d3f3b99d694bae39ae59300ba5be8d16..4ad062b0ef26141c203934eb1e3ce2d49dcc396c
--- 1/drivers/edac/i3200_edac.c
--- 2/drivers/edac/i3200_edac.c
+++ b/drivers/edac/i3200_edac.c
@@@ -242,11 -242,11 +242,11 @@@ static void i3200_process_error_info(st
                                             -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", "");
                }
        }
  }
@@@ -523,8 -523,7 +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;
  }