hw_random: Clean up printk()'s in drivers/char/hw_random.c
PATCH 1/1 hw_random: Clean up printk()'s in drivers/char/hw_random.c
Clean up printk()'s in hw_random driver.
Signed-off-by James Nelson <[email protected]>
drivers/char/hw_random.c +13 -16
@@ -21,6 +21,7 @@*/ +#undef DEBUG/* define to enable copious debugging information */ #include <linux/module.h> #include <linux/kernel.h>
@@ -56,24 +57,20 @@/* * debugging macros */ -#undef RNG_DEBUG/* define to enable copious debugging info */ -#ifdef RNG_DEBUG -/* note: prints function name for you */ -#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) -#else -#define DPRINTK(fmt, args...) -#endif +/* note: prints function name for you +* collapses to a no-op if DEBUG is #undef */ +#define DPRINTK(fmt, args...) pr_debug( "%s: " fmt, __FUNCTION__ , ## args) -#define RNG_NDEBUG /* define to disable lightweight runtime checks */ +#undef RNG_NDEBUG/* define to enable lightweight runtime checks */ #ifdef RNG_NDEBUG -#define assert (expr) +#define assert (expr) \ + if(!(expr)) { \ + pr_debug( PFX "Assertion failed! %s,%s,%s,line=%d\n", \ + #expr,__FILE__,__FUNCTION__,__LINE__); \ + }#else -#define assert (expr) \ - if(!(expr)) { \ - printk( "Assertion failed! %s,%s,%s,line=%d\n", \ - #expr,__FILE__,__FUNCTION__,__LINE__); \ - } +#define assert (expr)#endif #define RNG_MISCDEV_MINOR 183/* official */
@@ -322,7 +319,7 @@ rnen |= (1 <<7 );/* PMIO enable */ pci_write_config_byte (dev,0x41 , rnen); - printk(KERN_INFO PFX "AMD768 system management I/O registers at 0x%X.\n", pmbase); +pr_info (PFX "AMD768 system management I/O registers at 0x%X.\n" , pmbase); amd_dev = dev;
@@ -606,7 +603,7 @@if (rc)return rc; - printk (KERN_INFO RNG_DRIVER_NAME " loaded\n"); +pr_info (RNG_DRIVER_NAME " loaded\n" );DPRINTK ("EXIT, returning 0\n" );return 0 ;
OK, but patch generates rejects against the current kernel. can you rediff and resend?
Jeff