dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

[PATCH] 64bit resource: fix up printks for resources in mtd drivers

Browse source 
This is needed if we wish to change the size of the resource structures.

Based on an original patch from Vivek Goyal <vgoyal@in.ibm.com>

Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2006-06-12 15:15:17 -07:00
parent 1396a8c3f7
commit 176dfc633b
5 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/mtd/devices/pmc551.c
View file

@ -551,11 +551,11 @@ static u32 fixup_pmc551 (struct pci_dev *dev)
/* /*
* Some screen fun * Some screen fun
*/ */
printk(KERN_DEBUG "pmc551: %d%c (0x%x) of %sprefetchable memory at 0x%lx\n", printk(KERN_DEBUG "pmc551: %d%c (0x%x) of %sprefetchable memory at 0x%llx\n",
(size<1024)?size:(size<1048576)?size>>10:size>>20, (size<1024)?size:(size<1048576)?size>>10:size>>20,
(size<1024)?'B':(size<1048576)?'K':'M', (size<1024)?'B':(size<1048576)?'K':'M',
size, ((dcmd&(0x1<<3)) == 0)?"non-":"", size, ((dcmd&(0x1<<3)) == 0)?"non-":"",
(dev->resource[0].start)&PCI_BASE_ADDRESS_MEM_MASK ); (unsigned long long)((dev->resource[0].start)&PCI_BASE_ADDRESS_MEM_MASK));
/* /*
* Check to see the state of the memory * Check to see the state of the memory
@ -685,8 +685,8 @@ static int __init init_pmc551(void)
break; break;
} }
printk(KERN_NOTICE "pmc551: Found PCI V370PDC at 0x%lX\n", printk(KERN_NOTICE "pmc551: Found PCI V370PDC at 0x%llx\n",
PCI_Device->resource[0].start); (unsigned long long)PCI_Device->resource[0].start);
/* /*
* The PMC551 device acts VERY weird if you don't init it * The PMC551 device acts VERY weird if you don't init it

5
drivers/mtd/maps/amd76xrom.c
View file

@ -123,9 +123,10 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
window->rsrc.parent = NULL; window->rsrc.parent = NULL;
printk(KERN_ERR MOD_NAME printk(KERN_ERR MOD_NAME
" %s(): Unable to register resource" " %s(): Unable to register resource"
" 0x%.08lx-0x%.08lx - kernel bug?\n", " 0x%.16llx-0x%.16llx - kernel bug?\n",
__func__, __func__,
window->rsrc.start, window->rsrc.end); (unsigned long long)window->rsrc.start,
(unsigned long long)window->rsrc.end);
} }
#if 0 #if 0

5
drivers/mtd/maps/ichxrom.c
View file

@ -177,9 +177,10 @@ static int __devinit ichxrom_init_one (struct pci_dev *pdev,
window->rsrc.parent = NULL; window->rsrc.parent = NULL;
printk(KERN_DEBUG MOD_NAME printk(KERN_DEBUG MOD_NAME
": %s(): Unable to register resource" ": %s(): Unable to register resource"
" 0x%.08lx-0x%.08lx - kernel bug?\n", " 0x%.16llx-0x%.16llx - kernel bug?\n",
__func__, __func__,
window->rsrc.start, window->rsrc.end); (unsigned long long)window->rsrc.start,
(unsigned long long)window->rsrc.end);
} }
/* Map the firmware hub into my address space. */ /* Map the firmware hub into my address space. */

5
drivers/mtd/maps/scx200_docflash.c
View file

@ -164,8 +164,9 @@ static int __init init_scx200_docflash(void)
outl(pmr, scx200_cb_base + SCx200_PMR); outl(pmr, scx200_cb_base + SCx200_PMR);
} }
printk(KERN_INFO NAME ": DOCCS mapped at 0x%lx-0x%lx, width %d\n", printk(KERN_INFO NAME ": DOCCS mapped at 0x%llx-0x%llx, width %d\n",
docmem.start, docmem.end, width); (unsigned long long)docmem.start,
(unsigned long long)docmem.end, width);
scx200_docflash_map.size = size; scx200_docflash_map.size = size;
if (width == 8) if (width == 8)

5
drivers/mtd/maps/sun_uflash.c
View file

@ -62,9 +62,10 @@ int uflash_devinit(struct linux_ebus_device *edev, struct device_node *dp)
/* Non-CFI userflash device-- once I find one we /* Non-CFI userflash device-- once I find one we
* can work on supporting it. * can work on supporting it.
*/ */
printk("%s: unsupported device at 0x%lx (%d regs): " \ printk("%s: unsupported device at 0x%llx (%d regs): " \
"email ebrower@usa.net\n", "email ebrower@usa.net\n",
dp->full_name, res->start, edev->num_addrs); dp->full_name, (unsigned long long)res->start,
edev->num_addrs);
return -ENODEV; return -ENODEV;
} }