Commit ca7270a7 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown

ASoC: cs35l41: Make cs35l41_remove() return void

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20211020132416.30288-1-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 03f0267b
...@@ -75,7 +75,9 @@ static int cs35l41_i2c_remove(struct i2c_client *client) ...@@ -75,7 +75,9 @@ static int cs35l41_i2c_remove(struct i2c_client *client)
{ {
struct cs35l41_private *cs35l41 = i2c_get_clientdata(client); struct cs35l41_private *cs35l41 = i2c_get_clientdata(client);
return cs35l41_remove(cs35l41); cs35l41_remove(cs35l41);
return 0;
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
......
...@@ -100,7 +100,9 @@ static int cs35l41_spi_remove(struct spi_device *spi) ...@@ -100,7 +100,9 @@ static int cs35l41_spi_remove(struct spi_device *spi)
{ {
struct cs35l41_private *cs35l41 = spi_get_drvdata(spi); struct cs35l41_private *cs35l41 = spi_get_drvdata(spi);
return cs35l41_remove(cs35l41); cs35l41_remove(cs35l41);
return 0;
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
......
...@@ -1433,13 +1433,11 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, ...@@ -1433,13 +1433,11 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,
return ret; return ret;
} }
int cs35l41_remove(struct cs35l41_private *cs35l41) void cs35l41_remove(struct cs35l41_private *cs35l41)
{ {
regmap_write(cs35l41->regmap, CS35L41_IRQ1_MASK1, 0xFFFFFFFF); regmap_write(cs35l41->regmap, CS35L41_IRQ1_MASK1, 0xFFFFFFFF);
regulator_bulk_disable(CS35L41_NUM_SUPPLIES, cs35l41->supplies); regulator_bulk_disable(CS35L41_NUM_SUPPLIES, cs35l41->supplies);
gpiod_set_value_cansleep(cs35l41->reset_gpio, 0); gpiod_set_value_cansleep(cs35l41->reset_gpio, 0);
return 0;
} }
MODULE_DESCRIPTION("ASoC CS35L41 driver"); MODULE_DESCRIPTION("ASoC CS35L41 driver");
......
...@@ -770,6 +770,6 @@ struct cs35l41_private { ...@@ -770,6 +770,6 @@ struct cs35l41_private {
int cs35l41_probe(struct cs35l41_private *cs35l41, int cs35l41_probe(struct cs35l41_private *cs35l41,
struct cs35l41_platform_data *pdata); struct cs35l41_platform_data *pdata);
int cs35l41_remove(struct cs35l41_private *cs35l41); void cs35l41_remove(struct cs35l41_private *cs35l41);
#endif /*__CS35L41_H__*/ #endif /*__CS35L41_H__*/
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment