ASoC: Intel: broadwell: Make broadwell_disable_jack() return void
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Sun, 5 Jun 2022 15:39:04 +0000 (17:39 +0200)
committerMark Brown <broonie@kernel.org>
Tue, 7 Jun 2022 11:00:41 +0000 (12:00 +0100)
broadwell_disable_jack() returns zero unconditionally. Letting it
return void instead makes it easier to see in the callers that there is no
error to handle.

This is a preparation for making platform remove callbacks return void.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220605153904.26921-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/broadwell.c

index c30a9dc..b29d77d 100644 (file)
@@ -227,7 +227,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = {
        },
 };
 
-static int broadwell_disable_jack(struct snd_soc_card *card)
+static void broadwell_disable_jack(struct snd_soc_card *card)
 {
        struct snd_soc_component *component;
 
@@ -239,13 +239,13 @@ static int broadwell_disable_jack(struct snd_soc_card *card)
                        break;
                }
        }
-
-       return 0;
 }
 
 static int broadwell_suspend(struct snd_soc_card *card)
 {
-       return broadwell_disable_jack(card);
+       broadwell_disable_jack(card);
+
+       return 0;
 }
 
 static int broadwell_resume(struct snd_soc_card *card){
@@ -315,7 +315,9 @@ static int broadwell_audio_remove(struct platform_device *pdev)
 {
        struct snd_soc_card *card = platform_get_drvdata(pdev);
 
-       return broadwell_disable_jack(card);
+       broadwell_disable_jack(card);
+
+       return 0;
 }
 
 static struct platform_driver broadwell_audio = {