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

Commit 4984186d authored by Siena Richard's avatar Siena Richard Committed by Banajit Goswami
Browse files

ASoC: msm: return the latest app type cfg data set when get is called 



It is uncommon behavior to expect the caller of a get mixer control
to specify information. Return the last configuration information set
for the mixer control instead of expecting the caller to specify a
backend ID to get configuration information for.

CRs-Fixed: 2031732
Signed-off-by: default avatarSiena Richard <sienar@codeaurora.org>
Change-Id: Id1a5fd3e2cf9b7282df916c3973249137efde8c5
parent fa68d924

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

+28 −40
Original line number Diff line number Diff line
@@ -3444,21 +3444,18 @@ static int msm_compr_playback_app_type_cfg_put(struct snd_kcontrol *kcontrol, 
	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_RX;

	int be_id = ucontrol->value.integer.value[3];

	struct msm_pcm_stream_app_type_cfg cfg_data = {0, 0, 48000};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate = 48000;



	app_type = ucontrol->value.integer.value[0];

	acdb_dev_id = ucontrol->value.integer.value[1];

	cfg_data.app_type = ucontrol->value.integer.value[0];

	cfg_data.acdb_dev_id = ucontrol->value.integer.value[1];

	if (ucontrol->value.integer.value[2] != 0)

		sample_rate = ucontrol->value.integer.value[2];

		cfg_data.sample_rate = ucontrol->value.integer.value[2];

	pr_debug("%s: fe_id- %llu session_type- %d be_id- %d app_type- %d acdb_dev_id- %d sample_rate- %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

	ret = msm_pcm_routing_reg_stream_app_type_cfg(fe_id, session_type,

						      be_id, app_type,

						      acdb_dev_id, sample_rate);

						      be_id, &cfg_data);

	if (ret < 0)

		pr_err("%s: msm_pcm_routing_reg_stream_app_type_cfg failed returned %d\n",

			__func__, ret);
@@ -3471,28 +3468,25 @@ static int msm_compr_playback_app_type_cfg_get(struct snd_kcontrol *kcontrol, 
{

	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_RX;

	int be_id = ucontrol->value.integer.value[3];

	int be_id = 0;

	struct msm_pcm_stream_app_type_cfg cfg_data = {0};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate;



	ret = msm_pcm_routing_get_stream_app_type_cfg(fe_id, session_type,

						      be_id, &app_type,

						      &acdb_dev_id,

						      &sample_rate);

						      &be_id, &cfg_data);

	if (ret < 0) {

		pr_err("%s: msm_pcm_routing_get_stream_app_type_cfg failed returned %d\n",

			__func__, ret);

		goto done;

	}



	ucontrol->value.integer.value[0] = app_type;

	ucontrol->value.integer.value[1] = acdb_dev_id;

	ucontrol->value.integer.value[2] = sample_rate;

	ucontrol->value.integer.value[0] = cfg_data.app_type;

	ucontrol->value.integer.value[1] = cfg_data.acdb_dev_id;

	ucontrol->value.integer.value[2] = cfg_data.sample_rate;

	ucontrol->value.integer.value[3] = be_id;

	pr_debug("%s: fedai_id %llu, session_type %d, be_id %d, app_type %d, acdb_dev_id %d, sample_rate %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

done:

	return ret;

}
@@ -3503,21 +3497,18 @@ static int msm_compr_capture_app_type_cfg_put(struct snd_kcontrol *kcontrol, 
	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_TX;

	int be_id = ucontrol->value.integer.value[3];

	struct msm_pcm_stream_app_type_cfg cfg_data = {0, 0, 48000};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate = 48000;



	app_type = ucontrol->value.integer.value[0];

	acdb_dev_id = ucontrol->value.integer.value[1];

	cfg_data.app_type = ucontrol->value.integer.value[0];

	cfg_data.acdb_dev_id = ucontrol->value.integer.value[1];

	if (ucontrol->value.integer.value[2] != 0)

		sample_rate = ucontrol->value.integer.value[2];

		cfg_data.sample_rate = ucontrol->value.integer.value[2];

	pr_debug("%s: fe_id- %llu session_type- %d be_id- %d app_type- %d acdb_dev_id- %d sample_rate- %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

	ret = msm_pcm_routing_reg_stream_app_type_cfg(fe_id, session_type,

						      be_id, app_type,

						      acdb_dev_id, sample_rate);

						      be_id, &cfg_data);

	if (ret < 0)

		pr_err("%s: msm_pcm_routing_reg_stream_app_type_cfg failed returned %d\n",

			__func__, ret);
@@ -3530,28 +3521,25 @@ static int msm_compr_capture_app_type_cfg_get(struct snd_kcontrol *kcontrol, 
{

	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_TX;

	int be_id = ucontrol->value.integer.value[3];

	int be_id = 0;

	struct msm_pcm_stream_app_type_cfg cfg_data = {0};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate;



	ret = msm_pcm_routing_get_stream_app_type_cfg(fe_id, session_type,

						      be_id, &app_type,

						      &acdb_dev_id,

						      &sample_rate);

						      &be_id, &cfg_data);

	if (ret < 0) {

		pr_err("%s: msm_pcm_routing_get_stream_app_type_cfg failed returned %d\n",

			__func__, ret);

		goto done;

	}



	ucontrol->value.integer.value[0] = app_type;

	ucontrol->value.integer.value[1] = acdb_dev_id;

	ucontrol->value.integer.value[2] = sample_rate;

	ucontrol->value.integer.value[0] = cfg_data.app_type;

	ucontrol->value.integer.value[1] = cfg_data.acdb_dev_id;

	ucontrol->value.integer.value[2] = cfg_data.sample_rate;

	ucontrol->value.integer.value[3] = be_id;

	pr_debug("%s: fedai_id %llu, session_type %d, be_id %d, app_type %d, acdb_dev_id %d, sample_rate %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

done:

	return ret;

}

sound/soc/msm/qdsp6v2/msm-lsm-client.c

+14 −20
Original line number Diff line number Diff line
@@ -2243,21 +2243,18 @@ static int msm_lsm_app_type_cfg_ctl_put(struct snd_kcontrol *kcontrol, 
	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_TX;

	int be_id = ucontrol->value.integer.value[3];

	struct msm_pcm_stream_app_type_cfg cfg_data = {0};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate;



	app_type = ucontrol->value.integer.value[0];

	acdb_dev_id = ucontrol->value.integer.value[1];

	sample_rate = ucontrol->value.integer.value[2];

	cfg_data.app_type = ucontrol->value.integer.value[0];

	cfg_data.acdb_dev_id = ucontrol->value.integer.value[1];

	cfg_data.sample_rate = ucontrol->value.integer.value[2];



	pr_debug("%s: fe_id- %llu session_type- %d be_id- %d app_type- %d acdb_dev_id- %d sample_rate- %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

	ret = msm_pcm_routing_reg_stream_app_type_cfg(fe_id, session_type,

						      be_id, app_type,

						      acdb_dev_id, sample_rate);

						      be_id, &cfg_data);

	if (ret < 0)

		pr_err("%s: msm_pcm_routing_reg_stream_app_type_cfg failed returned %d\n",

			__func__, ret);
@@ -2270,28 +2267,25 @@ static int msm_lsm_app_type_cfg_ctl_get(struct snd_kcontrol *kcontrol, 
{

	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_TX;

	int be_id = ucontrol->value.integer.value[3];

	int be_id = 0;

	struct msm_pcm_stream_app_type_cfg cfg_data = {0};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate;



	ret = msm_pcm_routing_get_stream_app_type_cfg(fe_id, session_type,

						      be_id, &app_type,

						      &acdb_dev_id,

						      &sample_rate);

						      &be_id, &cfg_data);

	if (ret < 0) {

		pr_err("%s: msm_pcm_routing_get_stream_app_type_cfg failed returned %d\n",

			__func__, ret);

		goto done;

	}



	ucontrol->value.integer.value[0] = app_type;

	ucontrol->value.integer.value[1] = acdb_dev_id;

	ucontrol->value.integer.value[2] = sample_rate;

	ucontrol->value.integer.value[0] = cfg_data.app_type;

	ucontrol->value.integer.value[1] = cfg_data.acdb_dev_id;

	ucontrol->value.integer.value[2] = cfg_data.sample_rate;

	ucontrol->value.integer.value[3] = be_id;

	pr_debug("%s: fedai_id %llu, session_type %d, be_id %d, app_type %d, acdb_dev_id %d, sample_rate %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

done:

	return ret;

}

sound/soc/msm/qdsp6v2/msm-pcm-loopback-v2.c

+28 −40
Original line number Diff line number Diff line
@@ -559,21 +559,18 @@ static int msm_pcm_playback_app_type_cfg_ctl_put(struct snd_kcontrol *kcontrol, 
	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_RX;

	int be_id = ucontrol->value.integer.value[3];

	struct msm_pcm_stream_app_type_cfg cfg_data = {0, 0, 48000};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate = 48000;



	app_type = ucontrol->value.integer.value[0];

	acdb_dev_id = ucontrol->value.integer.value[1];

	cfg_data.app_type = ucontrol->value.integer.value[0];

	cfg_data.acdb_dev_id = ucontrol->value.integer.value[1];

	if (ucontrol->value.integer.value[2] != 0)

		sample_rate = ucontrol->value.integer.value[2];

		cfg_data.sample_rate = ucontrol->value.integer.value[2];

	pr_debug("%s: fe_id- %llu session_type- %d be_id- %d app_type- %d acdb_dev_id- %d sample_rate- %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

	ret = msm_pcm_routing_reg_stream_app_type_cfg(fe_id, session_type,

						      be_id, app_type,

						      acdb_dev_id, sample_rate);

						      be_id, &cfg_data);

	if (ret < 0)

		pr_err("%s: msm_pcm_routing_reg_stream_app_type_cfg failed returned %d\n",

			__func__, ret);
@@ -586,28 +583,25 @@ static int msm_pcm_playback_app_type_cfg_ctl_get(struct snd_kcontrol *kcontrol, 
{

	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_RX;

	int be_id = ucontrol->value.integer.value[3];

	int be_id = 0;

	struct msm_pcm_stream_app_type_cfg cfg_data = {0};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate;



	ret = msm_pcm_routing_get_stream_app_type_cfg(fe_id, session_type,

						      be_id, &app_type,

						      &acdb_dev_id,

						      &sample_rate);

						      &be_id, &cfg_data);

	if (ret < 0) {

		pr_err("%s: msm_pcm_routing_get_stream_app_type_cfg failed returned %d\n",

			__func__, ret);

		goto done;

	}



	ucontrol->value.integer.value[0] = app_type;

	ucontrol->value.integer.value[1] = acdb_dev_id;

	ucontrol->value.integer.value[2] = sample_rate;

	ucontrol->value.integer.value[0] = cfg_data.app_type;

	ucontrol->value.integer.value[1] = cfg_data.acdb_dev_id;

	ucontrol->value.integer.value[2] = cfg_data.sample_rate;

	ucontrol->value.integer.value[3] = be_id;

	pr_debug("%s: fedai_id %llu, session_type %d, be_id %d, app_type %d, acdb_dev_id %d, sample_rate %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

done:

	return ret;

}
@@ -618,21 +612,18 @@ static int msm_pcm_capture_app_type_cfg_ctl_put(struct snd_kcontrol *kcontrol, 
	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_TX;

	int be_id = ucontrol->value.integer.value[3];

	struct msm_pcm_stream_app_type_cfg cfg_data = {0, 0, 48000};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate = 48000;



	app_type = ucontrol->value.integer.value[0];

	acdb_dev_id = ucontrol->value.integer.value[1];

	cfg_data.app_type = ucontrol->value.integer.value[0];

	cfg_data.acdb_dev_id = ucontrol->value.integer.value[1];

	if (ucontrol->value.integer.value[2] != 0)

		sample_rate = ucontrol->value.integer.value[2];

		cfg_data.sample_rate = ucontrol->value.integer.value[2];

	pr_debug("%s: fe_id- %llu session_type- %d be_id- %d app_type- %d acdb_dev_id- %d sample_rate- %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

	ret = msm_pcm_routing_reg_stream_app_type_cfg(fe_id, session_type,

						      be_id, app_type,

						      acdb_dev_id, sample_rate);

						      be_id, &cfg_data);

	if (ret < 0)

		pr_err("%s: msm_pcm_routing_reg_stream_app_type_cfg failed returned %d\n",

			__func__, ret);
@@ -645,28 +636,25 @@ static int msm_pcm_capture_app_type_cfg_ctl_get(struct snd_kcontrol *kcontrol, 
{

	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_TX;

	int be_id = ucontrol->value.integer.value[3];

	int be_id = 0;

	struct msm_pcm_stream_app_type_cfg cfg_data = {0};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate;



	ret = msm_pcm_routing_get_stream_app_type_cfg(fe_id, session_type,

						      be_id, &app_type,

						      &acdb_dev_id,

						      &sample_rate);

						      &be_id, &cfg_data);

	if (ret < 0) {

		pr_err("%s: msm_pcm_routing_get_stream_app_type_cfg failed returned %d\n",

			__func__, ret);

		goto done;

	}



	ucontrol->value.integer.value[0] = app_type;

	ucontrol->value.integer.value[1] = acdb_dev_id;

	ucontrol->value.integer.value[2] = sample_rate;

	ucontrol->value.integer.value[0] = cfg_data.app_type;

	ucontrol->value.integer.value[1] = cfg_data.acdb_dev_id;

	ucontrol->value.integer.value[2] = cfg_data.sample_rate;

	ucontrol->value.integer.value[3] = be_id;

	pr_debug("%s: fedai_id %llu, session_type %d, be_id %d, app_type %d, acdb_dev_id %d, sample_rate %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

done:

	return ret;

}

sound/soc/msm/qdsp6v2/msm-pcm-q6-noirq.c

+40 −57
Original line number Diff line number Diff line
@@ -842,26 +842,21 @@ static int msm_pcm_playback_app_type_cfg_ctl_put(struct snd_kcontrol *kcontrol, 
	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_RX;

	int be_id = ucontrol->value.integer.value[3];

	struct msm_pcm_stream_app_type_cfg cfg_data = {0, 0, 48000};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate = 48000;



	app_type = ucontrol->value.integer.value[0];

	acdb_dev_id = ucontrol->value.integer.value[1];

	cfg_data.app_type = ucontrol->value.integer.value[0];

	cfg_data.acdb_dev_id = ucontrol->value.integer.value[1];

	if (ucontrol->value.integer.value[2] != 0)

		sample_rate = ucontrol->value.integer.value[2];



		cfg_data.sample_rate = ucontrol->value.integer.value[2];

	pr_debug("%s: fe_id- %llu session_type- %d be_id- %d app_type- %d acdb_dev_id- %d sample_rate- %d\n",

		__func__, fe_id, session_type, be_id,

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

	ret = msm_pcm_routing_reg_stream_app_type_cfg(fe_id, session_type,

						      be_id, app_type,

						      acdb_dev_id, sample_rate);

						      be_id, &cfg_data);

	if (ret < 0)

		pr_err("%s: msm_pcm_playback_app_type_cfg_ctl_put failed, err %d\n",

		pr_err("%s: msm_pcm_routing_reg_stream_app_type_cfg failed returned %d\n",

		       __func__, ret);



	pr_debug("%s: fe_id- %llu session_type- %d be_id- %d app_type- %d acdb_dev_id- %d sample_rate- %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

	return ret;

}
@@ -870,29 +865,25 @@ static int msm_pcm_playback_app_type_cfg_ctl_get(struct snd_kcontrol *kcontrol, 
{

	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_RX;

	int be_id = ucontrol->value.integer.value[3];

	int be_id = 0;

	struct msm_pcm_stream_app_type_cfg cfg_data = {0};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate;



	ret = msm_pcm_routing_get_stream_app_type_cfg(fe_id, session_type,

						      be_id, &app_type,

						      &acdb_dev_id,

						      &sample_rate);

						      &be_id, &cfg_data);

	if (ret < 0) {

		pr_err("%s: msm_pcm_playback_app_type_cfg_ctl_get failed, err: %d\n",

		pr_err("%s: msm_pcm_routing_get_stream_app_type_cfg failed returned %d\n",

		       __func__, ret);

		goto done;

	}



	ucontrol->value.integer.value[0] = app_type;

	ucontrol->value.integer.value[1] = acdb_dev_id;

	ucontrol->value.integer.value[2] = sample_rate;



	ucontrol->value.integer.value[0] = cfg_data.app_type;

	ucontrol->value.integer.value[1] = cfg_data.acdb_dev_id;

	ucontrol->value.integer.value[2] = cfg_data.sample_rate;

	ucontrol->value.integer.value[3] = be_id;

	pr_debug("%s: fedai_id %llu, session_type %d, be_id %d, app_type %d, acdb_dev_id %d, sample_rate %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

done:

	return ret;

}
@@ -903,27 +894,22 @@ static int msm_pcm_capture_app_type_cfg_ctl_put(struct snd_kcontrol *kcontrol, 
	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_TX;

	int be_id = ucontrol->value.integer.value[3];

	struct msm_pcm_stream_app_type_cfg cfg_data = {0, 0, 48000};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate = 48000;



	app_type = ucontrol->value.integer.value[0];

	acdb_dev_id = ucontrol->value.integer.value[1];

	cfg_data.app_type = ucontrol->value.integer.value[0];

	cfg_data.acdb_dev_id = ucontrol->value.integer.value[1];

	if (ucontrol->value.integer.value[2] != 0)

		sample_rate = ucontrol->value.integer.value[2];



		cfg_data.sample_rate = ucontrol->value.integer.value[2];

	pr_debug("%s: fe_id- %llu session_type- %d be_id- %d app_type- %d acdb_dev_id- %d sample_rate- %d\n",

		__func__, fe_id, session_type, be_id,

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

	ret = msm_pcm_routing_reg_stream_app_type_cfg(fe_id, session_type,

						      be_id, app_type,

						      acdb_dev_id, sample_rate);

						      be_id, &cfg_data);

	if (ret < 0)

		pr_err("%s: msm_pcm_capture_app_type_cfg_ctl_put failed, err: %d\n",

		pr_err("%s: msm_pcm_routing_reg_stream_app_type_cfg failed returned %d\n",

		       __func__, ret);



	pr_debug("%s: fe_id- %llu session_type- %d be_id- %d app_type- %d acdb_dev_id- %d sample_rate- %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);



	return ret;

}
@@ -932,28 +918,25 @@ static int msm_pcm_capture_app_type_cfg_ctl_get(struct snd_kcontrol *kcontrol, 
{

	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_TX;

	int be_id = ucontrol->value.integer.value[3];

	int be_id = 0;

	struct msm_pcm_stream_app_type_cfg cfg_data = {0};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate;



	ret = msm_pcm_routing_get_stream_app_type_cfg(fe_id, session_type,

						      be_id, &app_type,

						      &acdb_dev_id,

						      &sample_rate);

						      &be_id, &cfg_data);

	if (ret < 0) {

		pr_err("%s: msm_pcm_capture_app_type_cfg_ctl_get failed, err: %d\n",

		pr_err("%s: msm_pcm_routing_get_stream_app_type_cfg failed returned %d\n",

		       __func__, ret);

		goto done;

	}



	ucontrol->value.integer.value[0] = app_type;

	ucontrol->value.integer.value[1] = acdb_dev_id;

	ucontrol->value.integer.value[2] = sample_rate;

	ucontrol->value.integer.value[0] = cfg_data.app_type;

	ucontrol->value.integer.value[1] = cfg_data.acdb_dev_id;

	ucontrol->value.integer.value[2] = cfg_data.sample_rate;

	ucontrol->value.integer.value[3] = be_id;

	pr_debug("%s: fedai_id %llu, session_type %d, be_id %d, app_type %d, acdb_dev_id %d, sample_rate %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

done:

	return ret;

}

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

+28 −40
Original line number Diff line number Diff line
@@ -1556,21 +1556,18 @@ static int msm_pcm_playback_app_type_cfg_ctl_put(struct snd_kcontrol *kcontrol, 
	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_RX;

	int be_id = ucontrol->value.integer.value[3];

	struct msm_pcm_stream_app_type_cfg cfg_data = {0, 0, 48000};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate = 48000;



	app_type = ucontrol->value.integer.value[0];

	acdb_dev_id = ucontrol->value.integer.value[1];

	cfg_data.app_type = ucontrol->value.integer.value[0];

	cfg_data.acdb_dev_id = ucontrol->value.integer.value[1];

	if (ucontrol->value.integer.value[2] != 0)

		sample_rate = ucontrol->value.integer.value[2];

		cfg_data.sample_rate = ucontrol->value.integer.value[2];

	pr_debug("%s: fe_id- %llu session_type- %d be_id- %d app_type- %d acdb_dev_id- %d sample_rate- %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

	ret = msm_pcm_routing_reg_stream_app_type_cfg(fe_id, session_type,

						      be_id, app_type,

						      acdb_dev_id, sample_rate);

						      be_id, &cfg_data);

	if (ret < 0)

		pr_err("%s: msm_pcm_routing_reg_stream_app_type_cfg failed returned %d\n",

			__func__, ret);
@@ -1583,28 +1580,25 @@ static int msm_pcm_playback_app_type_cfg_ctl_get(struct snd_kcontrol *kcontrol, 
{

	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_RX;

	int be_id = ucontrol->value.integer.value[3];

	int be_id = 0;

	struct msm_pcm_stream_app_type_cfg cfg_data = {0};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate;



	ret = msm_pcm_routing_get_stream_app_type_cfg(fe_id, session_type,

						      be_id, &app_type,

						      &acdb_dev_id,

						      &sample_rate);

						      &be_id, &cfg_data);

	if (ret < 0) {

		pr_err("%s: msm_pcm_routing_get_stream_app_type_cfg failed returned %d\n",

			__func__, ret);

		goto done;

	}



	ucontrol->value.integer.value[0] = app_type;

	ucontrol->value.integer.value[1] = acdb_dev_id;

	ucontrol->value.integer.value[2] = sample_rate;

	ucontrol->value.integer.value[0] = cfg_data.app_type;

	ucontrol->value.integer.value[1] = cfg_data.acdb_dev_id;

	ucontrol->value.integer.value[2] = cfg_data.sample_rate;

	ucontrol->value.integer.value[3] = be_id;

	pr_debug("%s: fedai_id %llu, session_type %d, be_id %d, app_type %d, acdb_dev_id %d, sample_rate %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

done:

	return ret;

}
@@ -1615,21 +1609,18 @@ static int msm_pcm_capture_app_type_cfg_ctl_put(struct snd_kcontrol *kcontrol, 
	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_TX;

	int be_id = ucontrol->value.integer.value[3];

	struct msm_pcm_stream_app_type_cfg cfg_data = {0, 0, 48000};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate = 48000;



	app_type = ucontrol->value.integer.value[0];

	acdb_dev_id = ucontrol->value.integer.value[1];

	cfg_data.app_type = ucontrol->value.integer.value[0];

	cfg_data.acdb_dev_id = ucontrol->value.integer.value[1];

	if (ucontrol->value.integer.value[2] != 0)

		sample_rate = ucontrol->value.integer.value[2];

		cfg_data.sample_rate = ucontrol->value.integer.value[2];

	pr_debug("%s: fe_id- %llu session_type- %d be_id- %d app_type- %d acdb_dev_id- %d sample_rate- %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

	ret = msm_pcm_routing_reg_stream_app_type_cfg(fe_id, session_type,

						      be_id, app_type,

						      acdb_dev_id, sample_rate);

						      be_id, &cfg_data);

	if (ret < 0)

		pr_err("%s: msm_pcm_routing_reg_stream_app_type_cfg failed returned %d\n",

			__func__, ret);
@@ -1642,28 +1633,25 @@ static int msm_pcm_capture_app_type_cfg_ctl_get(struct snd_kcontrol *kcontrol, 
{

	u64 fe_id = kcontrol->private_value;

	int session_type = SESSION_TYPE_TX;

	int be_id = ucontrol->value.integer.value[3];

	int be_id = 0;

	struct msm_pcm_stream_app_type_cfg cfg_data = {0};

	int ret = 0;

	int app_type;

	int acdb_dev_id;

	int sample_rate;



	ret = msm_pcm_routing_get_stream_app_type_cfg(fe_id, session_type,

						      be_id, &app_type,

						      &acdb_dev_id,

						      &sample_rate);

						      &be_id, &cfg_data);

	if (ret < 0) {

		pr_err("%s: msm_pcm_routing_get_stream_app_type_cfg failed returned %d\n",

			__func__, ret);

		goto done;

	}



	ucontrol->value.integer.value[0] = app_type;

	ucontrol->value.integer.value[1] = acdb_dev_id;

	ucontrol->value.integer.value[2] = sample_rate;

	ucontrol->value.integer.value[0] = cfg_data.app_type;

	ucontrol->value.integer.value[1] = cfg_data.acdb_dev_id;

	ucontrol->value.integer.value[2] = cfg_data.sample_rate;

	ucontrol->value.integer.value[3] = be_id;

	pr_debug("%s: fedai_id %llu, session_type %d, be_id %d, app_type %d, acdb_dev_id %d, sample_rate %d\n",

		__func__, fe_id, session_type, be_id,

		app_type, acdb_dev_id, sample_rate);

		cfg_data.app_type, cfg_data.acdb_dev_id, cfg_data.sample_rate);

done:

	return ret;

}