Commit 12fdff3f authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

Add a dummy printk function for the maintenance of unused printks 



Add a dummy printk function for the maintenance of unused printks through gcc
format checking, and also so that side-effect checking is maintained too.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1490cf5f

arch/mn10300/kernel/mn10300-serial.c

+0 −5
Original line number Diff line number Diff line
@@ -44,11 +44,6 @@ static const char serial_revdate[] = "2007-11-06"; 
#include <unit/timex.h>

#include "mn10300-serial.h"



static inline __attribute__((format(printf, 1, 2)))

void no_printk(const char *fmt, ...)

{

}



#define kenter(FMT, ...) \

	printk(KERN_DEBUG "-->%s(" FMT ")\n", __func__, ##__VA_ARGS__)

#define _enter(FMT, ...) \

fs/afs/internal.h

+3 −9
Original line number Diff line number Diff line
@@ -752,12 +752,6 @@ extern unsigned afs_debug; 
#define dbgprintk(FMT,...) \

	printk("[%-6.6s] "FMT"\n", current->comm ,##__VA_ARGS__)



/* make sure we maintain the format strings, even when debugging is disabled */

static inline __attribute__((format(printf,1,2)))

void _dbprintk(const char *fmt, ...)

{

}



#define kenter(FMT,...)	dbgprintk("==> %s("FMT")",__func__ ,##__VA_ARGS__)

#define kleave(FMT,...)	dbgprintk("<== %s()"FMT"",__func__ ,##__VA_ARGS__)

#define kdebug(FMT,...)	dbgprintk("    "FMT ,##__VA_ARGS__)
@@ -792,9 +786,9 @@ do { \ 
} while (0)



#else

#define _enter(FMT,...)	_dbprintk("==> %s("FMT")",__func__ ,##__VA_ARGS__)

#define _leave(FMT,...)	_dbprintk("<== %s()"FMT"",__func__ ,##__VA_ARGS__)

#define _debug(FMT,...)	_dbprintk("    "FMT ,##__VA_ARGS__)

#define _enter(FMT,...)	no_printk("==> %s("FMT")",__func__ ,##__VA_ARGS__)

#define _leave(FMT,...)	no_printk("<== %s()"FMT"",__func__ ,##__VA_ARGS__)

#define _debug(FMT,...)	no_printk("    "FMT ,##__VA_ARGS__)

#endif



/*

fs/cachefiles/internal.h

+3 −10
Original line number Diff line number Diff line
@@ -267,13 +267,6 @@ do { \ 
#define dbgprintk(FMT, ...) \

	printk(KERN_DEBUG "[%-6.6s] "FMT"\n", current->comm, ##__VA_ARGS__)



/* make sure we maintain the format strings, even when debugging is disabled */

static inline void _dbprintk(const char *fmt, ...)

	__attribute__((format(printf, 1, 2)));

static inline void _dbprintk(const char *fmt, ...)

{

}



#define kenter(FMT, ...) dbgprintk("==> %s("FMT")", __func__, ##__VA_ARGS__)

#define kleave(FMT, ...) dbgprintk("<== %s()"FMT"", __func__, ##__VA_ARGS__)

#define kdebug(FMT, ...) dbgprintk(FMT, ##__VA_ARGS__)
@@ -304,9 +297,9 @@ do { \ 
} while (0)



#else

#define _enter(FMT, ...) _dbprintk("==> %s("FMT")", __func__, ##__VA_ARGS__)

#define _leave(FMT, ...) _dbprintk("<== %s()"FMT"", __func__, ##__VA_ARGS__)

#define _debug(FMT, ...) _dbprintk(FMT, ##__VA_ARGS__)

#define _enter(FMT, ...) no_printk("==> %s("FMT")", __func__, ##__VA_ARGS__)

#define _leave(FMT, ...) no_printk("<== %s()"FMT"", __func__, ##__VA_ARGS__)

#define _debug(FMT, ...) no_printk(FMT, ##__VA_ARGS__)

#endif



#if 1 /* defined(__KDEBUGALL) */

fs/fscache/internal.h

+4 −10
Original line number Diff line number Diff line
@@ -321,17 +321,11 @@ void fscache_put_context(struct fscache_cookie *cookie, void *context) 
#define dbgprintk(FMT, ...) \

	printk(KERN_DEBUG "[%-6.6s] "FMT"\n", current->comm, ##__VA_ARGS__)



/* make sure we maintain the format strings, even when debugging is disabled */

static inline __attribute__((format(printf, 1, 2)))

void _dbprintk(const char *fmt, ...)

{

}



#define kenter(FMT, ...) dbgprintk("==> %s("FMT")", __func__, ##__VA_ARGS__)

#define kleave(FMT, ...) dbgprintk("<== %s()"FMT"", __func__, ##__VA_ARGS__)

#define kdebug(FMT, ...) dbgprintk(FMT, ##__VA_ARGS__)



#define kjournal(FMT, ...) _dbprintk(FMT, ##__VA_ARGS__)

#define kjournal(FMT, ...) no_printk(FMT, ##__VA_ARGS__)



#ifdef __KDEBUG

#define _enter(FMT, ...) kenter(FMT, ##__VA_ARGS__)
@@ -358,9 +352,9 @@ do { \ 
} while (0)



#else

#define _enter(FMT, ...) _dbprintk("==> %s("FMT")", __func__, ##__VA_ARGS__)

#define _leave(FMT, ...) _dbprintk("<== %s()"FMT"", __func__, ##__VA_ARGS__)

#define _debug(FMT, ...) _dbprintk(FMT, ##__VA_ARGS__)

#define _enter(FMT, ...) no_printk("==> %s("FMT")", __func__, ##__VA_ARGS__)

#define _leave(FMT, ...) no_printk("<== %s()"FMT"", __func__, ##__VA_ARGS__)

#define _debug(FMT, ...) no_printk(FMT, ##__VA_ARGS__)

#endif



/*

include/linux/kernel.h

+7 −0
Original line number Diff line number Diff line
@@ -306,6 +306,13 @@ static inline void log_buf_kexec_setup(void) 
}

#endif



/*

 * Dummy printk for disabled debugging statements to use whilst maintaining

 * gcc's format and side-effect checking.

 */

static inline __attribute__ ((format (printf, 1, 2)))

int no_printk(const char *s, ...) { return 0; }



extern int printk_needs_cpu(int cpu);

extern void printk_tick(void);