[PATCH] ASoC: Intel: broadwell: Make broadwell_disable_jack() return void

Pierre-Louis Bossart pierre-louis.bossart at linux.intel.com
Mon Jun 6 15:45:46 CEST 2022



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 at pengutronix.de>

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart at 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


More information about the Alsa-devel mailing list