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

Commit 438ca570 authored by Jeff Hugo's avatar Jeff Hugo
Browse files

msm: smem_log: Use smem_alloc() 



smem_alloc2() is deprecated.  Use the preferred function, smem_alloc(),
instead.

Change-Id: Ic7a7e3a15213353cfcb00d769376ed5375c18a26
Signed-off-by: default avatarJeffrey Hugo <jhugo@codeaurora.org>
parent c6f6c88f

arch/arm/mach-msm/smem_log.c

+24 −12
Original line number Diff line number Diff line
@@ -851,10 +851,14 @@ static int _smem_log_init(void) 


	inst[GEN].which_log = GEN;

	inst[GEN].events =

		(struct smem_log_item *)smem_alloc2(SMEM_SMEM_LOG_EVENTS,

						  SMEM_LOG_EVENTS_SIZE);

	inst[GEN].idx = (uint32_t *)smem_alloc2(SMEM_SMEM_LOG_IDX,

					     sizeof(uint32_t));

		(struct smem_log_item *)smem_alloc(SMEM_SMEM_LOG_EVENTS,

						  SMEM_LOG_EVENTS_SIZE,

						  0,

						  SMEM_ANY_HOST_FLAG);

	inst[GEN].idx = (uint32_t *)smem_alloc(SMEM_SMEM_LOG_IDX,

					     sizeof(uint32_t),

					     0,

					     SMEM_ANY_HOST_FLAG);

	if (!inst[GEN].events || !inst[GEN].idx)

		pr_info("%s: no log or log_idx allocated\n", __func__);
@@ -867,10 +871,14 @@ static int _smem_log_init(void) 
	inst[STA].which_log = STA;

	inst[STA].events =

		(struct smem_log_item *)

		smem_alloc2(SMEM_SMEM_STATIC_LOG_EVENTS,

			   SMEM_STATIC_LOG_EVENTS_SIZE);

	inst[STA].idx = (uint32_t *)smem_alloc2(SMEM_SMEM_STATIC_LOG_IDX,

						     sizeof(uint32_t));

		smem_alloc(SMEM_SMEM_STATIC_LOG_EVENTS,

			   SMEM_STATIC_LOG_EVENTS_SIZE,

			   0,

			   SMEM_ANY_HOST_FLAG);

	inst[STA].idx = (uint32_t *)smem_alloc(SMEM_SMEM_STATIC_LOG_IDX,

						     sizeof(uint32_t),

						     0,

						     SMEM_ANY_HOST_FLAG);

	if (!inst[STA].events || !inst[STA].idx)

		pr_info("%s: no static log or log_idx allocated\n", __func__);
@@ -883,10 +891,14 @@ static int _smem_log_init(void) 
	inst[POW].which_log = POW;

	inst[POW].events =

		(struct smem_log_item *)

		smem_alloc2(SMEM_SMEM_LOG_POWER_EVENTS,

			   SMEM_POWER_LOG_EVENTS_SIZE);

	inst[POW].idx = (uint32_t *)smem_alloc2(SMEM_SMEM_LOG_POWER_IDX,

						     sizeof(uint32_t));

		smem_alloc(SMEM_SMEM_LOG_POWER_EVENTS,

			   SMEM_POWER_LOG_EVENTS_SIZE,

			   0,

			   SMEM_ANY_HOST_FLAG);

	inst[POW].idx = (uint32_t *)smem_alloc(SMEM_SMEM_LOG_POWER_IDX,

						     sizeof(uint32_t),

						     0,

						     SMEM_ANY_HOST_FLAG);

	if (!inst[POW].events || !inst[POW].idx)

		pr_info("%s: no power log or log_idx allocated\n", __func__);