aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/haswell
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2017-03-22 14:36:44 +0000
committerMark Brown <broonie@kernel.org>2017-03-27 12:31:43 +0100
commit74a4ce4c8e13820799911c746b917efd7cc25f55 (patch)
tree8221e37f7035dfa1a73cdc8cafe3402d11c8038e /sound/soc/intel/haswell
parentASoC: intel: Don't print FW version repeatedly (diff)
downloadlinux-dev-74a4ce4c8e13820799911c746b917efd7cc25f55.tar.xz
linux-dev-74a4ce4c8e13820799911c746b917efd7cc25f55.zip
ASoC: intel: remove unused variable data and associated code
The variable 'data' is assigned null and never re-assigned. There is also a redundant check for data being non-null which is always false, so remove this and the variable data and dma_addr as they are not used once the dead code has been removed. Detected with CoverityScan, CID#1324015 ("'Constant' variable gaurds dead code") Signed-off-by: Colin Ian King <colin.king@canonical.com> Acked-by: Jie Yang <yang.jie@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/haswell')
-rw-r--r--sound/soc/intel/haswell/sst-haswell-ipc.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/intel/haswell/sst-haswell-ipc.c b/sound/soc/intel/haswell/sst-haswell-ipc.c
index a3459d1682a6..d33bdaf92c57 100644
--- a/sound/soc/intel/haswell/sst-haswell-ipc.c
+++ b/sound/soc/intel/haswell/sst-haswell-ipc.c
@@ -2000,10 +2000,8 @@ int sst_hsw_module_set_param(struct sst_hsw *hsw,
u32 param_size, char *param)
{
int ret;
- unsigned char *data = NULL;
u32 header = 0;
u32 payload_size = 0, transfer_parameter_size = 0;
- dma_addr_t dma_addr = 0;
struct sst_hsw_transfer_parameter *parameter;
struct device *dev = hsw->dev;
@@ -2047,10 +2045,6 @@ int sst_hsw_module_set_param(struct sst_hsw *hsw,
kfree(parameter);
- if (data)
- dma_free_coherent(hsw->dsp->dma_dev,
- param_size, (void *)data, dma_addr);
-
return ret;
}