Merge tag 'block-5.7-2020-04-10' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / iommu / omap-iommu.c

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index be551cc..887fefc 100644 (file)
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -167,7 +167,7 @@ static int omap2_iommu_enable(struct omap_iommu *obj)
 {
        u32 l, pa;
 
-       if (!obj->iopgd || !IS_ALIGNED((u32)obj->iopgd,  SZ_16K))
+       if (!obj->iopgd || !IS_ALIGNED((unsigned long)obj->iopgd,  SZ_16K))
                return -EINVAL;
 
        pa = virt_to_phys(obj->iopgd);
@@ -434,7 +434,7 @@ static void flush_iotlb_page(struct omap_iommu *obj, u32 da)
                bytes = iopgsz_to_bytes(cr.cam & 3);
 
                if ((start <= da) && (da < start + bytes)) {
-                       dev_dbg(obj->dev, "%s: %08x<=%08x(%x)\n",
+                       dev_dbg(obj->dev, "%s: %08x<=%08x(%zx)\n",
                                __func__, start, da, bytes);
                        iotlb_load_cr(obj, &cr);
                        iommu_write_reg(obj, 1, MMU_FLUSH_ENTRY);
@@ -1352,11 +1352,11 @@ static int omap_iommu_map(struct iommu_domain *domain, unsigned long da,
 
        omap_pgsz = bytes_to_iopgsz(bytes);
        if (omap_pgsz < 0) {
-               dev_err(dev, "invalid size to map: %d\n", bytes);
+               dev_err(dev, "invalid size to map: %zu\n", bytes);
                return -EINVAL;
        }
 
-       dev_dbg(dev, "mapping da 0x%lx to pa %pa size 0x%x\n", da, &pa, bytes);
+       dev_dbg(dev, "mapping da 0x%lx to pa %pa size 0x%zx\n", da, &pa, bytes);
 
        iotlb_init_entry(&e, da, pa, omap_pgsz);
 
@@ -1393,7 +1393,7 @@ static size_t omap_iommu_unmap(struct iommu_domain *domain, unsigned long da,
        size_t bytes = 0;
        int i;
 
-       dev_dbg(dev, "unmapping da 0x%lx size %u\n", da, size);
+       dev_dbg(dev, "unmapping da 0x%lx size %zu\n", da, size);
 
        iommu = omap_domain->iommus;
        for (i = 0; i < omap_domain->num_iommus; i++, iommu++) {