kevin/linux
1
Fork 0
Code

ALSA: hda: cs35l41: Make cs35l41_hda_remove() return void

Browse Source 
Up to now cs35l41_hda_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>
Reviewed-by: Lucas Tanure <tanureal@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220117220055.120955-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Uwe Kleine-König 2022-01-17 23:00:55 +01:00 committed by Takashi Iwai
parent 8c286a0f97
commit 85c25662d1
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/pci/hda/cs35l41_hda.c
View File

@ -525,7 +525,7 @@ err:
}
EXPORT_SYMBOL_NS_GPL(cs35l41_hda_probe, SND_HDA_SCODEC_CS35L41);
int cs35l41_hda_remove(struct device *dev)
void cs35l41_hda_remove(struct device *dev)
{
struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);
@ -534,8 +534,6 @@ int cs35l41_hda_remove(struct device *dev)
if (!cs35l41->vspk_always_on)
gpiod_set_value_cansleep(cs35l41->reset_gpio, 0);
gpiod_put(cs35l41->reset_gpio);
return 0;
}
EXPORT_SYMBOL_NS_GPL(cs35l41_hda_remove, SND_HDA_SCODEC_CS35L41);

2
sound/pci/hda/cs35l41_hda.h
View File

@ -64,6 +64,6 @@ struct cs35l41_hda {
int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int irq,
struct regmap *regmap);
int cs35l41_hda_remove(struct device *dev);
void cs35l41_hda_remove(struct device *dev);
#endif /*__CS35L41_HDA_H__*/

4
sound/pci/hda/cs35l41_hda_i2c.c
View File

@ -32,7 +32,9 @@ static int cs35l41_hda_i2c_probe(struct i2c_client *clt, const struct i2c_device
static int cs35l41_hda_i2c_remove(struct i2c_client *clt)
{
return cs35l41_hda_remove(&clt->dev);
cs35l41_hda_remove(&clt->dev);
return 0;
}
static const struct i2c_device_id cs35l41_hda_i2c_id[] = {

4
sound/pci/hda/cs35l41_hda_spi.c
View File

@ -30,7 +30,9 @@ static int cs35l41_hda_spi_probe(struct spi_device *spi)
static int cs35l41_hda_spi_remove(struct spi_device *spi)
{
return cs35l41_hda_remove(&spi->dev);
cs35l41_hda_remove(&spi->dev);
return 0;
}
static const struct spi_device_id cs35l41_hda_spi_id[] = {