diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2022-06-05 17:39:04 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-06-07 13:00:41 +0200 |
| commit | aa0d5f095093610e7274591d41a28381f60467a8 (patch) | |
| tree | fde95e4711b8686e94c5dd3d4091a97404112151 | |
| parent | Add Machine driver support for nau8825, max98560 and rt5682s, rt1019 (diff) | |
| download | linux-aa0d5f095093610e7274591d41a28381f60467a8.tar.xz linux-aa0d5f095093610e7274591d41a28381f60467a8.zip | |
ASoC: Intel: broadwell: Make broadwell_disable_jack() return void
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>
| -rw-r--r-- | sound/soc/intel/boards/broadwell.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c index c30a9dca6801..b29d77dfb281 100644 --- a/sound/soc/intel/boards/broadwell.c +++ b/sound/soc/intel/boards/broadwell.c @@ -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 = { |