Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: SOF: Add ops_free

Browse Source 
Add the ops_free callback in struct sof_dev_desc.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220609032643.916882-18-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ranjani Sridharan 2022-06-08 20:26:37 -07:00 committed by Mark Brown
parent 4c30004a7c
commit bc433fd76f
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/sof.h
View File

@ -138,6 +138,7 @@ struct sof_dev_desc {
struct snd_sof_dsp_ops *ops; struct snd_sof_dsp_ops *ops;
int (*ops_init)(struct snd_sof_dev *sdev); int (*ops_init)(struct snd_sof_dev *sdev);
void (*ops_free)(struct snd_sof_dev *sdev);
}; };
int sof_dai_get_mclk(struct snd_soc_pcm_runtime *rtd); int sof_dai_get_mclk(struct snd_soc_pcm_runtime *rtd);

7
sound/soc/sof/core.c
View File

@ -189,7 +189,7 @@ static int sof_probe_continue(struct snd_sof_dev *sdev)
ret = snd_sof_probe(sdev); ret = snd_sof_probe(sdev);
if (ret < 0) { if (ret < 0) {
dev_err(sdev->dev, "error: failed to probe DSP %d\n", ret); dev_err(sdev->dev, "error: failed to probe DSP %d\n", ret);
return ret; goto probe_err;
} }
sof_set_fw_state(sdev, SOF_FW_BOOT_PREPARE); sof_set_fw_state(sdev, SOF_FW_BOOT_PREPARE);
@ -317,6 +317,8 @@ dbg_err:
snd_sof_free_debug(sdev); snd_sof_free_debug(sdev);
dsp_err: dsp_err:
snd_sof_remove(sdev); snd_sof_remove(sdev);
probe_err:
sof_ops_free(sdev);
/* all resources freed, update state to match */ /* all resources freed, update state to match */
sof_set_fw_state(sdev, SOF_FW_BOOT_NOT_STARTED); sof_set_fw_state(sdev, SOF_FW_BOOT_NOT_STARTED);
@ -374,6 +376,7 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data)
!sof_ops(sdev)->block_read || !sof_ops(sdev)->block_write || !sof_ops(sdev)->block_read || !sof_ops(sdev)->block_write ||
!sof_ops(sdev)->send_msg || !sof_ops(sdev)->load_firmware || !sof_ops(sdev)->send_msg || !sof_ops(sdev)->load_firmware ||
!sof_ops(sdev)->ipc_msg_data) { !sof_ops(sdev)->ipc_msg_data) {
sof_ops_free(sdev);
dev_err(dev, "error: missing mandatory ops\n"); dev_err(dev, "error: missing mandatory ops\n");
return -EINVAL; return -EINVAL;
} }
@ -457,6 +460,8 @@ int snd_sof_device_remove(struct device *dev)
snd_sof_remove(sdev); snd_sof_remove(sdev);
} }
sof_ops_free(sdev);
/* release firmware */ /* release firmware */
snd_sof_fw_unload(sdev); snd_sof_fw_unload(sdev);

6
sound/soc/sof/ops.h
View File

@ -29,6 +29,12 @@ static inline int sof_ops_init(struct snd_sof_dev *sdev)
return 0; return 0;
} }
static inline void sof_ops_free(struct snd_sof_dev *sdev)
{
if (sdev->pdata->desc->ops_free)
sdev->pdata->desc->ops_free(sdev);
}
/* Mandatory operations are verified during probing */ /* Mandatory operations are verified during probing */
/* init */ /* init */