Skip to contentSkip to conversation

pcmcia: fix i82092 printk format

PATCH In review Randy Dunlap 2 participants 2 messages Feb 8, 2008 Pcmcia

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pcmcia: fix i82092 printk format

From: Randy Dunlap <[email protected]>

Fix printk format warnings:
linux-2.6.24-git19/drivers/pcmcia/i82092.c:650: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'resource_size_t' linux-2.6.24-git19/drivers/pcmcia/i82092.c:650: warning: format '%lx' expects type 'long unsigned int', but argument 4 has type 'resource_size_t'

Fix very long source line size.
Fix spacing within the printk format string.

---
 drivers/pcmcia/i82092.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pcmcia/i82092.c +3 -1
@@ -647,7 +647,9 @@ static int i82092aa_set_mem_map(struct p
 	if ( (mem->card_start > 0x3ffffff) || (region.start > region.end) ||
 	     (mem->speed > 1000) ) {
 		leave("i82092aa_set_mem_map: invalid address / speed");
-		printk("invalid mem map for socket %i : %lx to %lx with a start of %x \n",sock,region.start, region.end, mem->card_start);
+		printk("invalid mem map for socket %i: %llx to %llx with a start of %x\n",
+			sock, (unsigned long long)region.start,
+			(unsigned long long)region.end, mem->card_start);
 		return -EINVAL;
 	}
 	
#1 lore raw
Quoted 17 lines · On Fri, 8 Feb 2008 15:22:44 -0800 Randy Dunlap <[email protected]> wrote:

From: Randy Dunlap <[email protected]>

Fix printk format warnings:
linux-2.6.24-git19/drivers/pcmcia/i82092.c:650: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'resource_size_t' linux-2.6.24-git19/drivers/pcmcia/i82092.c:650: warning: format '%lx' expects type 'long unsigned int', but argument 4 has type 'resource_size_t'

Fix very long source line size.
Fix spacing within the printk format string.

---
 drivers/pcmcia/i82092.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

drivers/pcmcia/i82092.c static int i82092aa_set_mem_map(struct p · line 655

Quoted 10 lines
drivers/pcmcia/i82092.c +3 -1
@@ -647,7 +647,9 @@ static int i82092aa_set_mem_map(struct p
 	if ( (mem->card_start > 0x3ffffff) || (region.start > region.end) ||
 	     (mem->speed > 1000) ) {
 		leave("i82092aa_set_mem_map: invalid address / speed");
-		printk("invalid mem map for socket %i : %lx to %lx with a start of %x \n",sock,region.start, region.end, mem->card_start);
+		printk("invalid mem map for socket %i: %llx to %llx with a start of %x\n",
+			sock, (unsigned long long)region.start,
+			(unsigned long long)region.end, mem->card_start);
 		return -EINVAL;
 	}
 

I've apleady sent a similar patch to Greg (drivers-pcmcia-i82092c-fix-up-after-pci_bus_region-changes.patch) but I imagine he's swamped with -stable fun and games at present.