Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ASoC: SOF: make .remove callback return void #4625

Merged
merged 1 commit into from
Oct 11, 2023
Merged

ASoC: SOF: make .remove callback return void #4625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sound/soc/sof/amd/acp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ int amd_sof_acp_probe(struct snd_sof_dev *sdev)
}
EXPORT_SYMBOL_NS(amd_sof_acp_probe, SND_SOC_SOF_AMD_COMMON);

int amd_sof_acp_remove(struct snd_sof_dev *sdev)
void amd_sof_acp_remove(struct snd_sof_dev *sdev)
{
struct acp_dev_data *adata = sdev->pdata->hw_pdata;

Expand All @@ -588,7 +588,7 @@ int amd_sof_acp_remove(struct snd_sof_dev *sdev)
if (adata->dmic_dev)
platform_device_unregister(adata->dmic_dev);

return acp_reset(sdev);
acp_reset(sdev);
}
EXPORT_SYMBOL_NS(amd_sof_acp_remove, SND_SOC_SOF_AMD_COMMON);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/amd/acp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr,

/* ACP device probe/remove */
int amd_sof_acp_probe(struct snd_sof_dev *sdev);
int amd_sof_acp_remove(struct snd_sof_dev *sdev);
void amd_sof_acp_remove(struct snd_sof_dev *sdev);

/* DSP Loader callbacks */
int acp_sof_dsp_run(struct snd_sof_dev *sdev);
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/sof/imx/imx8.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ static int imx8_probe(struct snd_sof_dev *sdev)
return ret;
}

static int imx8_remove(struct snd_sof_dev *sdev)
static void imx8_remove(struct snd_sof_dev *sdev)
{
struct imx8_priv *priv = sdev->pdata->hw_pdata;
int i;
Expand All @@ -350,8 +350,6 @@ static int imx8_remove(struct snd_sof_dev *sdev)
device_link_del(priv->link[i]);
dev_pm_domain_detach(priv->pd_dev[i], false);
}

return 0;
}

/* on i.MX8 there is 1 to 1 match between type and BAR idx */
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/sof/imx/imx8m.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,14 +269,12 @@ static int imx8m_probe(struct snd_sof_dev *sdev)
return ret;
}

static int imx8m_remove(struct snd_sof_dev *sdev)
static void imx8m_remove(struct snd_sof_dev *sdev)
{
struct imx8m_priv *priv = sdev->pdata->hw_pdata;

imx8_disable_clocks(sdev, priv->clks);
platform_device_unregister(priv->ipc_dev);

return 0;
}

/* on i.MX8 there is 1 to 1 match between type and BAR idx */
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/sof/imx/imx8ulp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,14 +278,12 @@ static int imx8ulp_probe(struct snd_sof_dev *sdev)
return ret;
}

static int imx8ulp_remove(struct snd_sof_dev *sdev)
static void imx8ulp_remove(struct snd_sof_dev *sdev)
{
struct imx8ulp_priv *priv = sdev->pdata->hw_pdata;

imx8_disable_clocks(sdev, priv->clks);
platform_device_unregister(priv->ipc_dev);

return 0;
}

/* on i.MX8 there is 1 to 1 match between type and BAR idx */
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/sof/intel/byt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,9 @@ static int byt_resume(struct snd_sof_dev *sdev)
return 0;
}

static int byt_remove(struct snd_sof_dev *sdev)
static void byt_remove(struct snd_sof_dev *sdev)
{
byt_reset_dsp_disable_int(sdev);

return 0;
}

static int byt_acpi_probe(struct snd_sof_dev *sdev)
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/sof/intel/hda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,7 +1317,7 @@ int hda_dsp_probe(struct snd_sof_dev *sdev)
return ret;
}

int hda_dsp_remove(struct snd_sof_dev *sdev)
void hda_dsp_remove(struct snd_sof_dev *sdev)
{
struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
const struct sof_intel_dsp_desc *chip = hda->desc;
Expand Down Expand Up @@ -1377,8 +1377,6 @@ int hda_dsp_remove(struct snd_sof_dev *sdev)
sof_hda_bus_exit(sdev);

hda_codec_i915_exit(sdev);

return 0;
}

int hda_power_down_dsp(struct snd_sof_dev *sdev)
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/intel/hda.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ struct sof_intel_hda_stream {
* DSP Core services.
*/
int hda_dsp_probe(struct snd_sof_dev *sdev);
int hda_dsp_remove(struct snd_sof_dev *sdev);
void hda_dsp_remove(struct snd_sof_dev *sdev);
int hda_dsp_core_power_up(struct snd_sof_dev *sdev, unsigned int core_mask);
int hda_dsp_core_run(struct snd_sof_dev *sdev, unsigned int core_mask);
int hda_dsp_enable_core(struct snd_sof_dev *sdev, unsigned int core_mask);
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/sof/mediatek/mt8186/mt8186.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,16 +391,14 @@ static int mt8186_dsp_probe(struct snd_sof_dev *sdev)
return ret;
}

static int mt8186_dsp_remove(struct snd_sof_dev *sdev)
static void mt8186_dsp_remove(struct snd_sof_dev *sdev)
{
struct adsp_priv *priv = sdev->pdata->hw_pdata;

platform_device_unregister(priv->ipc_dev);
mt8186_sof_hifixdsp_shutdown(sdev);
adsp_sram_power_off(sdev);
mt8186_adsp_clock_off(sdev);

return 0;
}

static int mt8186_dsp_shutdown(struct snd_sof_dev *sdev)
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/sof/mediatek/mt8195/mt8195.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,16 +388,14 @@ static int mt8195_dsp_shutdown(struct snd_sof_dev *sdev)
return snd_sof_suspend(sdev->dev);
}

static int mt8195_dsp_remove(struct snd_sof_dev *sdev)
static void mt8195_dsp_remove(struct snd_sof_dev *sdev)
{
struct platform_device *pdev = container_of(sdev->dev, struct platform_device, dev);
struct adsp_priv *priv = sdev->pdata->hw_pdata;

platform_device_unregister(priv->ipc_dev);
adsp_sram_power_on(&pdev->dev, false);
adsp_clock_off(sdev);

return 0;
}

static int mt8195_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)
Expand Down
6 changes: 2 additions & 4 deletions sound/soc/sof/ops.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,10 @@ static inline int snd_sof_probe(struct snd_sof_dev *sdev)
return sof_ops(sdev)->probe(sdev);
}

static inline int snd_sof_remove(struct snd_sof_dev *sdev)
static inline void snd_sof_remove(struct snd_sof_dev *sdev)
{
if (sof_ops(sdev)->remove)
return sof_ops(sdev)->remove(sdev);

return 0;
sof_ops(sdev)->remove(sdev);
}

static inline int snd_sof_shutdown(struct snd_sof_dev *sdev)
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/sof-priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ struct snd_sof_dsp_ops {

/* probe/remove/shutdown */
int (*probe)(struct snd_sof_dev *sof_dev); /* mandatory */
int (*remove)(struct snd_sof_dev *sof_dev); /* optional */
void (*remove)(struct snd_sof_dev *sof_dev); /* optional */
int (*shutdown)(struct snd_sof_dev *sof_dev); /* optional */

/* DSP core boot / reset */
Expand Down