[PATCH] ALSA: hda: cs35l41: Make cs35l41_hda_remove() return void

[Lucas tanure]

On 1/17/22 22:00, Uwe Kleine-König wrote:
> Up to now cs35l41_hda_remove() returns zero unconditionally. Make it
> return void instead which makes it easier to see in the callers that
> there is no error to handle.
> 
> Also the return value of i2c and spi remove callbacks is ignored anyway.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
> ---
>   sound/pci/hda/cs35l41_hda.c     | 4 +---
>   sound/pci/hda/cs35l41_hda.h     | 2 +-
>   sound/pci/hda/cs35l41_hda_i2c.c | 4 +++-
>   sound/pci/hda/cs35l41_hda_spi.c | 4 +++-
>   4 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c
> index 30b40d865863..ce3782826830 100644
> --- a/sound/pci/hda/cs35l41_hda.c
> +++ b/sound/pci/hda/cs35l41_hda.c
> @@ -508,7 +508,7 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i
>   }
>   EXPORT_SYMBOL_GPL(cs35l41_hda_probe);
>   
> -int cs35l41_hda_remove(struct device *dev)
> +void cs35l41_hda_remove(struct device *dev)
>   {
>   	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);
>   
> @@ -517,8 +517,6 @@ int cs35l41_hda_remove(struct device *dev)
>   	if (!cs35l41->vspk_always_on)
>   		gpiod_set_value_cansleep(cs35l41->reset_gpio, 0);
>   	gpiod_put(cs35l41->reset_gpio);
> -
> -	return 0;
>   }
>   EXPORT_SYMBOL_GPL(cs35l41_hda_remove);
>   
> diff --git a/sound/pci/hda/cs35l41_hda.h b/sound/pci/hda/cs35l41_hda.h
> index 76c69a8a22f6..8ecaddf5f132 100644
> --- a/sound/pci/hda/cs35l41_hda.h
> +++ b/sound/pci/hda/cs35l41_hda.h
> @@ -64,6 +64,6 @@ struct cs35l41_hda {
>   
>   int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int irq,
>   		      struct regmap *regmap);
> -int cs35l41_hda_remove(struct device *dev);
> +void cs35l41_hda_remove(struct device *dev);
>   
>   #endif /*__CS35L41_HDA_H__*/
> diff --git a/sound/pci/hda/cs35l41_hda_i2c.c b/sound/pci/hda/cs35l41_hda_i2c.c
> index 4a9462fb5c14..d4240b8ded10 100644
> --- a/sound/pci/hda/cs35l41_hda_i2c.c
> +++ b/sound/pci/hda/cs35l41_hda_i2c.c
> @@ -32,7 +32,9 @@ static int cs35l41_hda_i2c_probe(struct i2c_client *clt, const struct i2c_device
>   
>   static int cs35l41_hda_i2c_remove(struct i2c_client *clt)
>   {
> -	return cs35l41_hda_remove(&clt->dev);
> +	cs35l41_hda_remove(&clt->dev);
> +
> +	return 0;
>   }
>   
>   static const struct i2c_device_id cs35l41_hda_i2c_id[] = {
> diff --git a/sound/pci/hda/cs35l41_hda_spi.c b/sound/pci/hda/cs35l41_hda_spi.c
> index 77426e96c58f..d63c487bc3a9 100644
> --- a/sound/pci/hda/cs35l41_hda_spi.c
> +++ b/sound/pci/hda/cs35l41_hda_spi.c
> @@ -30,7 +30,9 @@ static int cs35l41_hda_spi_probe(struct spi_device *spi)
>   
>   static int cs35l41_hda_spi_remove(struct spi_device *spi)
>   {
> -	return cs35l41_hda_remove(&spi->dev);
> +	cs35l41_hda_remove(&spi->dev);
> +
> +	return 0;
>   }
>   
>   static const struct spi_device_id cs35l41_hda_spi_id[] = {
> 
> base-commit: 0c947b893d69231a9add855939da7c66237ab44f
Reviewed-by: Lucas Tanure <tanureal at opensource.cirrus.com>