From e6e4d05d4d440f1989f696baa146263957593345 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 3 May 2010 11:02:44 -0700
Subject: Staging: cxt1e1: fix cxt1e1 module names

On Mon, 2010-05-03 at 10:09 -0700, Randy Dunlap wrote:
> Lots of cxt1e1 source code uses THIS_MODULE->name, which won't build
> when CONFIG_MODULES is not enabled, so use KBUILD_MODNAME instead.

Perhaps a conversion to pr_<level> is better?

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/staging/cxt1e1/functions.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'drivers/staging/cxt1e1/functions.c')

diff --git a/drivers/staging/cxt1e1/functions.c b/drivers/staging/cxt1e1/functions.c
index c95c62dfb04..738129d62bb 100644
--- a/drivers/staging/cxt1e1/functions.c
+++ b/drivers/staging/cxt1e1/functions.c
@@ -11,6 +11,8 @@
  *   GNU General Public License for more details.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/slab.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
@@ -117,7 +119,7 @@ watchdog_func (unsigned long arg)
     if (drvr_state != SBE_DRVR_AVAILABLE)
     {
         if (log_level >= LOG_MONITOR)
-            printk (KERN_WARNING "watchdog_func: drvr not available (%x)\n", drvr_state);
+            pr_warning("%s: drvr not available (%x)\n", __func__, drvr_state);
         return;
     }
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-- 
cgit v1.2.3