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

Commit 3570a3f9 authored by Steven Cahail's avatar Steven Cahail
Browse files

soc: qcom: glink: Use reinit_completion() instead of INIT_COMPLETION() 



Currently, G-Link uses the INIT_COMPLETION() call. This has been
deprecated in the 3.13 kernel and replaced with reinit_completion().

Define a macro that will make the G-Link code compatible with both
the 3.10 and 3.14 kernels.

Change-Id: Ib20ff5085adb58b1f257358244c0f3298cf5cadd
Signed-off-by: default avatarSteven Cahail <scahail@codeaurora.org>
parent 032ca0a8

drivers/soc/qcom/glink.c

+3 −3
Original line number Diff line number Diff line
@@ -1720,8 +1720,8 @@ static int glink_tx_common(void *handle, void *pkt_priv, 
			return -EAGAIN;

		} else {

			/* request intent of correct size */

			INIT_COMPLETION(ctx->int_req_ack_complete);

			INIT_COMPLETION(ctx->int_req_complete);

			reinit_completion(&ctx->int_req_ack_complete);

			reinit_completion(&ctx->int_req_complete);

			ret = ctx->transport_ptr->ops->tx_cmd_rx_intent_req(

				ctx->transport_ptr->ops, ctx->lcid, size);

			if (ret)
@@ -1740,7 +1740,7 @@ static int glink_tx_common(void *handle, void *pkt_priv, 
			/* wait for the rx_intent from remote side */

			do {

				wait_for_completion(&ctx->int_req_complete);

				INIT_COMPLETION(ctx->int_req_complete);

				reinit_completion(&ctx->int_req_complete);

			} while (ch_pop_remote_rx_intent(ctx, size, &riid));

		}

	}

drivers/soc/qcom/glink_private.h

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ 
#ifndef _SOC_QCOM_GLINK_PRIVATE_H_

#define _SOC_QCOM_GLINK_PRIVATE_H_



#ifdef INIT_COMPLETION

#define reinit_completion(x) INIT_COMPLETION(*(x))

#endif /* INIT_COMPLETION */



/* Logging Macros */

enum {

	QCOM_GLINK_INFO = 1U << 0,