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

Uwe Kleine-König · tiwai · commit 85c25662d189 · 2022-01-18T14:08:05.000+01:00
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>
diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c
@@ -525,7 +525,7 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i
 }
 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);
 
diff --git a/sound/pci/hda/cs35l41_hda.h b/sound/pci/hda/cs35l41_hda.h
@@ -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__*/
diff --git a/sound/pci/hda/cs35l41_hda_i2c.c b/sound/pci/hda/cs35l41_hda_i2c.c
@@ -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[] = {
diff --git a/sound/pci/hda/cs35l41_hda_spi.c b/sound/pci/hda/cs35l41_hda_spi.c
@@ -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[] = {

Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,7 @@ int cs35l41_hda_probe(struct device dev, const char device_name, int id, int i`
`525`	`525`	`}`
`526`	`526`	`EXPORT_SYMBOL_NS_GPL(cs35l41_hda_probe, SND_HDA_SCODEC_CS35L41);`
`527`	`527`
`528`		`-int cs35l41_hda_remove(struct device *dev)`
	`528`	`+void cs35l41_hda_remove(struct device *dev)`
`529`	`529`	`{`
`530`	`530`	`struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);`
`531`	`531`
`@@ -534,8 +534,6 @@ int cs35l41_hda_remove(struct device *dev)`
`534`	`534`	`if (!cs35l41->vspk_always_on)`
`535`	`535`	`gpiod_set_value_cansleep(cs35l41->reset_gpio, 0);`
`536`	`536`	`gpiod_put(cs35l41->reset_gpio);`
`537`		`-`
`538`		`- return 0;`
`539`	`537`	`}`
`540`	`538`	`EXPORT_SYMBOL_NS_GPL(cs35l41_hda_remove, SND_HDA_SCODEC_CS35L41);`
`541`	`539`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,9 @@ static int cs35l41_hda_i2c_probe(struct i2c_client *clt, const struct i2c_device`
`32`	`32`
`33`	`33`	`static int cs35l41_hda_i2c_remove(struct i2c_client *clt)`
`34`	`34`	`{`
`35`		`- return cs35l41_hda_remove(&clt->dev);`
	`35`	`+ cs35l41_hda_remove(&clt->dev);`
	`36`	`+`
	`37`	`+ return 0;`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`static const struct i2c_device_id cs35l41_hda_i2c_id[] = {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,9 @@ static int cs35l41_hda_spi_probe(struct spi_device *spi)`
`30`	`30`
`31`	`31`	`static int cs35l41_hda_spi_remove(struct spi_device *spi)`
`32`	`32`	`{`
`33`		`- return cs35l41_hda_remove(&spi->dev);`
	`33`	`+ cs35l41_hda_remove(&spi->dev);`
	`34`	`+`
	`35`	`+ return 0;`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`static const struct spi_device_id cs35l41_hda_spi_id[] = {`