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

Commit abc05143 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: qdsp6v2: add function names to tell same apr errors"

parents 72f81ad5 a1523db5

sound/soc/msm/qdsp6v2/q6asm.c

+13 −13
Original line number Diff line number Diff line
@@ -1864,7 +1864,7 @@ int q6asm_open_read_write(struct audio_client *ac, 
	struct asm_stream_cmd_open_readwrite_v2 open;



	if ((ac == NULL) || (ac->apr == NULL)) {

		pr_err("APR handle NULL\n");

		pr_err("%s: APR handle NULL\n", __func__);

		return -EINVAL;

	}

	pr_debug("%s: session[%d]", __func__, ac->session);
@@ -1976,7 +1976,7 @@ int q6asm_run(struct audio_client *ac, uint32_t flags, 
	struct asm_session_cmd_run_v2 run;

	int rc;

	if (!ac || ac->apr == NULL) {

		pr_err("APR handle NULL\n");

		pr_err("%s: APR handle NULL\n", __func__);

		return -EINVAL;

	}

	pr_debug("%s session[%d]", __func__, ac->session);
@@ -2931,7 +2931,7 @@ int q6asm_memory_map(struct audio_client *ac, uint32_t buf_add, int dir, 
	int	cmd_size = 0;



	if (!ac || ac->mmap_apr == NULL) {

		pr_err("APR handle NULL\n");

		pr_err("%s: APR handle NULL\n", __func__);

		return -EINVAL;

	}

	pr_debug("%s: Session[%d]\n", __func__, ac->session);
@@ -3008,7 +3008,7 @@ int q6asm_memory_unmap(struct audio_client *ac, uint32_t buf_add, int dir) 
	int rc = 0;



	if (!ac || this_mmap.apr == NULL) {

		pr_err("APR handle NULL\n");

		pr_err("%s: APR handle NULL\n", __func__);

		return -EINVAL;

	}

	pr_debug("%s: Session[%d]\n", __func__, ac->session);
@@ -3078,7 +3078,7 @@ static int q6asm_memory_map_regions(struct audio_client *ac, int dir, 
	uint32_t bufsz_t;



	if (!ac || ac->mmap_apr == NULL) {

		pr_err("APR handle NULL\n");

		pr_err("%s: APR handle NULL\n", __func__);

		return -EINVAL;

	}

	pr_debug("%s: Session[%d]\n", __func__, ac->session);
@@ -3187,7 +3187,7 @@ static int q6asm_memory_unmap_regions(struct audio_client *ac, int dir) 
	int	cmd_size = 0;



	if (!ac || ac->mmap_apr == NULL) {

		pr_err("APR handle NULL\n");

		pr_err("%s: APR handle NULL\n", __func__);

		return -EINVAL;

	}

	pr_debug("%s: Session[%d]\n", __func__, ac->session);
@@ -3573,7 +3573,7 @@ int q6asm_read(struct audio_client *ac) 
	struct audio_port_data     *port;

	int rc;

	if (!ac || ac->apr == NULL) {

		pr_err("APR handle NULL\n");

		pr_err("%s: APR handle NULL\n", __func__);

		return -EINVAL;

	}

	if (ac->io_mode & SYNC_IO_MODE) {
@@ -3636,7 +3636,7 @@ int q6asm_read_nolock(struct audio_client *ac) 
	struct audio_port_data     *port;

	int rc;

	if (!ac || ac->apr == NULL) {

		pr_err("APR handle NULL\n");

		pr_err("%s: APR handle NULL\n", __func__);

		return -EINVAL;

	}

	if (ac->io_mode & SYNC_IO_MODE) {
@@ -3833,7 +3833,7 @@ int q6asm_write(struct audio_client *ac, uint32_t len, uint32_t msw_ts, 
	int dsp_buf = 0;



	if (!ac || ac->apr == NULL) {

		pr_err("APR handle NULL\n");

		pr_err("%s: APR handle NULL\n", __func__);

		return -EINVAL;

	}

	pr_debug("%s: session[%d] len=%d", __func__, ac->session, len);
@@ -3901,7 +3901,7 @@ int q6asm_write_nolock(struct audio_client *ac, uint32_t len, uint32_t msw_ts, 
	int dsp_buf = 0;



	if (!ac || ac->apr == NULL) {

		pr_err("APR handle NULL\n");

		pr_err("%s: APR handle NULL\n", __func__);

		return -EINVAL;

	}

	pr_debug("%s: session[%d] len=%d", __func__, ac->session, len);
@@ -3960,7 +3960,7 @@ int q6asm_get_session_time(struct audio_client *ac, uint64_t *tstamp) 
	int rc;



	if (!ac || ac->apr == NULL || tstamp == NULL) {

		pr_err("APR handle NULL or tstamp NULL\n");

		pr_err("%s: APR handle NULL or tstamp NULL\n", __func__);

		return -EINVAL;

	}

	q6asm_add_hdr(ac, &hdr, sizeof(hdr), TRUE);
@@ -4050,7 +4050,7 @@ static int __q6asm_cmd(struct audio_client *ac, int cmd, uint32_t stream_id) 
	int cnt = 0;



	if (!ac || ac->apr == NULL) {

		pr_err("APR handle NULL\n");

		pr_err("%s: APR handle NULL\n", __func__);

		return -EINVAL;

	}

	q6asm_stream_add_hdr(ac, &hdr, sizeof(hdr), TRUE, stream_id);
@@ -4263,7 +4263,7 @@ int q6asm_reg_tx_overflow(struct audio_client *ac, uint16_t enable) 
	int rc;



	if (!ac || ac->apr == NULL) {

		pr_err("APR handle NULL\n");

		pr_err("%s: APR handle NULL\n", __func__);

		return -EINVAL;

	}

	pr_debug("%s:session[%d]enable[%d]\n", __func__,