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

Commit 0fe45088 authored by Jordan Crouse's avatar Jordan Crouse
Browse files

msm: ipa4: Fix compile warnings 



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

 drivers/platform/msm/ipa/ipa_v3/ipa_wigig_i.c:34:
   format '%d' expects argument of type 'int', but argument 5 has type
     'long unsigned int' [-Werror=format=]
  IPADBG("val %d\n", val);

 drivers/platform/msm/ipa/ipa_v3/ipa_wigig_i.c:830:
   too many arguments for format [-Werror=format-extra-args]
    IPAERR(

 drivers/platform/msm/ipa/ipa_v3/ipa_wigig_i.c:972:
   format '%X' expects argument of type 'unsigned int', but argument 4 has
     type 'phys_addr_t {aka long long unsigned int}' [-Werror=format=]
    IPAERR(

 drivers/platform/msm/ipa/ipa_v3/ipa_wigig_i.c:1011:
   format '%X' expects argument of type 'unsigned int', but argument 4 has type
     'phys_addr_t {aka long long unsigned int}' [-Werror=format=]
    IPAERR(

 drivers/platform/msm/ipa/ipa_v3/ipa_wigig_i.c:1474:
   format '%d' expects argument of type 'int', but argument 6 has type
     'long unsigned int' [-Werror=format=]
   IPADBG("ring ch doorbell (0x%llX) TX %d\n", val,

Fixes: 247e2ea7 ("msm: ipa4: 11ad integration fixes")
Fixes: 5eb2a0fd ("msm: ipa4: add wigig client")
Change-Id: Ic0dedbad6c6fd0f4e0b4b6013aa26d7da847a4ab
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent da627679

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

+5 −5
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
static int ipa3_wigig_uc_loaded_handler(struct notifier_block *self,

	unsigned long val, void *data)

{

	IPADBG("val %d\n", val);

	IPADBG("val %ld\n", val);



	if (!ipa3_ctx) {

		IPAERR("IPA ctx is null\n");
@@ -828,7 +828,7 @@ int ipa3_conn_wigig_rx_pipe_i(void *in, struct ipa_wigig_conn_out_params *out) 
		if (

		IPA_WIGIG_MSB(input->dbuff.data_buffer_base_pa) & 0xFFFFFF00) {

			IPAERR(

				"data_buffers_base_address_msb is over the 8 bit limit (0xpa)\n"

				"data_buffers_base_address_msb is over the 8 bit limit (0x%pa)\n"

				, &input->dbuff.data_buffer_base_pa);

			IPA_ACTIVE_CLIENTS_DEC_SIMPLE();

			return -EFAULT;
@@ -970,7 +970,7 @@ int ipa3_conn_wigig_client_i(void *in, struct ipa_wigig_conn_out_params *out) 
			!= IPA_WIGIG_8_MSB(

				input_smmu->pipe_smmu.status_ring_HWTAIL_pa)) {

			IPAERR(

				"status ring HWHEAD and HWTAIL differ in 8 MSbs head 0x%X tail 0x%X\n"

				"status ring HWHEAD and HWTAIL differ in 8 MSbs head 0x%llX tail 0x%llX\n"

			, input_smmu->pipe_smmu.status_ring_HWHEAD_pa,

			input_smmu->pipe_smmu.status_ring_HWTAIL_pa);

			return -EFAULT;
@@ -1009,7 +1009,7 @@ int ipa3_conn_wigig_client_i(void *in, struct ipa_wigig_conn_out_params *out) 
			!= IPA_WIGIG_8_MSB(

				input->pipe.status_ring_HWTAIL_pa)) {

			IPAERR(

				"status ring HWHEAD and HWTAIL differ in 8 MSbs head 0x%X tail 0x%X\n"

				"status ring HWHEAD and HWTAIL differ in 8 MSbs head 0x%llX tail 0x%llX\n"

				, input->pipe.status_ring_HWHEAD_pa,

				input->pipe.status_ring_HWTAIL_pa);

			return -EFAULT;
@@ -1471,7 +1471,7 @@ int ipa3_enable_wigig_pipe_i(enum ipa_client_type client) 
			ep->gsi_mem_info.chan_ring_len -

			IPA_WIGIG_DESC_RING_EL_SIZE;



		IPADBG("ring ch doorbell (0x%llX) TX %d\n", val,

		IPADBG("ring ch doorbell (0x%llX) TX %ld\n", val,

			ep->gsi_chan_hdl);

		res = gsi_ring_ch_ring_db(ep->gsi_chan_hdl, val);

		if (res) {