Commit 25a5a77a authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Takashi Iwai

ALSA: core: Make snd_card_free() return void

The function returns 0 unconditionally. Make it return void instead and
simplify all callers accordingly.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarJaroslav Kysela <perex@perex.cz>
Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: default avatarGeoff Levand <geoff@infradead.org>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20230207191907.467756-4-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 73c5685c
......@@ -288,7 +288,7 @@ int snd_devm_card_new(struct device *parent, int idx, const char *xid,
void snd_card_disconnect(struct snd_card *card);
void snd_card_disconnect_sync(struct snd_card *card);
int snd_card_free(struct snd_card *card);
void snd_card_free(struct snd_card *card);
void snd_card_free_when_closed(struct snd_card *card);
int snd_card_free_on_error(struct device *dev, int ret);
void snd_card_set_id(struct snd_card *card, const char *id);
......
......@@ -632,7 +632,7 @@ EXPORT_SYMBOL(snd_card_free_when_closed);
* Return: Zero. Frees all associated devices and frees the control
* interface associated to given soundcard.
*/
int snd_card_free(struct snd_card *card)
void snd_card_free(struct snd_card *card)
{
DECLARE_COMPLETION_ONSTACK(released);
......@@ -643,15 +643,13 @@ int snd_card_free(struct snd_card *card)
* the check here at the beginning.
*/
if (card->releasing)
return 0;
return;
card->release_completion = &released;
snd_card_free_when_closed(card);
/* wait, until all devices are ready for the free operation */
wait_for_completion(&released);
return 0;
}
EXPORT_SYMBOL(snd_card_free);
......
......@@ -582,12 +582,10 @@ static void hda_tegra_probe_work(struct work_struct *work)
static int hda_tegra_remove(struct platform_device *pdev)
{
int ret;
ret = snd_card_free(dev_get_drvdata(&pdev->dev));
snd_card_free(dev_get_drvdata(&pdev->dev));
pm_runtime_disable(&pdev->dev);
return ret;
return 0;
}
static void hda_tegra_shutdown(struct platform_device *pdev)
......
......@@ -1053,9 +1053,7 @@ static void snd_ps3_driver_remove(struct ps3_system_bus_device *dev)
* ctl and preallocate buffer will be freed in
* snd_card_free
*/
ret = snd_card_free(the_card.card);
if (ret)
pr_info("%s: ctl freecard=%d\n", __func__, ret);
snd_card_free(the_card.card);
dma_free_coherent(&dev->core,
PAGE_SIZE,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment