From 929a40ec324e947d4ad14cc1ced785c104c560e2 Mon Sep 17 00:00:00 2001 From: Doug Thompson <norsk5@xmission.com> Date: Sat, 1 Jul 2006 04:35:45 -0700 Subject: [PATCH] EDAC: fix module names quoted in sysfs Fix the quoted module name in the sysfs for EDAC modules and reported by several people. Instead of ../_edac_e752x_/ now the following will be presented, like other modules: ../edac_e752x/ Signed-off-by: Doug Thompson <norsk5@xmission.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> --- drivers/edac/amd76x_edac.c | 4 ++-- drivers/edac/e752x_edac.c | 3 ++- drivers/edac/e7xxx_edac.c | 3 ++- drivers/edac/edac_mc.h | 4 ---- drivers/edac/i82860_edac.c | 3 ++- drivers/edac/i82875p_edac.c | 3 ++- drivers/edac/r82600_edac.c | 3 ++- 7 files changed, 12 insertions(+), 11 deletions(-) (limited to 'drivers') diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c index d75864e35fe..f79f6b587bf 100644 --- a/drivers/edac/amd76x_edac.c +++ b/drivers/edac/amd76x_edac.c @@ -19,8 +19,8 @@ #include <linux/slab.h> #include "edac_mc.h" -#define AMD76X_REVISION " Ver: 2.0.0 " __DATE__ - +#define AMD76X_REVISION " Ver: 2.0.1 " __DATE__ +#define EDAC_MOD_STR "amd76x_edac" #define amd76x_printk(level, fmt, arg...) \ edac_printk(level, "amd76x", fmt, ##arg) diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c index 815c3eb783d..c82bc0ed7f1 100644 --- a/drivers/edac/e752x_edac.c +++ b/drivers/edac/e752x_edac.c @@ -24,7 +24,8 @@ #include <linux/slab.h> #include "edac_mc.h" -#define E752X_REVISION " Ver: 2.0.0 " __DATE__ +#define E752X_REVISION " Ver: 2.0.1 " __DATE__ +#define EDAC_MOD_STR "e752x_edac" static int force_function_unhide; diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c index 5a5ecd5a040..310d91b41c9 100644 --- a/drivers/edac/e7xxx_edac.c +++ b/drivers/edac/e7xxx_edac.c @@ -29,7 +29,8 @@ #include <linux/slab.h> #include "edac_mc.h" -#define E7XXX_REVISION " Ver: 2.0.0 " __DATE__ +#define E7XXX_REVISION " Ver: 2.0.1 " __DATE__ +#define EDAC_MOD_STR "e7xxx_edac" #define e7xxx_printk(level, fmt, arg...) \ edac_printk(level, "e7xxx", fmt, ##arg) diff --git a/drivers/edac/edac_mc.h b/drivers/edac/edac_mc.h index 1be4947e28a..bf6ab8a8d5e 100644 --- a/drivers/edac/edac_mc.h +++ b/drivers/edac/edac_mc.h @@ -78,10 +78,6 @@ extern int edac_debug_level; #endif /* !CONFIG_EDAC_DEBUG */ -#define edac_xstr(s) edac_str(s) -#define edac_str(s) #s -#define EDAC_MOD_STR edac_xstr(KBUILD_BASENAME) - #define BIT(x) (1 << (x)) #define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \ diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c index e30a4a2eaf3..e4bb298e613 100644 --- a/drivers/edac/i82860_edac.c +++ b/drivers/edac/i82860_edac.c @@ -16,7 +16,8 @@ #include <linux/slab.h> #include "edac_mc.h" -#define I82860_REVISION " Ver: 2.0.0 " __DATE__ +#define I82860_REVISION " Ver: 2.0.1 " __DATE__ +#define EDAC_MOD_STR "i82860_edac" #define i82860_printk(level, fmt, arg...) \ edac_printk(level, "i82860", fmt, ##arg) diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c index 9423ee5e7ed..161fe09a6d3 100644 --- a/drivers/edac/i82875p_edac.c +++ b/drivers/edac/i82875p_edac.c @@ -20,7 +20,8 @@ #include <linux/slab.h> #include "edac_mc.h" -#define I82875P_REVISION " Ver: 2.0.0 " __DATE__ +#define I82875P_REVISION " Ver: 2.0.1 " __DATE__ +#define EDAC_MOD_STR "i82875p_edac" #define i82875p_printk(level, fmt, arg...) \ edac_printk(level, "i82875p", fmt, ##arg) diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c index a0e248d11ed..a49cf0a3939 100644 --- a/drivers/edac/r82600_edac.c +++ b/drivers/edac/r82600_edac.c @@ -22,7 +22,8 @@ #include <linux/slab.h> #include "edac_mc.h" -#define R82600_REVISION " Ver: 2.0.0 " __DATE__ +#define R82600_REVISION " Ver: 2.0.1 " __DATE__ +#define EDAC_MOD_STR "r82600_edac" #define r82600_printk(level, fmt, arg...) \ edac_printk(level, "r82600", fmt, ##arg) -- cgit v1.2.3-70-g09d2