| Message ID | 20220605153904.26921-1-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | aa0d5f095093610e7274591d41a28381f60467a8 |
| Headers | show |
| Series | ASoC: Intel: broadwell: Make broadwell_disable_jack() return void | expand |
On 6/5/22 10:39, Uwe Kleine-König wrote: > 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> > --- > sound/soc/intel/boards/broadwell.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c > index d37c74fd1a3c..280e84bbe185 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 = { > > base-commit: 4b0986a3613c92f4ec1bdc7f60ec66fea135991f
On Sun, 5 Jun 2022 17:39:04 +0200, Uwe Kleine-König wrote: > 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. > > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: Intel: broadwell: Make broadwell_disable_jack() return void commit: aa0d5f095093610e7274591d41a28381f60467a8 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c index d37c74fd1a3c..280e84bbe185 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 = {
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> --- sound/soc/intel/boards/broadwell.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) base-commit: 4b0986a3613c92f4ec1bdc7f60ec66fea135991f