aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/edac
diff options
context:
space:
mode:
authorBorislav Petkov <borislav.petkov@amd.com>2010-03-15 14:17:57 -0400
committerBorislav Petkov <borislav.petkov@amd.com>2010-08-03 10:14:00 -0400
commit935ab88e341ccb1507b2b0b1f1e9adcbbd693265 (patch)
treefd21ec6211cad49326f7c851c28c00af2968dbcd /drivers/edac
parentad6a32e96939a0eb0eb382e7d78dbf33457aed1a (diff)
edac: Remove EDAC_DEBUG_VERBOSE
This option differs from EDAC_DEBUG only by printing the file and line of where the debug statement is placed, which contains unneeded information. So remove it. Signed-off-by: Borislav Petkov <borislav.petkov@amd.com> Acked-by: Doug Thompson <dougthompson@xmission.com>
Diffstat (limited to 'drivers/edac')
-rw-r--r--drivers/edac/Kconfig8
-rw-r--r--drivers/edac/edac_core.h15
2 files changed, 0 insertions, 23 deletions
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 0d2f9dbb47e4..70bb350de996 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -39,14 +39,6 @@ config EDAC_DEBUG
39 there're four debug levels (x=0,1,2,3 from low to high). 39 there're four debug levels (x=0,1,2,3 from low to high).
40 Usually you should select 'N'. 40 Usually you should select 'N'.
41 41
42config EDAC_DEBUG_VERBOSE
43 bool "More verbose debugging"
44 depends on EDAC_DEBUG
45 help
46 This option makes debugging information more verbose.
47 Source file name and line number where debugging message
48 printed will be added to debugging message.
49
50 config EDAC_DECODE_MCE 42 config EDAC_DECODE_MCE
51 tristate "Decode MCEs in human-readable form (only on AMD for now)" 43 tristate "Decode MCEs in human-readable form (only on AMD for now)"
52 depends on CPU_SUP_AMD && X86_MCE 44 depends on CPU_SUP_AMD && X86_MCE
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index efca9343d26a..ade4f1d70539 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -49,21 +49,15 @@
49#define edac_printk(level, prefix, fmt, arg...) \ 49#define edac_printk(level, prefix, fmt, arg...) \
50 printk(level "EDAC " prefix ": " fmt, ##arg) 50 printk(level "EDAC " prefix ": " fmt, ##arg)
51 51
52#define edac_printk_verbose(level, prefix, fmt, arg...) \
53 printk(level "EDAC " prefix ": " "in %s, line at %d: " fmt, \
54 __FILE__, __LINE__, ##arg)
55
56#define edac_mc_printk(mci, level, fmt, arg...) \ 52#define edac_mc_printk(mci, level, fmt, arg...) \
57 printk(level "EDAC MC%d: " fmt, mci->mc_idx, ##arg) 53 printk(level "EDAC MC%d: " fmt, mci->mc_idx, ##arg)
58 54
59#define edac_mc_chipset_printk(mci, level, prefix, fmt, arg...) \ 55#define edac_mc_chipset_printk(mci, level, prefix, fmt, arg...) \
60 printk(level "EDAC " prefix " MC%d: " fmt, mci->mc_idx, ##arg) 56 printk(level "EDAC " prefix " MC%d: " fmt, mci->mc_idx, ##arg)
61 57
62/* edac_device printk */
63#define edac_device_printk(ctl, level, fmt, arg...) \ 58#define edac_device_printk(ctl, level, fmt, arg...) \
64 printk(level "EDAC DEVICE%d: " fmt, ctl->dev_idx, ##arg) 59 printk(level "EDAC DEVICE%d: " fmt, ctl->dev_idx, ##arg)
65 60
66/* edac_pci printk */
67#define edac_pci_printk(ctl, level, fmt, arg...) \ 61#define edac_pci_printk(ctl, level, fmt, arg...) \
68 printk(level "EDAC PCI%d: " fmt, ctl->pci_idx, ##arg) 62 printk(level "EDAC PCI%d: " fmt, ctl->pci_idx, ##arg)
69 63
@@ -76,21 +70,12 @@
76extern int edac_debug_level; 70extern int edac_debug_level;
77extern const char *edac_mem_types[]; 71extern const char *edac_mem_types[];
78 72
79#ifndef CONFIG_EDAC_DEBUG_VERBOSE
80#define edac_debug_printk(level, fmt, arg...) \ 73#define edac_debug_printk(level, fmt, arg...) \
81 do { \ 74 do { \
82 if (level <= edac_debug_level) \ 75 if (level <= edac_debug_level) \
83 edac_printk(KERN_DEBUG, EDAC_DEBUG, \ 76 edac_printk(KERN_DEBUG, EDAC_DEBUG, \
84 "%s: " fmt, __func__, ##arg); \ 77 "%s: " fmt, __func__, ##arg); \
85 } while (0) 78 } while (0)
86#else /* CONFIG_EDAC_DEBUG_VERBOSE */
87#define edac_debug_printk(level, fmt, arg...) \
88 do { \
89 if (level <= edac_debug_level) \
90 edac_printk_verbose(KERN_DEBUG, EDAC_DEBUG, fmt, \
91 ##arg); \
92 } while (0)
93#endif
94 79
95#define debugf0( ... ) edac_debug_printk(0, __VA_ARGS__ ) 80#define debugf0( ... ) edac_debug_printk(0, __VA_ARGS__ )
96#define debugf1( ... ) edac_debug_printk(1, __VA_ARGS__ ) 81#define debugf1( ... ) edac_debug_printk(1, __VA_ARGS__ )