Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228273
b: refs/heads/master
c: d1f521c
h: refs/heads/master
i:
  228271: 4c9862f
v: v3
  • Loading branch information
Peter Huewe authored and Greg Kroah-Hartman committed Dec 2, 2010
1 parent 8eb32de commit 5423c8c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 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: dda16b23e32cf2351aa03590f43cc8a2873dc6a9
refs/heads/master: d1f521c16a4d7e46bbb9c6968076f80be995e0ed
12 changes: 6 additions & 6 deletions trunk/drivers/staging/sep/sep_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ static int sep_load_firmware(struct sep_device *sep)
sep->resident_addr);
dev_dbg(&sep->pdev->dev, "resident bus is %lx\n",
(unsigned long)sep->resident_bus);
dev_dbg(&sep->pdev->dev, "resident size is %08x\n",
dev_dbg(&sep->pdev->dev, "resident size is %08zx\n",
sep->resident_size);

/* Set addresses for dcache (no loading needed) */
Expand Down Expand Up @@ -144,7 +144,7 @@ static int sep_load_firmware(struct sep_device *sep)
sep->cache_addr);
dev_dbg(&sep->pdev->dev, "cache bus is %08lx\n",
(unsigned long)sep->cache_bus);
dev_dbg(&sep->pdev->dev, "cache size is %08x\n",
dev_dbg(&sep->pdev->dev, "cache size is %08zx\n",
sep->cache_size);

/* Set addresses and load extapp */
Expand All @@ -165,7 +165,7 @@ static int sep_load_firmware(struct sep_device *sep)
sep->extapp_addr);
dev_dbg(&sep->pdev->dev, "extapp bus is %08llx\n",
(unsigned long long)sep->extapp_bus);
dev_dbg(&sep->pdev->dev, "extapp size is %08x\n",
dev_dbg(&sep->pdev->dev, "extapp size is %08zx\n",
sep->extapp_size);

return error;
Expand Down Expand Up @@ -205,7 +205,7 @@ static int sep_map_and_alloc_shared_area(struct sep_device *sep)
return -ENOMEM;
}
dev_dbg(&sep->pdev->dev,
"shared_addr %x bytes @%p (bus %llx)\n",
"shared_addr %zx bytes @%p (bus %llx)\n",
sep->shared_size, sep->shared_addr,
(unsigned long long)sep->shared_bus);
return 0;
Expand Down Expand Up @@ -3290,7 +3290,7 @@ static int sep_callback(unsigned long sep_context_pointer)
error = -ENOMEM;
goto end_function;
}
dev_dbg(&sep->pdev->dev, "rar start is %p, phy is %llx, size is %x\n",
dev_dbg(&sep->pdev->dev, "rar start is %p, phy is %llx, size is %zx\n",
sep->rar_addr, (unsigned long long)sep->rar_bus,
sep->rar_size);

Expand Down Expand Up @@ -3537,7 +3537,7 @@ static int __devinit sep_probe(struct pci_dev *pdev,
}

dev_dbg(&sep->pdev->dev, "rar start is %p, phy is %llx,"
" size is %x\n", sep->rar_addr,
" size is %zx\n", sep->rar_addr,
(unsigned long long)sep->rar_bus,
sep->rar_size);
}
Expand Down

0 comments on commit 5423c8c

Please sign in to comment.