[alsa-devel] [PATCH 3/9] ASoC: Intel: move the lock and wq initialization to routine
Vinod Koul
vinod.koul at intel.com
Thu Oct 30 11:51:46 CET 2014
From: Subhransu S. Prusty <subhransu.s.prusty at intel.com>
This will be used by APCI code as well, so moving to common routine helps
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty at intel.com>
Signed-off-by: Vinod Koul <vinod.koul at intel.com>
---
sound/soc/intel/sst/sst.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/sound/soc/intel/sst/sst.c b/sound/soc/intel/sst/sst.c
index 253b917..7c9c65a 100644
--- a/sound/soc/intel/sst/sst.c
+++ b/sound/soc/intel/sst/sst.c
@@ -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;
--
1.7.0.4
More information about the Alsa-devel
mailing list