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

ASoC: tlv320aic3x: Make aic3x_remove() return void

Up to now aic3x_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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20211019074125.3812513-1-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6c8552eb
...@@ -32,7 +32,9 @@ static int aic3x_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *i ...@@ -32,7 +32,9 @@ static int aic3x_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *i
static int aic3x_i2c_remove(struct i2c_client *i2c) static int aic3x_i2c_remove(struct i2c_client *i2c)
{ {
return aic3x_remove(&i2c->dev); aic3x_remove(&i2c->dev);
return 0;
} }
static const struct i2c_device_id aic3x_i2c_id[] = { static const struct i2c_device_id aic3x_i2c_id[] = {
......
...@@ -37,7 +37,9 @@ static int aic3x_spi_probe(struct spi_device *spi) ...@@ -37,7 +37,9 @@ static int aic3x_spi_probe(struct spi_device *spi)
static int aic3x_spi_remove(struct spi_device *spi) static int aic3x_spi_remove(struct spi_device *spi)
{ {
return aic3x_remove(&spi->dev); aic3x_remove(&spi->dev);
return 0;
} }
static const struct spi_device_id aic3x_spi_id[] = { static const struct spi_device_id aic3x_spi_id[] = {
......
...@@ -1870,7 +1870,7 @@ int aic3x_probe(struct device *dev, struct regmap *regmap, kernel_ulong_t driver ...@@ -1870,7 +1870,7 @@ int aic3x_probe(struct device *dev, struct regmap *regmap, kernel_ulong_t driver
} }
EXPORT_SYMBOL(aic3x_probe); EXPORT_SYMBOL(aic3x_probe);
int aic3x_remove(struct device *dev) void aic3x_remove(struct device *dev)
{ {
struct aic3x_priv *aic3x = dev_get_drvdata(dev); struct aic3x_priv *aic3x = dev_get_drvdata(dev);
...@@ -1881,7 +1881,6 @@ int aic3x_remove(struct device *dev) ...@@ -1881,7 +1881,6 @@ int aic3x_remove(struct device *dev)
gpio_set_value(aic3x->gpio_reset, 0); gpio_set_value(aic3x->gpio_reset, 0);
gpio_free(aic3x->gpio_reset); gpio_free(aic3x->gpio_reset);
} }
return 0;
} }
EXPORT_SYMBOL(aic3x_remove); EXPORT_SYMBOL(aic3x_remove);
......
...@@ -14,7 +14,7 @@ struct regmap_config; ...@@ -14,7 +14,7 @@ struct regmap_config;
extern const struct regmap_config aic3x_regmap; extern const struct regmap_config aic3x_regmap;
int aic3x_probe(struct device *dev, struct regmap *regmap, kernel_ulong_t driver_data); int aic3x_probe(struct device *dev, struct regmap *regmap, kernel_ulong_t driver_data);
int aic3x_remove(struct device *dev); void aic3x_remove(struct device *dev);
#define AIC3X_MODEL_3X 0 #define AIC3X_MODEL_3X 0
#define AIC3X_MODEL_33 1 #define AIC3X_MODEL_33 1
......
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