Merge "ASoC: msm: Fix print statement for pr_debug and pr_err" into msm-4.8 (3e8a1a89) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/misc/qcom/qdsp6v2/aac_in.c

+17 −18

Original line number	Diff line number	Diff line
		@@ -108,8 +108,8 @@ static long aac_in_ioctl_shared(struct file file, unsigned int cmd, void arg)
		aac_mode,
		enc_cfg->stream_format);
		if (rc < 0) {
		pr_err("%s:session id %d: cmd media format block",
		"failed\n", __func__, audio->ac->session);
		pr_err("%s:session id %d: cmd media format block failed\n",
		__func__, audio->ac->session);
		break;
		}
		if (audio->feedback == NON_TUNNEL_MODE) {
		@@ -117,8 +117,8 @@ static long aac_in_ioctl_shared(struct file file, unsigned int cmd, void arg)
		audio->pcm_cfg.sample_rate,
		audio->pcm_cfg.channel_count);
		if (rc < 0) {
		pr_err("%s:session id %d: media format block",
		"failed\n", __func__, audio->ac->session);
		pr_err("%s:session id %d: media format block failed\n",
		__func__, audio->ac->session);
		break;
		}
		}
		@@ -127,8 +127,8 @@ static long aac_in_ioctl_shared(struct file file, unsigned int cmd, void arg)
		audio->enabled = 1;
		} else {
		audio->enabled = 0;
		pr_err("%s:session id %d: Audio Start procedure",
		"failed rc=%d\n", __func__, audio->ac->session, rc);
		pr_err("%s:session id %d: Audio Start procedure failed rc=%d\n",
		__func__, audio->ac->session, rc);
		break;
		}
		while (cnt++ < audio->str_cfg.buffer_count)
		@@ -142,8 +142,8 @@ static long aac_in_ioctl_shared(struct file file, unsigned int cmd, void arg)
		audio->ac->session);
		rc = audio_in_disable(audio);
		if (rc < 0) {
		pr_err("%s:session id %d: Audio Stop procedure failed",
		"rc=%d\n", __func__, audio->ac->session, rc);
		pr_err("%s:session id %d: Audio Stop procedure failed rc=%d\n",
		__func__, audio->ac->session, rc);
		break;
		}
		break;
		@@ -182,8 +182,8 @@ static long aac_in_ioctl_shared(struct file file, unsigned int cmd, void arg)
		case 0x03:
		cfg->stream_format = AUDIO_AAC_FORMAT_RAW;
		}
		pr_debug("%s:session id %d: Get-aac-cfg: format=%d sr=%d",
		"bitrate=%d\n", __func__, audio->ac->session,
		pr_debug("%s:session id %d: Get-aac-cfg: format=%d sr=%d bitrate=%d\n",
		__func__, audio->ac->session,
		cfg->stream_format, cfg->sample_rate, cfg->bit_rate);
		break;
		}
		@@ -256,8 +256,7 @@ static long aac_in_ioctl_shared(struct file file, unsigned int cmd, void arg)
		enc_cfg->sample_rate = cfg->sample_rate;
		enc_cfg->channels = cfg->channels;
		enc_cfg->bit_rate = cfg->bit_rate;
		pr_debug("%s:session id %d: Set-aac-cfg:SR= 0x%x ch=0x%x",
		"bitrate=0x%x, format(adts/raw) = %d\n",
		pr_debug("%s:session id %d: Set-aac-cfg:SR= 0x%x ch=0x%x bitrate=0x%x, format(adts/raw) = %d\n",
		__func__, audio->ac->session, enc_cfg->sample_rate,
		enc_cfg->channels, enc_cfg->bit_rate,
		enc_cfg->stream_format);
		@@ -286,8 +285,8 @@ static long aac_in_ioctl_shared(struct file file, unsigned int cmd, void arg)
		if ((audio_aac_cfg->sbr_on_flag == 1) \|\|
		(audio_aac_cfg->sbr_ps_on_flag == 1)) {
		if (enc_cfg->sample_rate < 24000) {
		pr_err("%s: ERROR in setting samplerate = %d",
		"\n", __func__, enc_cfg->sample_rate);
		pr_err("%s: ERROR in setting samplerate = %d\n",
		__func__, enc_cfg->sample_rate);
		rc = -EINVAL;
		break;
		}
		@@ -606,8 +605,8 @@ static int aac_in_open(struct inode inode, struct file file)
		(void *)audio);

		if (!audio->ac) {
		pr_err("%s: Could not allocate memory for",
		"audio client\n", __func__);
		pr_err("%s: Could not allocate memory for audio client\n",
		__func__);
		kfree(audio->enc_cfg);
		kfree(audio->codec_cfg);
		kfree(audio);
		@@ -645,8 +644,8 @@ static int aac_in_open(struct inode inode, struct file file)
		/* register for tx overflow (valid for tunnel mode only) */
		rc = q6asm_reg_tx_overflow(audio->ac, 0x01);
		if (rc < 0) {
		pr_err("%s:session id %d: TX Overflow registration",
		"failed rc=%d\n", __func__,
		pr_err("%s:session id %d: TX Overflow registration failed rc=%d\n",
		__func__,
		audio->ac->session, rc);
		rc = -ENODEV;
		goto fail;

drivers/misc/qcom/qdsp6v2/amrnb_in.c

+12 −14

Original line number	Diff line number	Diff line
		@@ -64,8 +64,8 @@ static long amrnb_in_ioctl_shared(struct file *file,
		enc_cfg->dtx_enable);

		if (rc < 0) {
		pr_err("%s:session id %d: cmd amrnb media format block",
		"failed\n", __func__, audio->ac->session);
		pr_err("%s:session id %d: cmd amrnb media format block failed\n",
		__func__, audio->ac->session);
		break;
		}
		if (audio->feedback == NON_TUNNEL_MODE) {
		@@ -74,8 +74,8 @@ static long amrnb_in_ioctl_shared(struct file *file,
		audio->pcm_cfg.channel_count);

		if (rc < 0) {
		pr_err("%s:session id %d: media format block",
		"failed\n", __func__, audio->ac->session);
		pr_err("%s:session id %d: media format block failed\n",
		__func__, audio->ac->session);
		break;
		}
		}
		@@ -87,9 +87,8 @@ static long amrnb_in_ioctl_shared(struct file *file,
		audio->enabled = 1;
		} else {
		audio->enabled = 0;
		pr_err("%s:session id %d: Audio Start procedure failed",
		"rc=%d\n", __func__,
		audio->ac->session, rc);
		pr_err("%s:session id %d: Audio Start procedure failed rc=%d\n",
		__func__, audio->ac->session, rc);
		break;
		}
		while (cnt++ < audio->str_cfg.buffer_count)
		@@ -103,9 +102,8 @@ static long amrnb_in_ioctl_shared(struct file *file,
		pr_debug("%s:AUDIO_STOP\n", __func__);
		rc = audio_in_disable(audio);
		if (rc < 0) {
		pr_err("%s:session id %d: Audio Stop procedure failed",
		"rc=%d\n", __func__,
		audio->ac->session, rc);
		pr_err("%s:session id %d: Audio Stop procedure failed rc=%d\n",
		__func__, audio->ac->session, rc);
		break;
		}
		break;
		@@ -316,8 +314,8 @@ static int amrnb_in_open(struct inode inode, struct file file)
		(void *)audio);

		if (!audio->ac) {
		pr_err("%s: Could not allocate memory for audio",
		"client\n", __func__);
		pr_err("%s: Could not allocate memory for audio client\n",
		__func__);
		kfree(audio->enc_cfg);
		kfree(audio);
		return -ENOMEM;
		@@ -350,8 +348,8 @@ static int amrnb_in_open(struct inode inode, struct file file)
		/* register for tx overflow (valid for tunnel mode only) */
		rc = q6asm_reg_tx_overflow(audio->ac, 0x01);
		if (rc < 0) {
		pr_err("%s:session id %d: TX Overflow registration",
		"failed rc=%d\n", __func__, audio->ac->session,
		pr_err("%s:session id %d: TX Overflow registration failed rc=%d\n",
		__func__, audio->ac->session,
		rc);
		rc = -ENODEV;
		goto fail;

drivers/misc/qcom/qdsp6v2/amrwb_in.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -63,8 +63,8 @@ static long amrwb_in_ioctl_shared(struct file *file,
		enc_cfg->dtx_enable);

		if (rc < 0) {
		pr_err("%s:session id %d: cmd amrwb media format block",
		"failed\n", __func__, audio->ac->session);
		pr_err("%s:session id %d: cmd amrwb media format block failed\n",
		__func__, audio->ac->session);
		break;
		}
		if (audio->feedback == NON_TUNNEL_MODE) {
		@@ -73,8 +73,8 @@ static long amrwb_in_ioctl_shared(struct file *file,
		audio->pcm_cfg.channel_count);

		if (rc < 0) {
		pr_err("%s:session id %d: media format block",
		"failed\n", __func__, audio->ac->session);
		pr_err("%s:session id %d: media format block failed\n",
		__func__, audio->ac->session);
		break;
		}
		}
		@@ -86,8 +86,8 @@ static long amrwb_in_ioctl_shared(struct file *file,
		audio->enabled = 1;
		} else {
		audio->enabled = 0;
		pr_err("%s:session id %d: Audio Start procedure failed",
		"rc=%d\n", __func__, audio->ac->session, rc);
		pr_err("%s:session id %d: Audio Start procedure failed rc=%d\n",
		__func__, audio->ac->session, rc);
		break;
		}
		while (cnt++ < audio->str_cfg.buffer_count)
		@@ -101,8 +101,8 @@ static long amrwb_in_ioctl_shared(struct file *file,
		pr_debug("%s:AUDIO_STOP\n", __func__);
		rc = audio_in_disable(audio);
		if (rc < 0) {
		pr_err("%s:session id %d: Audio Stop procedure failed",
		"rc=%d\n", __func__, audio->ac->session, rc);
		pr_err("%s:session id %d: Audio Stop procedure failed rc=%d\n",
		__func__, audio->ac->session, rc);
		break;
		}
		break;
		@@ -311,8 +311,8 @@ static int amrwb_in_open(struct inode inode, struct file file)
		(void *)audio);

		if (!audio->ac) {
		pr_err("%s:audio[%pK]: Could not allocate memory for audio",
		"client\n", __func__, audio);
		pr_err("%s:audio[%pK]: Could not allocate memory for audio client\n",
		__func__, audio);
		kfree(audio->enc_cfg);
		kfree(audio);
		return -ENOMEM;
		@@ -345,8 +345,8 @@ static int amrwb_in_open(struct inode inode, struct file file)
		/* register for tx overflow (valid for tunnel mode only) */
		rc = q6asm_reg_tx_overflow(audio->ac, 0x01);
		if (rc < 0) {
		pr_err("%s:session id %d: TX Overflow registration",
		"failed rc=%d\n", __func__, audio->ac->session,
		pr_err("%s:session id %d: TX Overflow registration failed rc=%d\n",
		__func__, audio->ac->session,
		rc);
		rc = -ENODEV;
		goto fail;

drivers/misc/qcom/qdsp6v2/audio_utils_aio.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -315,8 +315,8 @@ void audio_aio_async_out_flush(struct q6audio_aio *audio)
		spin_lock_irqsave(&audio->dsp_lock, flags);

		if (audio->eos_flag && (audio->eos_write_payload.aio_buf.buf_addr)) {
		pr_debug("%s[%pK]: EOS followed by flush received,acknowledge",
		"eos i/p buffer immediately\n", __func__, audio);
		pr_debug("%s[%pK]: EOS followed by flush received,acknowledge eos i/p buffer immediately\n",
		__func__, audio);
		audio_aio_post_event(audio, AUDIO_EVENT_WRITE_DONE,
		audio->eos_write_payload);
		memset(&audio->eos_write_payload, 0,
		@@ -780,8 +780,8 @@ static long audio_aio_process_event_req_common(struct q6audio_aio *audio,
		* Once EOS indicated
		*/
		if (audio->eos_rsp && !list_empty(&audio->in_queue)) {
		pr_debug("%s[%pK]:Send flush command to release read buffers",
		"held up in DSP\n", __func__, audio);
		pr_debug("%s[%pK]:Send flush command to release read buffers held up in DSP\n",
		__func__, audio);
		mutex_lock(&audio->lock);
		audio_aio_flush(audio);
		mutex_unlock(&audio->lock);

sound/soc/msm/qdsp6v2/q6afe.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -2793,8 +2793,8 @@ static int __afe_port_start(u16 port_id, union afe_port_config *afe_config,

		if ((port_id == RT_PROXY_DAI_001_RX) \|\|
		(port_id == RT_PROXY_DAI_002_TX)) {
		pr_debug("%s: before incrementing pcm_afe_instance %d",
		" port_id 0x%x\n", __func__,
		pr_debug("%s: before incrementing pcm_afe_instance %d port_id 0x%x\n",
		__func__,
		pcm_afe_instance[port_id & 0x1], port_id);
		port_id = VIRTUAL_ID_TO_PORTID(port_id);
		pcm_afe_instance[port_id & 0x1]++;
		@@ -2802,8 +2802,8 @@ static int __afe_port_start(u16 port_id, union afe_port_config *afe_config,
		}
		if ((port_id == RT_PROXY_DAI_002_RX) \|\|
		(port_id == RT_PROXY_DAI_001_TX)) {
		pr_debug("%s: before incrementing proxy_afe_instance %d",
		" port_id 0x%x\n", __func__,
		pr_debug("%s: before incrementing proxy_afe_instance %d port_id 0x%x\n",
		__func__,
		proxy_afe_instance[port_id & 0x1], port_id);

		if (!afe_close_done[port_id & 0x1]) {