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

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

Merge "msm: ipa: Fix IPA driver compilation issues on sdxprairie"

parents 217ec9d5 1a070795

drivers/platform/msm/gsi/gsi.c

+5 −2
Original line number Diff line number Diff line
@@ -369,6 +369,8 @@ uint16_t gsi_find_idx_from_addr(struct gsi_ring_ctx *ctx, uint64_t addr) 
static uint16_t gsi_get_complete_num(struct gsi_ring_ctx *ctx, uint64_t addr1,

		uint64_t addr2)

{

	uint32_t addr_diff;



	WARN(addr1 < ctx->base || addr1 >= ctx->end,

		"address not in range. base 0x%llx end 0x%llx addr 0x%llx\n",

		ctx->base, ctx->end, addr1);
@@ -376,10 +378,11 @@ static uint16_t gsi_get_complete_num(struct gsi_ring_ctx *ctx, uint64_t addr1, 
		"address not in range. base 0x%llx end 0x%llx addr 0x%llx\n",

		ctx->base, ctx->end, addr2);



	addr_diff = (uint32_t)(addr2 - addr1);

	if (addr1 < addr2)

		return (addr2 - addr1) / ctx->elem_sz;

		return addr_diff / ctx->elem_sz;

	else

		return (addr2 - addr1 + ctx->len) / ctx->elem_sz;

		return (addr_diff + ctx->len) / ctx->elem_sz;

}



static void gsi_process_chan(struct gsi_xfer_compl_evt *evt,

drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.h

+2 −2
Original line number Diff line number Diff line
@@ -421,13 +421,13 @@ static inline int ipa3_qmi_stop_data_qouta(void) 


static inline void ipa3_q6_handshake_complete(bool ssr_bootup) { }



static int ipa3_qmi_send_mhi_ready_indication(

static inline int ipa3_qmi_send_mhi_ready_indication(

	struct ipa_mhi_ready_indication_msg_v01 *req)

{

	return -EPERM;

}



static int ipa3_qmi_send_mhi_cleanup_request(

static inline int ipa3_qmi_send_mhi_cleanup_request(

	struct ipa_mhi_cleanup_req_msg_v01 *req)

{

	return -EPERM;