ALSA: core: Make snd_card_free_when_closed() return void

All callers from other files ignore the return value of this function.
And it can only ever return a non-zero value if the parameter card is NULL.

This cannot happen in snd_card_free() as card was dereferenced just before
snd_card_free_when_closed() is called. So the error handling can be dropped
there.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Geoff Levand <geoff@infradead.org>
Acked-by: Thierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20230207191907.467756-3-u.kleine-koenig@pengutronix.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/core.h b/include/sound/core.h
index 9a73c60b6f1ea82e95fbfb263a4cf01bb61bcc31..21884c979c177a069b1d2d40fd7124a81cc1c29f 100644 (file)
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -289,7 +289,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);
-int snd_card_free_when_closed(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);
 int snd_card_register(struct snd_card *card);

diff --git a/sound/core/init.c b/sound/core/init.c
index a03eddab12fe24d53f616467fac7b2b6f26e14b0..6bb3e2b7797196cd96d448fa16eb7238d9b60af8 100644 (file)
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -608,14 +608,14 @@ static int snd_card_do_free(struct snd_card *card)
  *
  * Return: zero if successful, or a negative error code
  */
-int snd_card_free_when_closed(struct snd_card *card)
+void snd_card_free_when_closed(struct snd_card *card)
 {
        if (!card)
-               return -EINVAL;
+               return;
 
        snd_card_disconnect(card);
        put_device(&card->card_dev);
-       return 0;
+       return;
 }
 EXPORT_SYMBOL(snd_card_free_when_closed);
 
@@ -635,7 +635,6 @@ EXPORT_SYMBOL(snd_card_free_when_closed);
 int snd_card_free(struct snd_card *card)
 {
        DECLARE_COMPLETION_ONSTACK(released);
-       int ret;
 
        /* The call of snd_card_free() is allowed from various code paths;
         * a manual call from the driver and the call via devres_free, and
@@ -647,9 +646,8 @@ int snd_card_free(struct snd_card *card)
                return 0;
 
        card->release_completion = &released;
-       ret = snd_card_free_when_closed(card);
-       if (ret)
-               return ret;
+       snd_card_free_when_closed(card);
+
        /* wait, until all devices are ready for the free operation */
        wait_for_completion(&released);