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

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.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6c8552eb

sound/soc/codecs/tlv320aic3x-i2c.c

+3 −1
Original line number Diff line number Diff line
@@ -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)

{

	return aic3x_remove(&i2c->dev);

	aic3x_remove(&i2c->dev);



	return 0;

}



static const struct i2c_device_id aic3x_i2c_id[] = {

sound/soc/codecs/tlv320aic3x-spi.c

+3 −1
Original line number Diff line number Diff line
@@ -37,7 +37,9 @@ static int aic3x_spi_probe(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[] = {

sound/soc/codecs/tlv320aic3x.c

+1 −2
Original line number Diff line number Diff line
@@ -1870,7 +1870,7 @@ int aic3x_probe(struct device *dev, struct regmap *regmap, kernel_ulong_t driver 
}

EXPORT_SYMBOL(aic3x_probe);



int aic3x_remove(struct device *dev)

void aic3x_remove(struct device *dev)

{

	struct aic3x_priv *aic3x = dev_get_drvdata(dev);
@@ -1881,7 +1881,6 @@ int aic3x_remove(struct device *dev) 
		gpio_set_value(aic3x->gpio_reset, 0);

		gpio_free(aic3x->gpio_reset);

	}

	return 0;

}

EXPORT_SYMBOL(aic3x_remove);

sound/soc/codecs/tlv320aic3x.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ struct regmap_config; 


extern const struct regmap_config aic3x_regmap;

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_33 1