Commit 367cb704 authored by Sam Ravnborg's avatar Sam Ravnborg

kbuild: un-stringnify KBUILD_MODNAME

Now when kbuild passes KBUILD_MODNAME with "" do not __stringify it when
used. Remove __stringnify for all users.
This also fixes the output of:

$ ls -l /sys/module/
drwxr-xr-x 4 root root 0 2006-01-05 14:24 pcmcia
drwxr-xr-x 4 root root 0 2006-01-05 14:24 pcmcia_core
drwxr-xr-x 3 root root 0 2006-01-05 14:24 "processor"
drwxr-xr-x 3 root root 0 2006-01-05 14:24 "psmouse"

The quoting of the module names will be gone again.
Thanks to GregKH + Kay Sievers for reproting this.
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 20ede274
...@@ -60,7 +60,7 @@ MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off)."); ...@@ -60,7 +60,7 @@ MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
#define dprintk(level, args...) \ #define dprintk(level, args...) \
do { \ do { \
if ((debug & level)) { \ if ((debug & level)) { \
printk("%s: %s(): ", __stringify(KBUILD_MODNAME), \ printk("%s: %s(): ", KBUILD_MODNAME, \
__FUNCTION__); \ __FUNCTION__); \
printk(args); } \ printk(args); } \
} while (0) } while (0)
......
...@@ -19,7 +19,7 @@ extern int budget_debug; ...@@ -19,7 +19,7 @@ extern int budget_debug;
#endif #endif
#define dprintk(level,args...) \ #define dprintk(level,args...) \
do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __FUNCTION__); printk(args); } } while (0) do { if ((budget_debug & level)) { printk("%s: %s(): ", KBUILD_MODNAME, __FUNCTION__); printk(args); } } while (0)
struct budget_info { struct budget_info {
char *name; char *name;
......
...@@ -34,7 +34,7 @@ static int debug = 0; /* insmod parameter */ ...@@ -34,7 +34,7 @@ static int debug = 0; /* insmod parameter */
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
#define dprintk(args...) \ #define dprintk(args...) \
do { if (debug) { printk("%s: %s()[%d]: ",__stringify(KBUILD_MODNAME), __FUNCTION__, __LINE__); printk(args); } } while (0) do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
#define SWITCH 0x00 #define SWITCH 0x00
#define LEVEL_ADJUST 0x02 #define LEVEL_ADJUST 0x02
......
...@@ -36,7 +36,7 @@ static int debug = 0; /* insmod parameter */ ...@@ -36,7 +36,7 @@ static int debug = 0; /* insmod parameter */
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
#define dprintk(args...) \ #define dprintk(args...) \
do { if (debug) { printk("%s: %s()[%d]: ",__stringify(KBUILD_MODNAME), __FUNCTION__, __LINE__); printk(args); } } while (0) do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
#define TEA6415C_NUM_INPUTS 8 #define TEA6415C_NUM_INPUTS 8
#define TEA6415C_NUM_OUTPUTS 6 #define TEA6415C_NUM_OUTPUTS 6
......
...@@ -36,7 +36,7 @@ static int debug = 0; /* insmod parameter */ ...@@ -36,7 +36,7 @@ static int debug = 0; /* insmod parameter */
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
#define dprintk(args...) \ #define dprintk(args...) \
do { if (debug) { printk("%s: %s()[%d]: ",__stringify(KBUILD_MODNAME), __FUNCTION__, __LINE__); printk(args); } } while (0) do { if (debug) { printk("%s: %s()[%d]: ", KBUILD_MODNAME, __FUNCTION__, __LINE__); printk(args); } } while (0)
/* addresses to scan, found only at 0x4c and/or 0x4d (7-Bit) */ /* addresses to scan, found only at 0x4c and/or 0x4d (7-Bit) */
static unsigned short normal_i2c[] = { I2C_TEA6420_1, I2C_TEA6420_2, I2C_CLIENT_END }; static unsigned short normal_i2c[] = { I2C_TEA6420_1, I2C_TEA6420_2, I2C_CLIENT_END };
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#ifdef MODULE #ifdef MODULE
#define MODULE_PARAM_PREFIX /* empty */ #define MODULE_PARAM_PREFIX /* empty */
#else #else
#define MODULE_PARAM_PREFIX __stringify(KBUILD_MODNAME) "." #define MODULE_PARAM_PREFIX KBUILD_MODNAME "."
#endif #endif
#ifdef MODULE #ifdef MODULE
......
...@@ -21,14 +21,14 @@ ...@@ -21,14 +21,14 @@
extern unsigned int saa7146_debug; extern unsigned int saa7146_debug;
//#define DEBUG_PROLOG printk("(0x%08x)(0x%08x) %s: %s(): ",(dev==0?-1:(dev->mem==0?-1:saa7146_read(dev,RPS_ADDR0))),(dev==0?-1:(dev->mem==0?-1:saa7146_read(dev,IER))),__stringify(KBUILD_MODNAME),__FUNCTION__) //#define DEBUG_PROLOG printk("(0x%08x)(0x%08x) %s: %s(): ",(dev==0?-1:(dev->mem==0?-1:saa7146_read(dev,RPS_ADDR0))),(dev==0?-1:(dev->mem==0?-1:saa7146_read(dev,IER))),KBUILD_MODNAME,__FUNCTION__)
#ifndef DEBUG_VARIABLE #ifndef DEBUG_VARIABLE
#define DEBUG_VARIABLE saa7146_debug #define DEBUG_VARIABLE saa7146_debug
#endif #endif
#define DEBUG_PROLOG printk("%s: %s(): ",__stringify(KBUILD_MODNAME),__FUNCTION__) #define DEBUG_PROLOG printk("%s: %s(): ",KBUILD_MODNAME,__FUNCTION__)
#define INFO(x) { printk("%s: ",__stringify(KBUILD_MODNAME)); printk x; } #define INFO(x) { printk("%s: ",KBUILD_MODNAME); printk x; }
#define ERR(x) { DEBUG_PROLOG; printk x; } #define ERR(x) { DEBUG_PROLOG; printk x; }
......
...@@ -171,7 +171,7 @@ static int __init init(void) ...@@ -171,7 +171,7 @@ static int __init init(void)
/* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */ /* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */
static int warn_set(const char *val, struct kernel_param *kp) static int warn_set(const char *val, struct kernel_param *kp)
{ {
printk(KERN_INFO __stringify(KBUILD_MODNAME) printk(KERN_INFO KBUILD_MODNAME
": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n"); ": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n");
return 0; return 0;
} }
......
...@@ -113,7 +113,7 @@ static int __init init(void) ...@@ -113,7 +113,7 @@ static int __init init(void)
/* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */ /* Prior to 2.6.11, we had a ports param. No longer, but don't break users. */
static int warn_set(const char *val, struct kernel_param *kp) static int warn_set(const char *val, struct kernel_param *kp)
{ {
printk(KERN_INFO __stringify(KBUILD_MODNAME) printk(KERN_INFO KBUILD_MODNAME
": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n"); ": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n");
return 0; return 0;
} }
......
...@@ -49,8 +49,6 @@ static struct security_operations capability_ops = { ...@@ -49,8 +49,6 @@ static struct security_operations capability_ops = {
.vm_enough_memory = cap_vm_enough_memory, .vm_enough_memory = cap_vm_enough_memory,
}; };
#define MY_NAME __stringify(KBUILD_MODNAME)
/* flag to keep track of how we were registered */ /* flag to keep track of how we were registered */
static int secondary; static int secondary;
...@@ -67,7 +65,7 @@ static int __init capability_init (void) ...@@ -67,7 +65,7 @@ static int __init capability_init (void)
/* register ourselves with the security framework */ /* register ourselves with the security framework */
if (register_security (&capability_ops)) { if (register_security (&capability_ops)) {
/* try registering with primary module */ /* try registering with primary module */
if (mod_reg_security (MY_NAME, &capability_ops)) { if (mod_reg_security (KBUILD_MODNAME, &capability_ops)) {
printk (KERN_INFO "Failure registering capabilities " printk (KERN_INFO "Failure registering capabilities "
"with primary security module.\n"); "with primary security module.\n");
return -EINVAL; return -EINVAL;
...@@ -85,7 +83,7 @@ static void __exit capability_exit (void) ...@@ -85,7 +83,7 @@ static void __exit capability_exit (void)
return; return;
/* remove ourselves from the security framework */ /* remove ourselves from the security framework */
if (secondary) { if (secondary) {
if (mod_unreg_security (MY_NAME, &capability_ops)) if (mod_unreg_security (KBUILD_MODNAME, &capability_ops))
printk (KERN_INFO "Failure unregistering capabilities " printk (KERN_INFO "Failure unregistering capabilities "
"with primary module.\n"); "with primary module.\n");
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment