Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 231680
b: refs/heads/master
c: f9a5279
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and David Woodhouse committed Dec 3, 2010
1 parent 3390df4 commit 0dedca5
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 29 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9118ea321ee320e3c670540122857ff0eba91e32
refs/heads/master: f9a5279c70af10e967872e922b91310a91f87b05
7 changes: 2 additions & 5 deletions trunk/drivers/mtd/maps/amd76xrom.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,8 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
if (request_resource(&iomem_resource, &window->rsrc)) {
window->rsrc.parent = NULL;
printk(KERN_ERR MOD_NAME
" %s(): Unable to register resource"
" 0x%.16llx-0x%.16llx - kernel bug?\n",
__func__,
(unsigned long long)window->rsrc.start,
(unsigned long long)window->rsrc.end);
" %s(): Unable to register resource %pR - kernel bug?\n",
__func__, &window->rsrc);
}


Expand Down
7 changes: 2 additions & 5 deletions trunk/drivers/mtd/maps/ck804xrom.c
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,8 @@ static int __devinit ck804xrom_init_one (struct pci_dev *pdev,
if (request_resource(&iomem_resource, &window->rsrc)) {
window->rsrc.parent = NULL;
printk(KERN_ERR MOD_NAME
" %s(): Unable to register resource"
" 0x%.016llx-0x%.016llx - kernel bug?\n",
__func__,
(unsigned long long)window->rsrc.start,
(unsigned long long)window->rsrc.end);
" %s(): Unable to register resource %pR - kernel bug?\n",
__func__, &window->rsrc);
}


Expand Down
9 changes: 3 additions & 6 deletions trunk/drivers/mtd/maps/esb2rom.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,9 @@ static int __devinit esb2rom_init_one(struct pci_dev *pdev,
window->rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
if (request_resource(&iomem_resource, &window->rsrc)) {
window->rsrc.parent = NULL;
printk(KERN_DEBUG MOD_NAME
": %s(): Unable to register resource"
" 0x%.08llx-0x%.08llx - kernel bug?\n",
__func__,
(unsigned long long)window->rsrc.start,
(unsigned long long)window->rsrc.end);
printk(KERN_DEBUG MOD_NAME ": "
"%s(): Unable to register resource %pR - kernel bug?\n",
__func__, &window->rsrc);
}

/* Map the firmware hub into my address space. */
Expand Down
9 changes: 3 additions & 6 deletions trunk/drivers/mtd/maps/ichxrom.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,9 @@ static int __devinit ichxrom_init_one (struct pci_dev *pdev,
window->rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
if (request_resource(&iomem_resource, &window->rsrc)) {
window->rsrc.parent = NULL;
printk(KERN_DEBUG MOD_NAME
": %s(): Unable to register resource"
" 0x%.16llx-0x%.16llx - kernel bug?\n",
__func__,
(unsigned long long)window->rsrc.start,
(unsigned long long)window->rsrc.end);
printk(KERN_DEBUG MOD_NAME ": "
"%s(): Unable to register resource %pR - kernel bug?\n",
__func__, &window->rsrc);
}

/* Map the firmware hub into my address space. */
Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/mtd/maps/physmap_of.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,7 @@ static int __devinit of_flash_probe(struct platform_device *dev,
continue;
}

dev_dbg(&dev->dev, "of_flash device: %.8llx-%.8llx\n",
(unsigned long long)res.start,
(unsigned long long)res.end);
dev_dbg(&dev->dev, "of_flash device: %pR\n", &res);

err = -EBUSY;
res_size = resource_size(&res);
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/mtd/maps/scx200_docflash.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,8 @@ static int __init init_scx200_docflash(void)
outl(pmr, scx200_cb_base + SCx200_PMR);
}

printk(KERN_INFO NAME ": DOCCS mapped at 0x%llx-0x%llx, width %d\n",
(unsigned long long)docmem.start,
(unsigned long long)docmem.end, width);
printk(KERN_INFO NAME ": DOCCS mapped at %pR, width %d\n",
&docmem, width);

scx200_docflash_map.size = size;
if (width == 8)
Expand Down

0 comments on commit 0dedca5

Please sign in to comment.