Skip to content

Commit

Permalink
ASoC: tlv320aic32x4: Make aic32x4_remove() return void
Browse files Browse the repository at this point in the history
Up to now aic32x4_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@pengutronix.de>
Link: https://lore.kernel.org/r/20211015071113.2795767-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Uwe Kleine-König authored and Mark Brown committed Oct 18, 2021
1 parent b8f3b56 commit 0f88409
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
4 changes: 3 additions & 1 deletion sound/soc/codecs/tlv320aic32x4-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c,

static int aic32x4_i2c_remove(struct i2c_client *i2c)
{
return aic32x4_remove(&i2c->dev);
aic32x4_remove(&i2c->dev);

return 0;
}

static const struct i2c_device_id aic32x4_i2c_id[] = {
Expand Down
4 changes: 3 additions & 1 deletion sound/soc/codecs/tlv320aic32x4-spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ static int aic32x4_spi_probe(struct spi_device *spi)

static int aic32x4_spi_remove(struct spi_device *spi)
{
return aic32x4_remove(&spi->dev);
aic32x4_remove(&spi->dev);

return 0;
}

static const struct spi_device_id aic32x4_spi_id[] = {
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/codecs/tlv320aic32x4.c
Original file line number Diff line number Diff line change
Expand Up @@ -1418,13 +1418,11 @@ int aic32x4_probe(struct device *dev, struct regmap *regmap)
}
EXPORT_SYMBOL(aic32x4_probe);

int aic32x4_remove(struct device *dev)
void aic32x4_remove(struct device *dev)
{
struct aic32x4_priv *aic32x4 = dev_get_drvdata(dev);

aic32x4_disable_regulators(aic32x4);

return 0;
}
EXPORT_SYMBOL(aic32x4_remove);

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/tlv320aic32x4.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ enum aic32x4_type {

extern const struct regmap_config aic32x4_regmap_config;
int aic32x4_probe(struct device *dev, struct regmap *regmap);
int aic32x4_remove(struct device *dev);
void aic32x4_remove(struct device *dev);
int aic32x4_register_clocks(struct device *dev, const char *mclk_name);

/* tlv320aic32x4 register space (in decimal to match datasheet) */
Expand Down

0 comments on commit 0f88409

Please sign in to comment.