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

Commit a5d36bfa authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: Fix compile warnings"

parents 161fcfb9 94d59b1b

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++) {

drivers/platform/msm/gsi/gsi.c

+2 −2
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static void gsi_channel_state_change_wait(unsigned long chan_hdl, 
			return;

		}



		GSIDBG("GSI wait on chan_hld=%lu irqtyp=%lu state=%u intr=%u\n",

		GSIDBG("GSI wait on chan_hld=%lu irqtyp=%u state=%u intr=%u\n",

			chan_hdl,

			type,

			ctx->state,
@@ -4165,7 +4165,7 @@ void gsi_wdi3_dump_register(unsigned long chan_hdl) 
		pr_err("%s:%d gsi context not allocated\n", __func__, __LINE__);

		return;

	}

	GSIDBG("reg dump ch id %d\n", chan_hdl);

	GSIDBG("reg dump ch id %ld\n", chan_hdl);

	val = gsi_readl(gsi_ctx->base +

		GSI_EE_n_GSI_CH_k_CNTXT_0_OFFS(chan_hdl,

			gsi_ctx->per.ee));