Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e368dcad authored by Jordan Crouse's avatar Jordan Crouse
Browse files

msm: npu: Fix compile warnings 



Fix the following compiler warning(s) from gcc 6.1.1 with -Werror enabled:

 drivers/media/platform/msm/npu/npu_dev.c:1635:
   format '%x' expects argument of type 'unsigned int', but argument 3 has
     type 'resource_size_t {aka long long unsigned int}' [-Werror=format=]
  pr_debug("qdsp phy address=0x%x virt=%pK\n",

 drivers/media/platform/msm/npu/npu_dev.c:1654:
   format '%x' expects argument of type 'unsigned int', but argument 3 has
     type 'resource_size_t {aka long long unsigned int}' [-Werror=format=]
  pr_debug("apss_shared phy address=0x%x virt=%pK\n",

Fixes: 1142b662 ("msm: npu: Add NPU support for Kona")
Change-Id: Ic0dedbad35b271e91f881a4e73536ef3a9212801
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent b1d3f812

drivers/media/platform/msm/npu/npu_dev.c

+2 −2
Original line number Diff line number Diff line
@@ -1660,7 +1660,7 @@ static int npu_probe(struct platform_device *pdev) 
		rc = -ENOMEM;

		goto error_get_dev_num;

	}

	pr_debug("qdsp phy address=0x%x virt=%pK\n",

	pr_debug("qdsp phy address=0x%llx virt=%pK\n",

		res->start, npu_dev->qdsp_io.base);



	res = platform_get_resource_byname(pdev,
@@ -1679,7 +1679,7 @@ static int npu_probe(struct platform_device *pdev) 
		rc = -ENOMEM;

		goto error_get_dev_num;

	}

	pr_debug("apss_shared phy address=0x%x virt=%pK\n",

	pr_debug("apss_shared phy address=0x%llx virt=%pK\n",

		res->start, npu_dev->apss_shared_io.base);



	res = platform_get_resource_byname(pdev,

drivers/media/platform/msm/npu/npu_hw_access.c

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ void npu_mem_write(struct npu_device *npu_dev, void *dst, void *src, 
	uint32_t i = 0;

	uint32_t num = 0;



	pr_debug("write dst_off %x size %x\n", dst_off, size);

	pr_debug("write dst_off %zx size %x\n", dst_off, size);

	num = size/4;

	for (i = 0; i < num; i++) {

		writel_relaxed(src_ptr32[i], npu_dev->tcm_io.base + dst_off);
@@ -130,7 +130,7 @@ int32_t npu_mem_read(struct npu_device *npu_dev, void *src, void *dst, 
	uint32_t i = 0;

	uint32_t num = 0;



	pr_debug("read src_off %x size %x\n", src_off, size);

	pr_debug("read src_off %zx size %x\n", src_off, size);



	num = size/4;

	for (i = 0; i < num; i++) {