ia64/xen-unstable

changeset 8618:49c3b00484ff

define all DPRINTK as pr_debug

Signed-off-by: Vincent Hanquez <vincent@xensource.com>
author vhanquez@kneesa.uk.xensource.com
date Mon Jan 16 21:58:44 2006 +0000 (2006-01-16)
parents f3ce4d76650c
children ca795f19b613
files linux-2.6-xen-sparse/drivers/xen/blkfront/block.h linux-2.6-xen-sparse/drivers/xen/blktap/common.h linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c linux-2.6-xen-sparse/drivers/xen/tpmback/common.h linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h	Mon Jan 16 21:48:24 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h	Mon Jan 16 21:58:44 2006 +0000
     1.3 @@ -69,11 +69,7 @@
     1.4  #define WPRINTK(fmt, args...) ((void)0)
     1.5  #endif
     1.6   
     1.7 -#if 0
     1.8 -#define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a )
     1.9 -#else
    1.10 -#define DPRINTK(_f, _a...) ((void)0)
    1.11 -#endif
    1.12 +#define DPRINTK(_f, _a...) pr_debug ( _f , ## _a )
    1.13  
    1.14  #if 0
    1.15  #define DPRINTK_IOCTL(_f, _a...) printk ( KERN_ALERT _f , ## _a )
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/blktap/common.h	Mon Jan 16 21:48:24 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blktap/common.h	Mon Jan 16 21:58:44 2006 +0000
     2.3 @@ -23,13 +23,13 @@
     2.4  #define ASSERT(_p) \
     2.5      if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \
     2.6      __LINE__, __FILE__); *(int*)0=0; }
     2.7 -#define DPRINTK(_f, _a...) printk(KERN_ALERT "(file=%s, line=%d) " _f, \
     2.8 -                           __FILE__ , __LINE__ , ## _a )
     2.9  #else
    2.10  #define ASSERT(_p) ((void)0)
    2.11 -#define DPRINTK(_f, _a...) ((void)0)
    2.12  #endif
    2.13  
    2.14 +#define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
    2.15 +                                    __FILE__ , __LINE__ , ## _a )
    2.16 +
    2.17  #define WPRINTK(fmt, args...) printk(KERN_WARNING "blk_tap: " fmt, ##args)
    2.18  
    2.19  struct vbd {
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Mon Jan 16 21:48:24 2006 +0000
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Mon Jan 16 21:58:44 2006 +0000
     3.3 @@ -154,13 +154,8 @@ static char *be_state_name[] = {
     3.4  };
     3.5  #endif
     3.6  
     3.7 -#ifdef DEBUG
     3.8 -#define DPRINTK(fmt, args...)						\
     3.9 -	printk(KERN_ALERT "netfront (%s:%d) " fmt, __FUNCTION__,	\
    3.10 -	       __LINE__, ##args)
    3.11 -#else
    3.12 -#define DPRINTK(fmt, args...) ((void)0)
    3.13 -#endif
    3.14 +#define DPRINTK(fmt, args...) pr_debug("netfront (%s:%d) " fmt, \
    3.15 +                                       __FUNCTION__, __LINE__, ##args)
    3.16  #define IPRINTK(fmt, args...)				\
    3.17  	printk(KERN_INFO "netfront: " fmt, ##args)
    3.18  #define WPRINTK(fmt, args...)				\
     4.1 --- a/linux-2.6-xen-sparse/drivers/xen/tpmback/common.h	Mon Jan 16 21:48:24 2006 +0000
     4.2 +++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/common.h	Mon Jan 16 21:58:44 2006 +0000
     4.3 @@ -21,13 +21,13 @@
     4.4  #define ASSERT(_p) \
     4.5      if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \
     4.6      __LINE__, __FILE__); *(int*)0=0; }
     4.7 -#define DPRINTK(_f, _a...) printk(KERN_ALERT "(file=%s, line=%d) " _f, \
     4.8 -                           __FILE__ , __LINE__ , ## _a )
     4.9  #else
    4.10  #define ASSERT(_p) ((void)0)
    4.11 -#define DPRINTK(_f, _a...) ((void)0)
    4.12  #endif
    4.13  
    4.14 +#define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
    4.15 +                                    __FILE__ , __LINE__ , ## _a )
    4.16 +
    4.17  typedef struct tpmif_st {
    4.18  	struct list_head tpmif_list;
    4.19  	/* Unique identifier for this interface. */
     5.1 --- a/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c	Mon Jan 16 21:48:24 2006 +0000
     5.2 +++ b/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c	Mon Jan 16 21:58:44 2006 +0000
     5.3 @@ -80,12 +80,8 @@ static int tpm_xmit(struct tpm_private *
     5.4                      const u8 * buf, size_t count, int userbuffer,
     5.5                      void *remember);
     5.6  
     5.7 -#if DEBUG
     5.8  #define DPRINTK(fmt, args...) \
     5.9 -    printk(KERN_ALERT "xen_tpm_fr (%s:%d) " fmt, __FUNCTION__, __LINE__, ##args)
    5.10 -#else
    5.11 -#define DPRINTK(fmt, args...) ((void)0)
    5.12 -#endif
    5.13 +    pr_debug("xen_tpm_fr (%s:%d) " fmt, __FUNCTION__, __LINE__, ##args)
    5.14  #define IPRINTK(fmt, args...) \
    5.15      printk(KERN_INFO "xen_tpm_fr: " fmt, ##args)
    5.16  #define WPRINTK(fmt, args...) \
     6.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c	Mon Jan 16 21:48:24 2006 +0000
     6.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c	Mon Jan 16 21:58:44 2006 +0000
     6.3 @@ -34,13 +34,8 @@
     6.4  /* xenbus_probe.c */
     6.5  extern char *kasprintf(const char *fmt, ...);
     6.6  
     6.7 -#if 0
     6.8  #define DPRINTK(fmt, args...) \
     6.9 -    printk("xenbus_client (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__, ##args)
    6.10 -#else
    6.11 -#define DPRINTK(fmt, args...) ((void)0)
    6.12 -#endif
    6.13 -
    6.14 +    pr_debug("xenbus_client (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__, ##args)
    6.15  
    6.16  int xenbus_watch_path(struct xenbus_device *dev, const char *path,
    6.17  		      struct xenbus_watch *watch, 
     7.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Mon Jan 16 21:48:24 2006 +0000
     7.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Mon Jan 16 21:58:44 2006 +0000
     7.3 @@ -27,12 +27,8 @@
     7.4   * IN THE SOFTWARE.
     7.5   */
     7.6  
     7.7 -#if 0
     7.8  #define DPRINTK(fmt, args...) \
     7.9 -    printk("xenbus_probe (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__, ##args)
    7.10 -#else
    7.11 -#define DPRINTK(fmt, args...) ((void)0)
    7.12 -#endif
    7.13 +    pr_debug("xenbus_probe (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__, ##args)
    7.14  
    7.15  #include <linux/kernel.h>
    7.16  #include <linux/err.h>