HID: ntrig remove if and drop an indent

[~andy/linux] / drivers / edac / amd64_edac.h

diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h
index 76760a8043cad5f76b0d9eb2cb15a860c2a0512b..613ec72b0f65cba100b9845e1e076b6711ce3918 100644 (file)
--- a/drivers/edac/amd64_edac.h
+++ b/drivers/edac/amd64_edac.h
@@ -74,11 +74,26 @@
 #include "edac_core.h"
 #include "mce_amd.h"
 
-#define amd64_printk(level, fmt, arg...) \
-       edac_printk(level, "amd64", fmt, ##arg)
+#define amd64_debug(fmt, arg...) \
+       edac_printk(KERN_DEBUG, "amd64", fmt, ##arg)
 
-#define amd64_mc_printk(mci, level, fmt, arg...) \
-       edac_mc_chipset_printk(mci, level, "amd64", fmt, ##arg)
+#define amd64_info(fmt, arg...) \
+       edac_printk(KERN_INFO, "amd64", fmt, ##arg)
+
+#define amd64_notice(fmt, arg...) \
+       edac_printk(KERN_NOTICE, "amd64", fmt, ##arg)
+
+#define amd64_warn(fmt, arg...) \
+       edac_printk(KERN_WARNING, "amd64", fmt, ##arg)
+
+#define amd64_err(fmt, arg...) \
+       edac_printk(KERN_ERR, "amd64", fmt, ##arg)
+
+#define amd64_mc_warn(mci, fmt, arg...) \
+       edac_mc_chipset_printk(mci, KERN_WARNING, "amd64", fmt, ##arg)
+
+#define amd64_mc_err(mci, fmt, arg...) \
+       edac_mc_chipset_printk(mci, KERN_ERR, "amd64", fmt, ##arg)
 
 /*
  * Throughout the comments in this code, the following terms are used:
@@ -129,11 +144,9 @@
  *         sections 3.5.4 and 3.5.5 for more information.
  */
 
-#define EDAC_AMD64_VERSION             " Ver: 3.3.0 " __DATE__
+#define EDAC_AMD64_VERSION             "v3.3.0"
 #define EDAC_MOD_STR                   "amd64_edac"
 
-#define EDAC_MAX_NUMNODES              8
-
 /* Extended Model from CPUID, for CPU Revision numbers */
 #define K8_REV_D                       1
 #define K8_REV_E                       2
@@ -322,9 +335,6 @@
 #define K8_SCRCTRL                     0x58
 
 #define F10_NB_CFG_LOW                 0x88
-#define        F10_NB_CFG_LOW_ENABLE_EXT_CFG   BIT(14)
-
-#define F10_NB_CFG_HIGH                        0x8C
 
 #define F10_ONLINE_SPARE               0xB0
 #define F10_ONLINE_SPARE_SWAPDONE0(x)  ((x) & BIT(1))
@@ -451,30 +461,27 @@ struct amd64_pvt {
        /* place to store error injection parameters prior to issue */
        struct error_injection injection;
 
-       /* Save old hw registers' values before we modified them */
-       u32 nbctl_mcgctl_saved;         /* When true, following 2 are valid */
-       u32 old_nbctl;
-
        /* DCT per-family scrubrate setting */
        u32 min_scrubrate;
 
        /* family name this instance is running on */
        const char *ctl_name;
 
-       /* misc settings */
+};
+
+/*
+ * per-node ECC settings descriptor
+ */
+struct ecc_settings {
+       u32 old_nbctl;
+       bool nbctl_valid;
+
        struct flags {
-               unsigned long cf8_extcfg:1;
                unsigned long nb_mce_enable:1;
                unsigned long nb_ecc_prev:1;
        } flags;
 };
 
-struct scrubrate {
-       u32 scrubval;           /* bit pattern for scrub rate */
-       u32 bandwidth;          /* bandwidth consumed (bytes/sec) */
-};
-
-extern struct scrubrate scrubrates[23];
 extern const char *tt_msgs[4];
 extern const char *ll_msgs[4];
 extern const char *rrrr_msgs[16];
@@ -527,8 +534,8 @@ static inline int amd64_read_pci_cfg_dword(struct pci_dev *pdev, int offset,
 
        err = pci_read_config_dword(pdev, offset, val);
        if (err)
-               amd64_printk(KERN_WARNING, "%s: error reading F%dx%x.\n",
-                            func, PCI_FUNC(pdev->devfn), offset);
+               amd64_warn("%s: error reading F%dx%x.\n",
+                          func, PCI_FUNC(pdev->devfn), offset);
 
        return err;
 }