Commit 6135a891 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Joerg Roedel
Browse files

iommu/omap: Fix printing format for size_t on 64-bit 



Print size_t as %zu or %zx to fix -Wformat warnings when compiling on
64-bit platform (e.g. with COMPILE_TEST):

    drivers/iommu/omap-iommu.c: In function ‘flush_iotlb_page’:
    drivers/iommu/omap-iommu.c:437:47: warning:
        format ‘%x’ expects argument of type ‘unsigned int’,
        but argument 7 has type ‘size_t {aka long unsigned int}’ [-Wformat=]

Acked-by: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent f2ce16c3

drivers/iommu/omap-iommu.c

+4 −4
Original line number Diff line number Diff line
@@ -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++) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE