dsp: update MSM Audio ION wrappers to align with upstream
Between Linux-4.9 and Linux-4.14, upstream has updated the
ION APIs significantly to make ION ready to bring out of
staging folder. This has changed the way ION and dma_buf
APIs used to work together for allocating, mapping and
deallocating ION buffers.
Update MSM Audio ION wrapper functions used by audio drivers
to reflect these ION API changes as per upstream ION.
Change-Id: I63097e147a397aa3a538f69ac88b6fb10871c3dc
Signed-off-by: Banajit Goswami <bgoswami@codeaurora.org>
diff --git a/dsp/q6usm.c b/dsp/q6usm.c
index 1ed74a9..3c335a8 100644
--- a/dsp/q6usm.c
+++ b/dsp/q6usm.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -209,14 +209,13 @@
pr_debug("%s: data[%pK]phys[%llx][%pK]\n", __func__,
(void *)port->data, (u64)port->phys, (void *)&port->phys);
- msm_audio_ion_free(port->client, port->handle);
+ msm_audio_ion_free(port->dma_buf);
port->data = NULL;
port->phys = 0;
port->buf_size = 0;
port->buf_cnt = 0;
- port->client = NULL;
- port->handle = NULL;
+ port->dma_buf = NULL;
mutex_unlock(&usc->cmd_lock);
return rc;
@@ -250,13 +249,12 @@
(void *)port->param_buf, (u64)port->param_phys,
(void *)&port->param_phys);
- msm_audio_ion_free(port->param_client, port->param_handle);
+ msm_audio_ion_free(port->param_dma_buf);
port->param_buf = NULL;
port->param_phys = 0;
port->param_buf_size = 0;
- port->param_client = NULL;
- port->param_handle = NULL;
+ port->param_dma_buf = NULL;
mutex_unlock(&usc->cmd_lock);
return rc;
@@ -398,8 +396,7 @@
/* The size to allocate should be multiple of 4K bytes */
size = PAGE_ALIGN(size);
- rc = msm_audio_ion_alloc("ultrasound_client",
- &port->client, &port->handle,
+ rc = msm_audio_ion_alloc(&port->dma_buf,
size, &port->phys,
&len, &port->data);
@@ -464,8 +461,7 @@
/* The size to allocate should be multiple of 4K bytes */
size = PAGE_ALIGN(size);
- rc = msm_audio_ion_alloc("ultrasound_client",
- &port->param_client, &port->param_handle,
+ rc = msm_audio_ion_alloc(&port->param_dma_buf,
size, &port->param_phys,
&len, &port->param_buf);
@@ -725,8 +721,7 @@
ab.used = 1;
ab.size = size;
ab.actual_size = size;
- ab.handle = port->handle;
- ab.client = port->client;
+ ab.dma_buf = port->dma_buf;
ret = msm_audio_ion_mmap(&ab, vms);