[PATCH 0/4] ASoC: Drop some i2c noop remove callbacks
From: Uwe Kleine-König uwe@kleine-koenig.org
Hello,
I intended to send this after -rc1 was cut, but found a few spare minutes to prepare this series. All four patches were sent already before based on v5.18, but there were some conflicting changes added in the merge window. This series contains the four patches on top of current linus/master and so bases on a tree including the conflicting changes. Expecting no more sound changes in this merge window, this should apply cleanly on top of -rc1.
Best regards Uwe
Uwe Kleine-König (4): ASoC: ak4642: Drop no-op remove function ASoC: da7219: Drop no-op remove function ASoC: lm49453: Drop no-op remove function ASoC: da732x: Drop no-op remove function
sound/soc/codecs/ak4613.c | 6 ------ sound/soc/codecs/da7219.c | 6 ------ sound/soc/codecs/da732x.c | 6 ------ sound/soc/codecs/lm49453.c | 6 ------ 4 files changed, 24 deletions(-)
base-commit: 50fd82b3a9a9335df5d50c7ddcb81c81d358c4fc
A remove callback that just returns 0 is equivalent to no callback at all as can be seen in i2c_device_remove(). So simplify accordingly.
Signed-off-by: Uwe Kleine-König u.kleine-koenig@pengutronix.de --- Previous submission:
https://lore.kernel.org/alsa-devel/20220526134239.1593877-1-u.kleine-koenig@...
sound/soc/codecs/ak4613.c | 6 ------ 1 file changed, 6 deletions(-)
diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index 55e773f92122..648208d40d06 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -919,18 +919,12 @@ static int ak4613_i2c_probe(struct i2c_client *i2c) &ak4613_dai, 1); }
-static int ak4613_i2c_remove(struct i2c_client *client) -{ - return 0; -} - static struct i2c_driver ak4613_i2c_driver = { .driver = { .name = "ak4613-codec", .of_match_table = ak4613_of_match, }, .probe_new = ak4613_i2c_probe, - .remove = ak4613_i2c_remove, .id_table = ak4613_i2c_id, };
A remove callback that just returns 0 is equivalent to no callback at all as can be seen in i2c_device_remove(). So simplify accordingly.
Signed-off-by: Uwe Kleine-König u.kleine-koenig@pengutronix.de --- Previous submission:
https://lore.kernel.org/alsa-devel/20220526204145.1725323-1-u.kleine-koenig@...
sound/soc/codecs/da7219.c | 6 ------ 1 file changed, 6 deletions(-)
diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index 7fdef38ed8cd..c18f76f370fc 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -2693,11 +2693,6 @@ static int da7219_i2c_probe(struct i2c_client *i2c) return ret; }
-static int da7219_i2c_remove(struct i2c_client *client) -{ - return 0; -} - static const struct i2c_device_id da7219_i2c_id[] = { { "da7219", }, { } @@ -2711,7 +2706,6 @@ static struct i2c_driver da7219_i2c_driver = { .acpi_match_table = ACPI_PTR(da7219_acpi_match), }, .probe_new = da7219_i2c_probe, - .remove = da7219_i2c_remove, .id_table = da7219_i2c_id, };
A remove callback that just returns 0 is equivalent to no callback at all as can be seen in i2c_device_remove(). So simplify accordingly.
Signed-off-by: Uwe Kleine-König u.kleine-koenig@pengutronix.de --- Previous submission:
https://lore.kernel.org/alsa-devel/20220526204016.1724630-1-u.kleine-koenig@...
sound/soc/codecs/lm49453.c | 6 ------ 1 file changed, 6 deletions(-)
diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c index bd0078e4499b..c4900ada8618 100644 --- a/sound/soc/codecs/lm49453.c +++ b/sound/soc/codecs/lm49453.c @@ -1442,11 +1442,6 @@ static int lm49453_i2c_probe(struct i2c_client *i2c) return ret; }
-static int lm49453_i2c_remove(struct i2c_client *client) -{ - return 0; -} - static const struct i2c_device_id lm49453_i2c_id[] = { { "lm49453", 0 }, { } @@ -1458,7 +1453,6 @@ static struct i2c_driver lm49453_i2c_driver = { .name = "lm49453", }, .probe_new = lm49453_i2c_probe, - .remove = lm49453_i2c_remove, .id_table = lm49453_i2c_id, };
A remove callback that just returns 0 is equivalent to no callback at all as can be seen in i2c_device_remove(). So simplify accordingly.
Signed-off-by: Uwe Kleine-König u.kleine-koenig@pengutronix.de --- Previous submission:
https://lore.kernel.org/alsa-devel/20220526203708.1723898-1-u.kleine-koenig@...
sound/soc/codecs/da732x.c | 6 ------ 1 file changed, 6 deletions(-)
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index f14cddf23f42..3f1cfee10df3 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c @@ -1546,11 +1546,6 @@ static int da732x_i2c_probe(struct i2c_client *i2c) return ret; }
-static int da732x_i2c_remove(struct i2c_client *client) -{ - return 0; -} - static const struct i2c_device_id da732x_i2c_id[] = { { "da7320", 0}, { } @@ -1562,7 +1557,6 @@ static struct i2c_driver da732x_i2c_driver = { .name = "da7320", }, .probe_new = da732x_i2c_probe, - .remove = da732x_i2c_remove, .id_table = da732x_i2c_id, };
On Fri, 3 Jun 2022 16:05:09 +0200, Uwe Kleine-König wrote:
From: Uwe Kleine-König uwe@kleine-koenig.org
Hello,
I intended to send this after -rc1 was cut, but found a few spare minutes to prepare this series. All four patches were sent already before based on v5.18, but there were some conflicting changes added in the merge window. This series contains the four patches on top of current linus/master and so bases on a tree including the conflicting changes. Expecting no more sound changes in this merge window, this should apply cleanly on top of -rc1.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/4] ASoC: ak4642: Drop no-op remove function commit: 60391d788a221f1866492a71929483790b772676 [2/4] ASoC: da7219: Drop no-op remove function commit: 8a291eebeb633316edad2e80537a3c7df83ee8dc [3/4] ASoC: lm49453: Drop no-op remove function commit: 3cce931a5e4487f7339be559e2ea032478be021a [4/4] ASoC: da732x: Drop no-op remove function commit: fb68cb963bb78380166a98beea593d20b956e4c3
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
participants (2)
-
Mark Brown -
Uwe Kleine-König