p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ASoC: Intel: move the lock and wq initialization to routine 

This will be used by ACPI code as well, so moving to common routine helps

Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Subhransu S. Prusty 2014-10-30 16:21:46 +05:30 committed by Mark Brown
parent 7e73e4d805
commit 54adc0ad64
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/intel/sst/sst.c
View File

@ -222,6 +222,14 @@ static int sst_workqueue_init(struct intel_sst_drv *ctx)
return 0;
}
static void sst_init_locks(struct intel_sst_drv *ctx)
{
mutex_init(&ctx->sst_lock);
spin_lock_init(&ctx->rx_msg_lock);
spin_lock_init(&ctx->ipc_spin_lock);
spin_lock_init(&ctx->block_lock);
}
/*
* intel_sst_probe - PCI probe function
*
@ -259,7 +267,7 @@ static int intel_sst_probe(struct pci_dev *pci,
return -EINVAL;
ops = sst_drv_ctx->ops;
mutex_init(&sst_drv_ctx->sst_lock);
sst_init_locks(sst_drv_ctx);
/* pvt_id 0 reserved for async messages */
sst_drv_ctx->pvt_id = 1;
@ -270,10 +278,6 @@ static int intel_sst_probe(struct pci_dev *pci,
sst_drv_ctx->use_dma = 0;
sst_drv_ctx->use_lli = 0;
spin_lock_init(&sst_drv_ctx->ipc_spin_lock);
spin_lock_init(&sst_drv_ctx->block_lock);
spin_lock_init(&sst_drv_ctx->rx_msg_lock);
if (sst_workqueue_init(sst_drv_ctx))
return -EINVAL;