aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-08-22 09:25:42 -0400
committerJoerg Roedel <joro@8bytes.org>2013-09-24 08:43:38 -0400
commitabedb049c52ef77ce7b11b915a4e7e6abd3985cb (patch)
treeb9ccd0d15a0318a15460fc7bddf4a2ee5cfb07b7
parent4a10c2ac2f368583138b774ca41fac4207911983 (diff)
iommu: No need to pass '0x' when '%pa' is used
Commit 6197ca82 (iommu: Use %pa and %zx instead of casting) introduced the usage of '%pa', but still kept the '0x', which leads to printing '0x0x'. Remove the '0x' when '%pa' is used. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Joerg Roedel <joro@8bytes.org>
-rw-r--r--drivers/iommu/iommu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index fbe9ca734f8f..06d36a0b1001 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -807,17 +807,17 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova,
807 * size of the smallest page supported by the hardware 807 * size of the smallest page supported by the hardware
808 */ 808 */
809 if (!IS_ALIGNED(iova | paddr | size, min_pagesz)) { 809 if (!IS_ALIGNED(iova | paddr | size, min_pagesz)) {
810 pr_err("unaligned: iova 0x%lx pa 0x%pa size 0x%zx min_pagesz 0x%x\n", 810 pr_err("unaligned: iova 0x%lx pa %pa size 0x%zx min_pagesz 0x%x\n",
811 iova, &paddr, size, min_pagesz); 811 iova, &paddr, size, min_pagesz);
812 return -EINVAL; 812 return -EINVAL;
813 } 813 }
814 814
815 pr_debug("map: iova 0x%lx pa 0x%pa size 0x%zx\n", iova, &paddr, size); 815 pr_debug("map: iova 0x%lx pa %pa size 0x%zx\n", iova, &paddr, size);
816 816
817 while (size) { 817 while (size) {
818 size_t pgsize = iommu_pgsize(domain, iova | paddr, size); 818 size_t pgsize = iommu_pgsize(domain, iova | paddr, size);
819 819
820 pr_debug("mapping: iova 0x%lx pa 0x%pa pgsize 0x%zx\n", 820 pr_debug("mapping: iova 0x%lx pa %pa pgsize 0x%zx\n",
821 iova, &paddr, pgsize); 821 iova, &paddr, pgsize);
822 822
823 ret = domain->ops->map(domain, iova, paddr, pgsize, prot); 823 ret = domain->ops->map(domain, iova, paddr, pgsize, prot);