mtd/drivers/mtd/chips cfi_cmdset_0001.c,1.101,1.102

[David Woodhouse]

Update of /home/cvs/mtd/drivers/mtd/chips
In directory phoenix.infradead.org:/tmp/cvs-serv4557/chips

Modified Files:
	cfi_cmdset_0001.c 
Log Message:
fix __FUNCTION__ abuse

Index: cfi_cmdset_0001.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0001.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- cfi_cmdset_0001.c	5 Sep 2002 20:30:47 -0000	1.101
+++ cfi_cmdset_0001.c	13 Sep 2002 14:39:34 -0000	1.102
@@ -1482,7 +1482,7 @@
 		/* Urgh. Chip not yet ready to talk to us. */
 		if (time_after(jiffies, timeo)) {
 			spin_unlock_bh(chip->mutex);
-			printk(KERN_ERR __FUNCTION__ ": waiting for chip to be ready timed out\n");
+			printk(KERN_ERR "%s: waiting for chip to be ready timed out\n", __FUNCTION__);
 			return -EIO;
 		}
 
@@ -1558,9 +1558,8 @@
 	int ret;
 
 #ifdef DEBUG_LOCK_BITS
-	printk(KERN_DEBUG __FUNCTION__ 
-	       ": lock status before, ofs=0x%08llx, len=0x%08X\n",
-	       ofs, len);
+	printk(KERN_DEBUG "%s: lock status before, ofs=0x%08llx, len=0x%08X\n",
+	       __FUNCTION__, ofs, len);
 	cfi_intelext_varsize_frob(mtd, do_printlockstatus_oneblock,
 				  ofs, len, 0);
 #endif
@@ -1570,7 +1569,7 @@
 	
 #ifdef DEBUG_LOCK_BITS
 	printk(KERN_DEBUG __FUNCTION__
-	       ": lock status after, ret=%d\n", ret);
+	       "%s: lock status after, ret=%d\n", __FUNCTION__, ret);
 	cfi_intelext_varsize_frob(mtd, do_printlockstatus_oneblock,
 				  ofs, len, 0);
 #endif
@@ -1583,9 +1582,8 @@
 	int ret;
 
 #ifdef DEBUG_LOCK_BITS
-	printk(KERN_DEBUG __FUNCTION__ 
-	       ": lock status before, ofs=0x%08llx, len=0x%08X\n",
-	       ofs, len);
+	printk(KERN_DEBUG "%s: lock status before, ofs=0x%08llx, len=0x%08X\n",
+	       __FUNCTION__, ofs, len);
 	cfi_intelext_varsize_frob(mtd, do_printlockstatus_oneblock,
 				  ofs, len, 0);
 #endif
@@ -1594,8 +1592,7 @@
 					ofs, len, DO_XXLOCK_ONEBLOCK_UNLOCK);
 	
 #ifdef DEBUG_LOCK_BITS
-	printk(KERN_DEBUG __FUNCTION__
-	       ": lock status after, ret=%d\n", ret);
+	printk(KERN_DEBUG "%s: lock status after, ret=%d\n", __FUNCTION__, ret);
 	cfi_intelext_varsize_frob(mtd, do_printlockstatus_oneblock, 
 				  ofs, len, 0);
 #endif