iommu: Use %pa and %zx instead of casting

printk supports using %pa for phys_addr_t and
%zx for size_t so use those instead of %lx and
casts to unsigned long.

Other miscellaneous changes around this:

Always use 0x%zx for size instead of one use of decimal.
Coalesce format and align arguments.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Joerg Roedel <joro@8bytes.org>

1 files changed, 10 insertions, 13 deletions

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index ab1fa19ddddb..fbe9ca734f8f 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -807,20 +807,18 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova,
          * size of the smallest page supported by the hardware
          */
         if (!IS_ALIGNED(iova | paddr | size, min_pagesz)) {
-                pr_err("unaligned: iova 0x%lx pa 0x%lx size 0x%lx min_pagesz "
-                        "0x%x\n", iova, (unsigned long)paddr,
-                        (unsigned long)size, min_pagesz);
+                pr_err("unaligned: iova 0x%lx pa 0x%pa size 0x%zx min_pagesz 0x%x\n",
+                       iova, &paddr, size, min_pagesz);
                 return -EINVAL;
         }
 
-        pr_debug("map: iova 0x%lx pa 0x%lx size 0x%lx\n", iova,
-                                (unsigned long)paddr, (unsigned long)size);
+        pr_debug("map: iova 0x%lx pa 0x%pa size 0x%zx\n", iova, &paddr, size);
 
         while (size) {
                 size_t pgsize = iommu_pgsize(domain, iova | paddr, size);
 
-                pr_debug("mapping: iova 0x%lx pa 0x%lx pgsize %lu\n", iova,
-                         (unsigned long)paddr, (unsigned long)pgsize);
+                pr_debug("mapping: iova 0x%lx pa 0x%pa pgsize 0x%zx\n",
+                         iova, &paddr, pgsize);
 
                 ret = domain->ops->map(domain, iova, paddr, pgsize, prot);
                 if (ret)
@@ -857,13 +855,12 @@ size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size)
          * by the hardware
          */
         if (!IS_ALIGNED(iova | size, min_pagesz)) {
-                pr_err("unaligned: iova 0x%lx size 0x%lx min_pagesz 0x%x\n",
-                                        iova, (unsigned long)size, min_pagesz);
+                pr_err("unaligned: iova 0x%lx size 0x%zx min_pagesz 0x%x\n",
+                       iova, size, min_pagesz);
                 return -EINVAL;
         }
 
-        pr_debug("unmap this: iova 0x%lx size 0x%lx\n", iova,
-                                                        (unsigned long)size);
+        pr_debug("unmap this: iova 0x%lx size 0x%zx\n", iova, size);
 
         /*
          * Keep iterating until we either unmap 'size' bytes (or more)
@@ -876,8 +873,8 @@ size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size)
                 if (!unmapped_page)
                         break;
 
-                pr_debug("unmapped: iova 0x%lx size %lx\n", iova,
-                                        (unsigned long)unmapped_page);
+                pr_debug("unmapped: iova 0x%lx size 0x%zx\n",
+                         iova, unmapped_page);
 
                 iova += unmapped_page;
                 unmapped += unmapped_page;