0x%ld

[David Woodhouse <dwmw2@xxxxxxx.org>]

I finally got annoyed with the existence of "0x%ld" in printk formats, and 
applied this.


Index: intrep.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs/intrep.c,v
retrieving revision 1.22
diff -u -w -r1.22 intrep.c
--- intrep.c	2000/07/19 14:17:59	1.22
+++ intrep.c	2000/07/26 15:01:33
@@ -321,7 +321,7 @@
 		remove_wait_queue(&wait_q, &wait);
 		kfree(erase);
 
-		printk(KERN_WARNING "flash: erase of region [0x%ld, 0x%ld] "
+		printk(KERN_WARNING "flash: erase of region [0x%lx, 0x%lx] "
 		       "totally failed\n", (long)start, (long)start + size);
 
 		return -1;
@@ -602,7 +602,7 @@
 	loff_t start;
 	loff_t end = fmc->flash_start + fmc->flash_size;
 
-	D1(printk("jffs_scan_flash(): start pos = 0x%ld, end = 0x%ld\n",
+	D1(printk("jffs_scan_flash(): start pos = 0x%lx, end = 0x%lx\n",
 		  (long)pos, (long)end));
 
 	flash_safe_acquire(fmc->mtd);
@@ -619,25 +619,25 @@
 			/* We have found 0xff at this position.  We have to
 			   scan the rest of the flash till the end or till
 			   something else than 0xff is found.  */
-			D1(printk("jffs_scan_flash(): 0xff at pos 0x%ld.\n",
+			D1(printk("jffs_scan_flash(): 0xff at pos 0x%lx.\n",
 				  (long)pos));
 			for (; pos < end
 			       && JFFS_EMPTY_BITMASK == flash_read_u32(fmc->mtd, pos);
 			     pos += 4);
 			D1(printk("jffs_scan_flash(): 0xff ended at "
-				  "pos 0x%ld.\n", (long)pos));
+				  "pos 0x%lx.\n", (long)pos));
 			continue;
 
 		case JFFS_DIRTY_BITMASK:
 			/* We have found 0x00 at this position.  Scan as far
 			   as possible to find out how much is dirty.  */
-			D1(printk("jffs_scan_flash(): 0x00 at pos 0x%ld.\n",
+			D1(printk("jffs_scan_flash(): 0x00 at pos 0x%lx.\n",
 				  (long)pos));
 			for (; pos < end
 			       && JFFS_DIRTY_BITMASK == flash_read_u32(fmc->mtd, pos);
 			     pos += 4);
 			D1(printk("jffs_scan_flash(): 0x00 ended at "
-				  "pos 0x%ld.\n", (long)pos));
+				  "pos 0x%lx.\n", (long)pos));
 			jffs_fmalloced(fmc, (__u32) start,
 				       (__u32) (pos - start), 0);
 			continue;
@@ -652,7 +652,7 @@
 			   to scan for the magic pattern.  */
 			D1(printk("*************** Dirty flash memory or "
 				  "bad inode: "
-				  "hexdump(pos = 0x%ld, len = 128):\n",
+				  "hexdump(pos = 0x%lx, len = 128):\n",
 				  (long)pos));
 			D1(jffs_hexdump(fmc->mtd, pos, 128));
 			for (pos += 4; pos < end; pos += 4) {
@@ -698,7 +698,7 @@
 		raw_inode.accurate = tmp_accurate;
 		raw_inode.chksum = tmp_chksum;
 
-		D3(printk("*** We have found this raw inode at pos 0x%ld "
+		D3(printk("*** We have found this raw inode at pos 0x%lx "
 			  "on the flash:\n", (long)pos));
 		D3(jffs_print_raw_inode(&raw_inode));
 
@@ -1405,7 +1405,7 @@
 	raw_inode->accurate = 0xff;
 
 	D3(printk("jffs_write_node(): About to write this raw inode to the "
-		  "flash at pos 0x%ld:\n", (long)pos));
+		  "flash at pos 0x%lx:\n", (long)pos));
 	D3(jffs_print_raw_inode(raw_inode));
 
 	/* Step 1: Write the raw jffs inode to the flash.  */
@@ -2585,7 +2585,7 @@
 
 		for (; pos < end; pos += 4) {
 			if (*(__u32 *)pos != JFFS_EMPTY_BITMASK) {
-				printk("JFFS: Erase failed! pos = 0x%ld\n",
+				printk("JFFS: Erase failed! pos = 0x%lx\n",
 				       (long)pos);
 				jffs_hexdump(fmc->mtd, pos,
 					     jffs_min(256, end - pos));


--
dwmw2