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

Commit 3990cb46 authored by Sudheer Papothi's avatar Sudheer Papothi Committed by Banajit Goswami
Browse files

ASoC: msm: qdsp6v2: delete ocmem drivers 



ocmem drivers are deprecated, no plan to use in future.

Change-Id: Ie61f0b0bd404b8fdeee44d7839f6509e70776a9c
Signed-off-by: default avatarFred Oh <fred@codeaurora.org>
Signed-off-by: default avatarSudheer Papothi <spapothi@codeaurora.org>
Signed-off-by: default avatarBanajit Goswami <bgoswami@codeaurora.org>
parent 5f0dbe99

sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c

+0 −21
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include <sound/msm-dts-eagle.h>



#include "msm-pcm-routing-v2.h"

#include "audio_ocmem.h"



#define DSP_PP_BUFFERING_IN_MSEC	25

#define PARTIAL_DRAIN_ACK_EARLY_BY_MSEC	150
@@ -108,7 +107,6 @@ static unsigned int supported_sample_rates[] = { 
};



struct msm_compr_pdata {

	atomic_t audio_ocmem_req;

	struct snd_compr_stream *cstream[MSM_FRONTEND_DAI_MAX];

	uint32_t volume[MSM_FRONTEND_DAI_MAX][2]; /* For both L & R */

	struct msm_compr_audio_effects *audio_effects[MSM_FRONTEND_DAI_MAX];
@@ -1105,17 +1103,6 @@ static int msm_compr_open(struct snd_compr_stream *cstream) 
	runtime->private_data = prtd;

	populate_codec_list(prtd);



	if (cstream->direction == SND_COMPRESS_PLAYBACK) {

		if (!atomic_cmpxchg(&pdata->audio_ocmem_req, 0, 1))

			audio_ocmem_process_req(AUDIO, true);

		else

			atomic_inc(&pdata->audio_ocmem_req);

		pr_debug("%s: ocmem_req: %d\n", __func__,

				atomic_read(&pdata->audio_ocmem_req));

	} else {

		pr_err("%s: Unsupported stream type", __func__);

	}



	return 0;

}
@@ -1195,16 +1182,10 @@ static int msm_compr_free(struct snd_compr_stream *cstream) 


	pdata->cstream[soc_prtd->dai_link->be_id] = NULL;

	if (cstream->direction == SND_COMPRESS_PLAYBACK) {

		if (atomic_read(&pdata->audio_ocmem_req) > 1)

			atomic_dec(&pdata->audio_ocmem_req);

		else if (atomic_cmpxchg(&pdata->audio_ocmem_req, 1, 0))

			audio_ocmem_process_req(AUDIO, false);

		msm_pcm_routing_dereg_phy_stream(soc_prtd->dai_link->be_id,

						SNDRV_PCM_STREAM_PLAYBACK);

	}



	pr_debug("%s: ocmem_req: %d\n", __func__,

		atomic_read(&pdata->audio_ocmem_req));

	q6asm_audio_client_buf_free_contiguous(dir, ac);



	q6asm_audio_client_free(ac);
@@ -2750,8 +2731,6 @@ static int msm_compr_probe(struct snd_soc_platform *platform) 


	snd_soc_platform_set_drvdata(platform, pdata);



	atomic_set(&pdata->audio_ocmem_req, 0);



	for (i = 0; i < MSM_FRONTEND_DAI_MAX; i++) {

		pdata->volume[i][0] = COMPRESSED_LR_VOL_MAX_STEPS;

		pdata->volume[i][1] = COMPRESSED_LR_VOL_MAX_STEPS;