| Message ID | 20230524151646.486847-3-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | staging: Switch i2c drivers back to use .probe() | expand |
Hi, On 5/24/23 17:16, Uwe Kleine-König wrote: > After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() > call-back type"), all drivers being converted to .probe_new() and then > 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") convert > back to (the new) .probe() to be able to eventually drop .probe_new() from > struct i2c_driver. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Thank you for the patch. I have merged this into: https://git.kernel.org/pub/scm/linux/kernel/git/hansg/linux.git/log/?h=media-atomisp And I'll include this in the atomisp linux-media pull-req which I send to Mauro around rc5 / rc6 time. (I'm currently doing a lot of work on the atomisp code, so merging this through my atomisp branch is best to avoid conflicts) Regards, Hans > --- > drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 2 +- > drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 2 +- > drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 2 +- > drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c | 2 +- > drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 2 +- > drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 2 +- > drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2 +- > 7 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c > index 273155308fe3..21eb4234a081 100644 > --- a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c > +++ b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c > @@ -483,7 +483,7 @@ static struct i2c_driver gc0310_driver = { > .pm = pm_sleep_ptr(&gc0310_pm_ops), > .acpi_match_table = gc0310_acpi_match, > }, > - .probe_new = gc0310_probe, > + .probe = gc0310_probe, > .remove = gc0310_remove, > }; > module_i2c_driver(gc0310_driver); > diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c > index cb4c79b483ca..9fa390fbc5f3 100644 > --- a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c > +++ b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c > @@ -864,7 +864,7 @@ static struct i2c_driver gc2235_driver = { > .name = "gc2235", > .acpi_match_table = gc2235_acpi_match, > }, > - .probe_new = gc2235_probe, > + .probe = gc2235_probe, > .remove = gc2235_remove, > }; > module_i2c_driver(gc2235_driver); > diff --git a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c > index c4ce4cd445d7..cf5d9317b11a 100644 > --- a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c > +++ b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c > @@ -945,7 +945,7 @@ static struct i2c_driver lm3554_driver = { > .pm = &lm3554_pm_ops, > .acpi_match_table = lm3554_acpi_match, > }, > - .probe_new = lm3554_probe, > + .probe = lm3554_probe, > .remove = lm3554_remove, > }; > module_i2c_driver(lm3554_driver); > diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c > index 0e5a981dd331..1c6643c442ef 100644 > --- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c > +++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c > @@ -1600,7 +1600,7 @@ static struct i2c_driver mt9m114_driver = { > .name = "mt9m114", > .acpi_match_table = mt9m114_acpi_match, > }, > - .probe_new = mt9m114_probe, > + .probe = mt9m114_probe, > .remove = mt9m114_remove, > }; > module_i2c_driver(mt9m114_driver); > diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c > index 63de214916f5..b5d93a96d588 100644 > --- a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c > +++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c > @@ -719,7 +719,7 @@ static struct i2c_driver ov2680_driver = { > .pm = pm_sleep_ptr(&ov2680_pm_ops), > .acpi_match_table = ov2680_acpi_match, > }, > - .probe_new = ov2680_probe, > + .probe = ov2680_probe, > .remove = ov2680_remove, > }; > module_i2c_driver(ov2680_driver); > diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c > index 5d2e6e2e72f0..6a72691ed5b7 100644 > --- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c > +++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c > @@ -1019,7 +1019,7 @@ static struct i2c_driver ov2722_driver = { > .name = "ov2722", > .acpi_match_table = ov2722_acpi_match, > }, > - .probe_new = ov2722_probe, > + .probe = ov2722_probe, > .remove = ov2722_remove, > }; > module_i2c_driver(ov2722_driver); > diff --git a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c > index da8c3b1d3bcd..c94fe8e861a5 100644 > --- a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c > +++ b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c > @@ -1794,7 +1794,7 @@ static struct i2c_driver ov5693_driver = { > .name = "ov5693", > .acpi_match_table = ov5693_acpi_match, > }, > - .probe_new = ov5693_probe, > + .probe = ov5693_probe, > .remove = ov5693_remove, > }; > module_i2c_driver(ov5693_driver);
Hello, On Wed, May 24, 2023 at 05:16:43PM +0200, Uwe Kleine-König wrote: > After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() > call-back type"), all drivers being converted to .probe_new() and then > 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") convert > back to (the new) .probe() to be able to eventually drop .probe_new() from > struct i2c_driver. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> the four other patches from this series are already in next, this one wasn't picked up yet though. There is another change for staging: media: atomisp in next via Mauro's media-next (branch: fixes). Who wants/should pick up this change? Best regards Uwe
Hi Uwe, On 6/11/23 13:07, Uwe Kleine-König wrote: > Hello, > > On Wed, May 24, 2023 at 05:16:43PM +0200, Uwe Kleine-König wrote: >> After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() >> call-back type"), all drivers being converted to .probe_new() and then >> 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") convert >> back to (the new) .probe() to be able to eventually drop .probe_new() from >> struct i2c_driver. >> >> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > the four other patches from this series are already in next, this one > wasn't picked up yet though. There is another change for staging: media: > atomisp in next via Mauro's media-next (branch: fixes). > > Who wants/should pick up this change? This patch is already in media-staging: https://git.linuxtv.org/media_stage.git/log/?ofs=50 https://git.linuxtv.org/media_stage.git/commit/?id=625ac9af384481e8644e0653a4aa472aa95f0395 So this is on its way to -next already. Regards, Hans
Hello Hans, On Sun, Jun 11, 2023 at 09:16:41PM +0200, Hans de Goede wrote: > On 6/11/23 13:07, Uwe Kleine-König wrote: > > Hello, > > > > On Wed, May 24, 2023 at 05:16:43PM +0200, Uwe Kleine-König wrote: > >> After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() > >> call-back type"), all drivers being converted to .probe_new() and then > >> 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") convert > >> back to (the new) .probe() to be able to eventually drop .probe_new() from > >> struct i2c_driver. > >> > >> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > > > the four other patches from this series are already in next, this one > > wasn't picked up yet though. There is another change for staging: media: > > atomisp in next via Mauro's media-next (branch: fixes). > > > > Who wants/should pick up this change? > > This patch is already in media-staging: > > https://git.linuxtv.org/media_stage.git/log/?ofs=50 > https://git.linuxtv.org/media_stage.git/commit/?id=625ac9af384481e8644e0653a4aa472aa95f0395 > > So this is on its way to -next already. I admit I missed your mail from May 24 where you announced your PR around -rc5/-rc6 time. Otherwise I wouldn't have bothered you and the others. Sorry and thanks Uwe
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c index 273155308fe3..21eb4234a081 100644 --- a/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c +++ b/drivers/staging/media/atomisp/i2c/atomisp-gc0310.c @@ -483,7 +483,7 @@ static struct i2c_driver gc0310_driver = { .pm = pm_sleep_ptr(&gc0310_pm_ops), .acpi_match_table = gc0310_acpi_match, }, - .probe_new = gc0310_probe, + .probe = gc0310_probe, .remove = gc0310_remove, }; module_i2c_driver(gc0310_driver); diff --git a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c index cb4c79b483ca..9fa390fbc5f3 100644 --- a/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c +++ b/drivers/staging/media/atomisp/i2c/atomisp-gc2235.c @@ -864,7 +864,7 @@ static struct i2c_driver gc2235_driver = { .name = "gc2235", .acpi_match_table = gc2235_acpi_match, }, - .probe_new = gc2235_probe, + .probe = gc2235_probe, .remove = gc2235_remove, }; module_i2c_driver(gc2235_driver); diff --git a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c index c4ce4cd445d7..cf5d9317b11a 100644 --- a/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c +++ b/drivers/staging/media/atomisp/i2c/atomisp-lm3554.c @@ -945,7 +945,7 @@ static struct i2c_driver lm3554_driver = { .pm = &lm3554_pm_ops, .acpi_match_table = lm3554_acpi_match, }, - .probe_new = lm3554_probe, + .probe = lm3554_probe, .remove = lm3554_remove, }; module_i2c_driver(lm3554_driver); diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c index 0e5a981dd331..1c6643c442ef 100644 --- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c +++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c @@ -1600,7 +1600,7 @@ static struct i2c_driver mt9m114_driver = { .name = "mt9m114", .acpi_match_table = mt9m114_acpi_match, }, - .probe_new = mt9m114_probe, + .probe = mt9m114_probe, .remove = mt9m114_remove, }; module_i2c_driver(mt9m114_driver); diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c index 63de214916f5..b5d93a96d588 100644 --- a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c @@ -719,7 +719,7 @@ static struct i2c_driver ov2680_driver = { .pm = pm_sleep_ptr(&ov2680_pm_ops), .acpi_match_table = ov2680_acpi_match, }, - .probe_new = ov2680_probe, + .probe = ov2680_probe, .remove = ov2680_remove, }; module_i2c_driver(ov2680_driver); diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c index 5d2e6e2e72f0..6a72691ed5b7 100644 --- a/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c +++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2722.c @@ -1019,7 +1019,7 @@ static struct i2c_driver ov2722_driver = { .name = "ov2722", .acpi_match_table = ov2722_acpi_match, }, - .probe_new = ov2722_probe, + .probe = ov2722_probe, .remove = ov2722_remove, }; module_i2c_driver(ov2722_driver); diff --git a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c index da8c3b1d3bcd..c94fe8e861a5 100644 --- a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c +++ b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c @@ -1794,7 +1794,7 @@ static struct i2c_driver ov5693_driver = { .name = "ov5693", .acpi_match_table = ov5693_acpi_match, }, - .probe_new = ov5693_probe, + .probe = ov5693_probe, .remove = ov5693_remove, }; module_i2c_driver(ov5693_driver);
After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() call-back type"), all drivers being converted to .probe_new() and then 03c835f498b5 ("i2c: Switch .probe() to not take an id parameter") convert back to (the new) .probe() to be able to eventually drop .probe_new() from struct i2c_driver. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 2 +- drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 2 +- drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 2 +- drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c | 2 +- drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 2 +- drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 2 +- drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)