From ca7270a7b60dfb25b7fd180d93ea18eebd5edee7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Wed, 20 Oct 2021 15:24:16 +0200 Subject: [PATCH] ASoC: cs35l41: Make cs35l41_remove() return void MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Up to now cs35l41_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, platform and spi remove callbacks is ignored anyway. Signed-off-by: Uwe Kleine-König Link: https://lore.kernel.org/r/20211020132416.30288-1-u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown --- sound/soc/codecs/cs35l41-i2c.c | 4 +++- sound/soc/codecs/cs35l41-spi.c | 4 +++- sound/soc/codecs/cs35l41.c | 4 +--- sound/soc/codecs/cs35l41.h | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/cs35l41-i2c.c b/sound/soc/codecs/cs35l41-i2c.c index 2f3d1bd8e0463..d5fa8d2c4a703 100644 --- a/sound/soc/codecs/cs35l41-i2c.c +++ b/sound/soc/codecs/cs35l41-i2c.c @@ -75,7 +75,9 @@ static int cs35l41_i2c_remove(struct i2c_client *client) { struct cs35l41_private *cs35l41 = i2c_get_clientdata(client); - return cs35l41_remove(cs35l41); + cs35l41_remove(cs35l41); + + return 0; } #ifdef CONFIG_OF diff --git a/sound/soc/codecs/cs35l41-spi.c b/sound/soc/codecs/cs35l41-spi.c index eac64779eea89..90a921f726c3b 100644 --- a/sound/soc/codecs/cs35l41-spi.c +++ b/sound/soc/codecs/cs35l41-spi.c @@ -100,7 +100,9 @@ static int cs35l41_spi_remove(struct spi_device *spi) { struct cs35l41_private *cs35l41 = spi_get_drvdata(spi); - return cs35l41_remove(cs35l41); + cs35l41_remove(cs35l41); + + return 0; } #ifdef CONFIG_OF diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c index b16eb6610c0e9..94ed21d7676fb 100644 --- a/sound/soc/codecs/cs35l41.c +++ b/sound/soc/codecs/cs35l41.c @@ -1433,13 +1433,11 @@ err: return ret; } -int cs35l41_remove(struct cs35l41_private *cs35l41) +void cs35l41_remove(struct cs35l41_private *cs35l41) { regmap_write(cs35l41->regmap, CS35L41_IRQ1_MASK1, 0xFFFFFFFF); regulator_bulk_disable(CS35L41_NUM_SUPPLIES, cs35l41->supplies); gpiod_set_value_cansleep(cs35l41->reset_gpio, 0); - - return 0; } MODULE_DESCRIPTION("ASoC CS35L41 driver"); diff --git a/sound/soc/codecs/cs35l41.h b/sound/soc/codecs/cs35l41.h index 0e2639d6ef193..6cffe8a55beb1 100644 --- a/sound/soc/codecs/cs35l41.h +++ b/sound/soc/codecs/cs35l41.h @@ -770,6 +770,6 @@ struct cs35l41_private { int cs35l41_probe(struct cs35l41_private *cs35l41, struct cs35l41_platform_data *pdata); -int cs35l41_remove(struct cs35l41_private *cs35l41); +void cs35l41_remove(struct cs35l41_private *cs35l41); #endif /*__CS35L41_H__*/ -- 2.30.2