| Message ID | 20220526204145.1725323-1-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: da7219: Drop no-op remove function | expand |
On Thu, May 26, 2022 at 10:41:45PM +0200, Uwe Kleine-König wrote: > 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> > --- > 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 c7493549a9a5..7df18a2c36b9 100644 > --- a/sound/soc/codecs/da7219.c > +++ b/sound/soc/codecs/da7219.c > @@ -2694,11 +2694,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", }, > { } > @@ -2712,7 +2707,6 @@ static struct i2c_driver da7219_i2c_driver = { > .acpi_match_table = ACPI_PTR(da7219_acpi_match), > }, > .probe = da7219_i2c_probe, > - .remove = da7219_i2c_remove, > .id_table = da7219_i2c_id, > }; This patch conflicts with 89be5dc60d67 ("ASoC: da[79]*: use simple i2c probe function"), the trivial(?) conflict resolution is: diff --cc sound/soc/codecs/da7219.c index 7fdef38ed8cd,7df18a2c36b9..000000000000 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@@ -2710,8 -2706,7 +2705,7 @@@ static struct i2c_driver da7219_i2c_dri .of_match_table = of_match_ptr(da7219_of_match), .acpi_match_table = ACPI_PTR(da7219_acpi_match), }, - .probe = da7219_i2c_probe, + .probe_new = da7219_i2c_probe, - .remove = da7219_i2c_remove, .id_table = da7219_i2c_id, }; Please tell me if I should resend the patch rebased to sound.git/for-next (or 5.19-rc1 once that's out). The same applies to: ASoC: lm49453: Drop no-op remove function ASoC: da732x: Drop no-op remove function ASoC: ak4642: Drop no-op remove function Best regards Uwe
On Mon, May 30, 2022 at 10:36:16AM +0200, Uwe Kleine-König wrote: > This patch conflicts with 89be5dc60d67 ("ASoC: da[79]*: use simple i2c > probe function"), the trivial(?) conflict resolution is: > Please tell me if I should resend the patch rebased to > sound.git/for-next (or 5.19-rc1 once that's out). The same applies to: > > ASoC: lm49453: Drop no-op remove function > ASoC: da732x: Drop no-op remove function > ASoC: ak4642: Drop no-op remove function It'd be really handy if you could resend please.
On Mon, May 30, 2022 at 05:00:20PM +0200, Mark Brown wrote: > On Mon, May 30, 2022 at 10:36:16AM +0200, Uwe Kleine-König wrote: > > > This patch conflicts with 89be5dc60d67 ("ASoC: da[79]*: use simple i2c > > probe function"), the trivial(?) conflict resolution is: > > > Please tell me if I should resend the patch rebased to > > sound.git/for-next (or 5.19-rc1 once that's out). The same applies to: > > > > ASoC: lm49453: Drop no-op remove function > > ASoC: da732x: Drop no-op remove function > > ASoC: ak4642: Drop no-op remove function > > It'd be really handy if you could resend please. OK, will do when 5.19-rc1 is out. Best regards Uwe
diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index c7493549a9a5..7df18a2c36b9 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -2694,11 +2694,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", }, { } @@ -2712,7 +2707,6 @@ static struct i2c_driver da7219_i2c_driver = { .acpi_match_table = ACPI_PTR(da7219_acpi_match), }, .probe = 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> --- sound/soc/codecs/da7219.c | 6 ------ 1 file changed, 6 deletions(-) base-commit: 4b0986a3613c92f4ec1bdc7f60ec66fea135991f