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

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

Merge "msm: ipa: Fix several string format errors"

parents 2351f0f3 d6b38125

drivers/platform/msm/gsi/gsi.c

+1 −1
Original line number Diff line number Diff line
@@ -3285,7 +3285,7 @@ int gsi_is_channel_empty(unsigned long chan_hdl, bool *is_empty) 
	spin_unlock_irqrestore(slock, flags);



	if (ctx->props.dir == GSI_CHAN_DIR_FROM_GSI && ctx->evtr)

		GSIDBG("ch=%lu ev=%lu RP=0x%llx WP=0x%llx RP_LOCAL=0x%llx\n",

		GSIDBG("ch=%ld ev=%d RP=0x%llx WP=0x%llx RP_LOCAL=0x%llx\n",

			chan_hdl, ctx->evtr->id, rp, wp, rp_local);

	else

		GSIDBG("ch=%lu RP=0x%llx WP=0x%llx RP_LOCAL=0x%llx\n",

drivers/platform/msm/ipa/ipa_v3/ipa.c

+3 −3
Original line number Diff line number Diff line
@@ -6519,10 +6519,10 @@ static int ipa_smmu_ap_cb_probe(struct device *dev) 
	ret = of_property_read_u32(dev->of_node, "qcom,ipa-q6-smem-size",

					&ipa_smem_size);

	if (ret) {

		IPADBG("ipa q6 smem size (default) = %zu\n", IPA_SMEM_SIZE);

		IPADBG("ipa q6 smem size (default) = %u\n", IPA_SMEM_SIZE);

		ipa_smem_size = IPA_SMEM_SIZE;

	} else {

		IPADBG("ipa q6 smem size = %zu\n", ipa_smem_size);

		IPADBG("ipa q6 smem size = %u\n", ipa_smem_size);

	}



	/* map SMEM memory for IPA table accesses */
@@ -6544,7 +6544,7 @@ static int ipa_smmu_ap_cb_probe(struct device *dev) 
		return -EFAULT;

	}

	if (smem_size != ipa_smem_size)

		IPAERR("unexpected read q6 smem size %zu %zu\n",

		IPAERR("unexpected read q6 smem size %zu %u\n",

			smem_size, ipa_smem_size);



	iova = qcom_smem_virt_to_phys(smem_addr);