Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-25 14:40:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: cs35l41: Make cs35l41_remove() return void

Browse Source 
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 <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20211020132416.30288-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Uwe Kleine-König 2021-10-20 15:24:16 +02:00 committed by Mark Brown
parent 03f0267b09
commit ca7270a7b6
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/codecs/cs35l41-i2c.c
View File

@ -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

4
sound/soc/codecs/cs35l41-spi.c
View File

@ -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

4
sound/soc/codecs/cs35l41.c
View File

@ -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");

2
sound/soc/codecs/cs35l41.h
View File

@ -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__*/