| Message ID | 20220520173349.774366-1-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | 84965cc60e643db7049eb75bb9a6cc5cd66ee3d8 |
| Headers | show |
| Series | [v2] ASoC: cs35l45: Make cs35l45_remove() return void | expand |
On 20/05/2022 18:33, Uwe Kleine-König wrote: > cs35l45_remove() always returns zero. Make it return no value which > makes it easier to see in the callers that there is no error to handle. > > Also the return value of i2c driver remove callbacks is ignored anyway. > This prepares making i2c remove callbacks return void, too. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > sound/soc/codecs/cs35l45-i2c.c | 4 +++- > sound/soc/codecs/cs35l45.c | 4 +--- > sound/soc/codecs/cs35l45.h | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > Reviewed-by: Richard Fitzgerald <rf@opensource.cirrus.com>
On Fri, 20 May 2022 19:33:49 +0200, Uwe Kleine-König wrote: > cs35l45_remove() always returns zero. Make it return no value which > makes it easier to see in the callers that there is no error to handle. > > Also the return value of i2c driver remove callbacks is ignored anyway. > This prepares making i2c remove callbacks return void, too. > > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: cs35l45: Make cs35l45_remove() return void commit: 84965cc60e643db7049eb75bb9a6cc5cd66ee3d8 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/codecs/cs35l45-i2c.c b/sound/soc/codecs/cs35l45-i2c.c index 18ebf1e14b91..53a57320d0ab 100644 --- a/sound/soc/codecs/cs35l45-i2c.c +++ b/sound/soc/codecs/cs35l45-i2c.c @@ -40,7 +40,9 @@ static int cs35l45_i2c_remove(struct i2c_client *client) { struct cs35l45_private *cs35l45 = i2c_get_clientdata(client); - return cs35l45_remove(cs35l45); + cs35l45_remove(cs35l45); + + return 0; } static const struct of_device_id cs35l45_of_match[] = { diff --git a/sound/soc/codecs/cs35l45.c b/sound/soc/codecs/cs35l45.c index 7822626d3693..64a3abe14010 100644 --- a/sound/soc/codecs/cs35l45.c +++ b/sound/soc/codecs/cs35l45.c @@ -669,7 +669,7 @@ int cs35l45_probe(struct cs35l45_private *cs35l45) } EXPORT_SYMBOL_GPL(cs35l45_probe); -int cs35l45_remove(struct cs35l45_private *cs35l45) +void cs35l45_remove(struct cs35l45_private *cs35l45) { pm_runtime_disable(cs35l45->dev); @@ -677,8 +677,6 @@ int cs35l45_remove(struct cs35l45_private *cs35l45) regulator_disable(cs35l45->vdd_a); /* VDD_BATT must be the last to power-off */ regulator_disable(cs35l45->vdd_batt); - - return 0; } EXPORT_SYMBOL_GPL(cs35l45_remove); diff --git a/sound/soc/codecs/cs35l45.h b/sound/soc/codecs/cs35l45.h index 4e266d19cd1c..680891bcfce9 100644 --- a/sound/soc/codecs/cs35l45.h +++ b/sound/soc/codecs/cs35l45.h @@ -212,6 +212,6 @@ extern const struct regmap_config cs35l45_spi_regmap; int cs35l45_apply_patch(struct cs35l45_private *cs43l45); unsigned int cs35l45_get_clk_freq_id(unsigned int freq); int cs35l45_probe(struct cs35l45_private *cs35l45); -int cs35l45_remove(struct cs35l45_private *cs35l45); +void cs35l45_remove(struct cs35l45_private *cs35l45); #endif /* CS35L45_H */
cs35l45_remove() always returns zero. Make it return no value which makes it easier to see in the callers that there is no error to handle. Also the return value of i2c driver remove callbacks is ignored anyway. This prepares making i2c remove callbacks return void, too. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- sound/soc/codecs/cs35l45-i2c.c | 4 +++- sound/soc/codecs/cs35l45.c | 4 +--- sound/soc/codecs/cs35l45.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) base-commit: 0d463d016000d68d7e982720b5e4380b2d83409a