diff options
Diffstat (limited to 'sound/soc/intel/catpt/core.h')
| -rw-r--r-- | sound/soc/intel/catpt/core.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/intel/catpt/core.h b/sound/soc/intel/catpt/core.h index c01d27e9fd88..7e479ef89ad0 100644 --- a/sound/soc/intel/catpt/core.h +++ b/sound/soc/intel/catpt/core.h @@ -62,6 +62,7 @@ struct catpt_module_type { struct catpt_spec { struct snd_soc_acpi_mach *machines; u8 core_id; + const char *fw_name; u32 host_dram_offset; u32 host_iram_offset; u32 host_shim_offset; @@ -95,7 +96,7 @@ struct catpt_dev { struct catpt_module_type modules[CATPT_MODULE_COUNT]; struct catpt_ssp_device_format devfmt[CATPT_SSP_COUNT]; struct list_head stream_list; - spinlock_t list_lock; + struct mutex stream_mutex; struct mutex clk_mutex; struct catpt_dx_context dx_ctx; @@ -129,13 +130,13 @@ irqreturn_t catpt_dsp_irq_thread(int irq, void *dev_id); * HOST <-> DSP communication yet failure to process specific request. * Use below macro to convert returned non-zero values appropriately */ -#define CATPT_IPC_ERROR(err) (((err) < 0) ? (err) : -EREMOTEIO) +#define CATPT_IPC_RET(ret) (((ret) <= 0) ? (ret) : -EREMOTEIO) int catpt_dsp_send_msg_timeout(struct catpt_dev *cdev, struct catpt_ipc_msg request, - struct catpt_ipc_msg *reply, int timeout); + struct catpt_ipc_msg *reply, int timeout, const char *name); int catpt_dsp_send_msg(struct catpt_dev *cdev, struct catpt_ipc_msg request, - struct catpt_ipc_msg *reply); + struct catpt_ipc_msg *reply, const char *name); int catpt_first_boot_firmware(struct catpt_dev *cdev); int catpt_boot_firmware(struct catpt_dev *cdev, bool restore); |