Hello, On Mon, Jul 04, 2022 at 10:39:47AM +0200, Uwe Kleine-König wrote: > On Tue, Jun 28, 2022 at 04:03:06PM +0200, Uwe Kleine-König wrote: > > as announced in > > https://lore.kernel.org/linux-i2c/20220609091018.q52fhowlsdbdkct5@xxxxxxxxxxxxxx > > I intend to change the remove prototype for i2c drivers to remove void. > > > > As this touches quite some drivers, the plan is to submit this change > > for inclusion after the next merge window and get it quickly into next > > that other subsystems have enough time to adapt. > > > > Still to give the opportunity to comment I send the patch set out based > > on v5.19-rc4. There are still a few patches in next that are required, > > namely: > > > > d04d46dd82ad iio:magnetometer:mbc150: Make bmc150_magn_remove() return void > > 7576bc05b360 iio:light:vcnl4035: Improve error reporting for problems during .remove() > > ab91da2f2574 iio:light:vcnl4000: Improve error reporting for problems during .remove() > > 5049646718d7 iio:light:us5182d: Improve error reporting for problems during .remove() > > be9f6004be88 iio:light:pa12203001: Improve error reporting for problems during .remove() > > 730cd2f54eba iio:chemical:ccs811: Improve error reporting for problems during .remove() > > a76209246d9f iio:chemical:atlas: Improve error reporting for problems during .remove() > > 8f760ce7affd iio:adc:ti-ads1015: Improve error reporting for problems during .remove() > > ffa952e95d8c iio:adc:ina2xx: Improve error reporting for problems during .remove() > > 48d1ae774099 iio: health: afe4404: Remove duplicated error reporting in .remove() > > 8dc0a72795e4 iio:light:tsl2583: Remove duplicated error reporting in .remove() > > 58a6df5580bb iio:light:stk3310: Remove duplicated error reporting in .remove() > > 44ceb791182a iio:light:opt3001: Remove duplicated error reporting in .remove() > > f0e34d262567 iio:light:jsa1212: Remove duplicated error reporting in .remove() > > 8d3d6baa4990 iio:light:isl29028: Remove duplicated error reporting in .remove() > > 5004e24a466c iio:light:bh1780: Remove duplicated error reporting in .remove() > > 1db6926d611d iio:accel:stk8ba50: Remove duplicated error reporting in .remove() > > 1aec857d50ce iio:accel:stk8312: Remove duplicated error reporting in .remove() > > aae59bdf2585 iio:accel:mc3230: Remove duplicated error reporting in .remove() > > 7df7563b16aa crypto: atmel-ecc - Remove duplicated error reporting in .remove() > > 99ad11e06be8 i2c: dummy: Drop no-op remove function > > 84965cc60e64 ASoC: cs35l45: Make cs35l45_remove() return void > > fb68cb963bb7 ASoC: da732x: Drop no-op remove function > > 3cce931a5e44 ASoC: lm49453: Drop no-op remove function > > 8a291eebeb63 ASoC: da7219: Drop no-op remove function > > 60391d788a22 ASoC: ak4642: Drop no-op remove function > > 51bd0abd873d extcon: fsa9480: Drop no-op remove function > > > > I hope and assume they will all be included in v5.20-rc1. There are 5 > > more patches required that didn't made it into next yet (i.e. patches #1 > > - #5 of this series). > > > > There are also two drivers in next that need adaption: > > > > drivers/gpu/drm/bridge/ti-dlpc3433.c > > drivers/tty/serial/max310x.c > > There is now a third driver in next that is affected: > drivers/char/tpm/tpm_tis_i2c.c that was added with commit > 88f3b0f519c068ad29c92e965239a7900a2deea3 to next. > > A tree containing patched #1 to #5 merges just fine with next/master. > When merging patch 6 into the result the merge resolution looks as > follows: Now there is a forth driver in next that needs adaption: drivers/media/i2c/ar0521.c adding diff --git a/drivers/media/i2c/ar0521.c b/drivers/media/i2c/ar0521.c index c7bdfc69b9be..c6ab531532be 100644 --- a/drivers/media/i2c/ar0521.c +++ b/drivers/media/i2c/ar0521.c @@ -1018,7 +1018,7 @@ static int ar0521_probe(struct i2c_client *client) return ret; } -static int ar0521_remove(struct i2c_client *client) +static void ar0521_remove(struct i2c_client *client) { struct v4l2_subdev *sd = i2c_get_clientdata(client); struct ar0521_dev *sensor = to_ar0521_dev(sd); @@ -1031,7 +1031,6 @@ static int ar0521_remove(struct i2c_client *client) ar0521_power_off(&client->dev); pm_runtime_set_suspended(&client->dev); mutex_destroy(&sensor->lock); - return 0; } static const struct dev_pm_ops ar0521_pm_ops = { to the patch needed on top of v5.20-rc1. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
Attachment:
signature.asc
Description: PGP signature
