[PATCH] hw_random: Minor cleanup to hw_random.c

Clean up in drivers/char/hw_random.c:
Make debug #defines a little easier to understand.
Small whitespace cleanup.
Change some printk()'s into pr_info()'s.
Add KERN_ constant to debug printk().
Signed-off-by: James Nelson <james4765@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

drivers/char/hw_random.c

@@ -56,24 +56,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
+/* pr_debug() collapses to a no-op if DEBUG is not defined */
+#define DPRINTK(fmt, args...) pr_debug(PFX "%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)
-#else
 #define assert(expr)							\
 		if(!(expr)) {						\
-        printk( "Assertion failed! %s,%s,%s,line=%d\n", \
-        #expr,__FILE__,__FUNCTION__,__LINE__);          \
+		printk(KERN_DEBUG PFX "Assertion failed! %s,%s,%s,"	\
+		"line=%d\n", #expr, __FILE__, __FUNCTION__, __LINE__);	\
 		}
+#else
+#define assert(expr)
 #endif
 
 #define RNG_MISCDEV_MINOR		183 /* official */
@@ -322,7 +318,8 @@ static int __init amd_init (struct pci_dev *dev)
 	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 @@ static int __init rng_init (void)
 	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;