| Message ID | 20241011070828.851449-2-u.kleine-koenig@baylibre.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] staging: media: Switch back to struct platform_driver::remove() | expand |
Hi Uwe, On Fri, Oct 11, 2024 at 9:09 AM Uwe Kleine-König <u.kleine-koenig@baylibre.com> wrote: > > After commit 0edb555a65d1 ("platform: Make platform_driver::remove() > return void") .remove() is (again) the right callback to implement for > platform drivers. > > Convert all platform drivers below drivers/staging/media/ to use > .remove(), with the eventual goal to drop struct > platform_driver::remove_new(). As .remove() and .remove_new() have the > same prototypes, conversion is done by just changing the structure > member name in the driver initializer. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> > --- > Hello, > > just rebase to > https://gitlab.freedesktop.org/linux-media/media-committers.git next > to make the CI happy. The only change is that the adaption for > drivers/staging/media/omap4iss/iss.c is dropped from v2 as this file was > deleted in above branch (since yesterday's next). > > v1 available at https://lore.kernel.org/linux-media/20241011055540.844629-2-u.kleine-koenig@baylibre.com > > Best regards > Uwe > > drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c | 2 +- > drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c | 2 +- > drivers/staging/media/imx/imx-media-csi.c | 2 +- > drivers/staging/media/imx/imx-media-dev.c | 2 +- > drivers/staging/media/imx/imx6-mipi-csi2.c | 2 +- > drivers/staging/media/meson/vdec/vdec.c | 2 +- > drivers/staging/media/rkvdec/rkvdec.c | 2 +- > drivers/staging/media/starfive/camss/stf-camss.c | 2 +- > drivers/staging/media/sunxi/cedrus/cedrus.c | 2 +- > drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c | 2 +- > drivers/staging/media/tegra-video/csi.c | 2 +- > drivers/staging/media/tegra-video/vi.c | 2 +- > drivers/staging/media/tegra-video/vip.c | 2 +- > 13 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c b/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c > index 712f916f0935..bc360875516c 100644 > --- a/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c > +++ b/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c > @@ -629,7 +629,7 @@ MODULE_DEVICE_TABLE(of, atmel_isc_of_match); > > static struct platform_driver atmel_isc_driver = { > .probe = atmel_isc_probe, > - .remove_new = atmel_isc_remove, > + .remove = atmel_isc_remove, > .driver = { > .name = "atmel-sama5d2-isc", > .pm = &atmel_isc_dev_pm_ops, > diff --git a/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c b/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c > index 9485167d5b7d..c62985e502e4 100644 > --- a/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c > +++ b/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c > @@ -592,7 +592,7 @@ MODULE_DEVICE_TABLE(of, microchip_xisc_of_match); > > static struct platform_driver microchip_xisc_driver = { > .probe = microchip_xisc_probe, > - .remove_new = microchip_xisc_remove, > + .remove = microchip_xisc_remove, > .driver = { > .name = "microchip-sama7g5-xisc", > .pm = µchip_xisc_dev_pm_ops, > diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c > index 785aac881922..3edbc57be2ca 100644 > --- a/drivers/staging/media/imx/imx-media-csi.c > +++ b/drivers/staging/media/imx/imx-media-csi.c > @@ -2076,7 +2076,7 @@ MODULE_DEVICE_TABLE(platform, imx_csi_ids); > > static struct platform_driver imx_csi_driver = { > .probe = imx_csi_probe, > - .remove_new = imx_csi_remove, > + .remove = imx_csi_remove, > .id_table = imx_csi_ids, > .driver = { > .name = "imx-ipuv3-csi", > diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c > index be54dca11465..a08389b99d14 100644 > --- a/drivers/staging/media/imx/imx-media-dev.c > +++ b/drivers/staging/media/imx/imx-media-dev.c > @@ -129,7 +129,7 @@ MODULE_DEVICE_TABLE(of, imx_media_dt_ids); > > static struct platform_driver imx_media_pdrv = { > .probe = imx_media_probe, > - .remove_new = imx_media_remove, > + .remove = imx_media_remove, > .driver = { > .name = "imx-media", > .of_match_table = imx_media_dt_ids, > diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/media/imx/imx6-mipi-csi2.c > index 0d8b42061623..dd8c7b3233bc 100644 > --- a/drivers/staging/media/imx/imx6-mipi-csi2.c > +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c > @@ -836,7 +836,7 @@ static struct platform_driver csi2_driver = { > .of_match_table = csi2_dt_ids, > }, > .probe = csi2_probe, > - .remove_new = csi2_remove, > + .remove = csi2_remove, > }; > > module_platform_driver(csi2_driver); > diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c > index 5e5b296f93ba..6bf7ade0c6a1 100644 > --- a/drivers/staging/media/meson/vdec/vdec.c > +++ b/drivers/staging/media/meson/vdec/vdec.c > @@ -1119,7 +1119,7 @@ static void vdec_remove(struct platform_device *pdev) > > static struct platform_driver meson_vdec_driver = { > .probe = vdec_probe, > - .remove_new = vdec_remove, > + .remove = vdec_remove, > .driver = { > .name = "meson-vdec", > .of_match_table = vdec_dt_match, > diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c > index ac398b5a9736..433df4778c95 100644 > --- a/drivers/staging/media/rkvdec/rkvdec.c > +++ b/drivers/staging/media/rkvdec/rkvdec.c > @@ -1103,7 +1103,7 @@ static const struct dev_pm_ops rkvdec_pm_ops = { > > static struct platform_driver rkvdec_driver = { > .probe = rkvdec_probe, > - .remove_new = rkvdec_remove, > + .remove = rkvdec_remove, > .driver = { > .name = "rkvdec", > .of_match_table = of_rkvdec_match, > diff --git a/drivers/staging/media/starfive/camss/stf-camss.c b/drivers/staging/media/starfive/camss/stf-camss.c > index b6d34145bc19..259aaad010d2 100644 > --- a/drivers/staging/media/starfive/camss/stf-camss.c > +++ b/drivers/staging/media/starfive/camss/stf-camss.c > @@ -422,7 +422,7 @@ static const struct dev_pm_ops stfcamss_pm_ops = { > > static struct platform_driver stfcamss_driver = { > .probe = stfcamss_probe, > - .remove_new = stfcamss_remove, > + .remove = stfcamss_remove, > .driver = { > .name = "starfive-camss", > .pm = &stfcamss_pm_ops, > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c > index f52df6836045..52a9588462ce 100644 > --- a/drivers/staging/media/sunxi/cedrus/cedrus.c > +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c > @@ -705,7 +705,7 @@ static const struct dev_pm_ops cedrus_dev_pm_ops = { > > static struct platform_driver cedrus_driver = { > .probe = cedrus_probe, > - .remove_new = cedrus_remove, > + .remove = cedrus_remove, > .driver = { > .name = CEDRUS_NAME, > .of_match_table = cedrus_dt_match, > diff --git a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c > index 58f8ae92320d..f087643ea2cb 100644 > --- a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c > +++ b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c > @@ -536,7 +536,7 @@ MODULE_DEVICE_TABLE(of, sun6i_isp_of_match); > > static struct platform_driver sun6i_isp_platform_driver = { > .probe = sun6i_isp_probe, > - .remove_new = sun6i_isp_remove, > + .remove = sun6i_isp_remove, > .driver = { > .name = SUN6I_ISP_NAME, > .of_match_table = sun6i_isp_of_match, > diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c > index 255cccd0c5fd..604185c00a1a 100644 > --- a/drivers/staging/media/tegra-video/csi.c > +++ b/drivers/staging/media/tegra-video/csi.c > @@ -858,5 +858,5 @@ struct platform_driver tegra_csi_driver = { > .pm = &tegra_csi_pm_ops, > }, > .probe = tegra_csi_probe, > - .remove_new = tegra_csi_remove, > + .remove = tegra_csi_remove, > }; > diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c > index 57a856a21e90..c068dfedd97a 100644 > --- a/drivers/staging/media/tegra-video/vi.c > +++ b/drivers/staging/media/tegra-video/vi.c > @@ -1979,5 +1979,5 @@ struct platform_driver tegra_vi_driver = { > .pm = &tegra_vi_pm_ops, > }, > .probe = tegra_vi_probe, > - .remove_new = tegra_vi_remove, > + .remove = tegra_vi_remove, > }; > diff --git a/drivers/staging/media/tegra-video/vip.c b/drivers/staging/media/tegra-video/vip.c > index 8504b9ea9cea..5ec717f3afd5 100644 > --- a/drivers/staging/media/tegra-video/vip.c > +++ b/drivers/staging/media/tegra-video/vip.c > @@ -281,5 +281,5 @@ struct platform_driver tegra_vip_driver = { > .of_match_table = tegra_vip_of_id_table, > }, > .probe = tegra_vip_probe, > - .remove_new = tegra_vip_remove, > + .remove = tegra_vip_remove, > }; > > base-commit: 4115edeff98f2ce9f821a8bddcd7a646cfdde77a > -- > 2.45.2 > > I sent a patch the other day to convert all staging drivers to use remove which was applied yesterday. See: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/commit/?h=staging-next&id=c1a5060ec80020ce879fa5b2a16875bd9a5ab930 Thanks, Sergio Paracuellos
Hello Sergio, On Fri, Oct 11, 2024 at 09:39:09AM +0200, Sergio Paracuellos wrote: > On Fri, Oct 11, 2024 at 9:09 AM Uwe Kleine-König > <u.kleine-koenig@baylibre.com> wrote: > > > > After commit 0edb555a65d1 ("platform: Make platform_driver::remove() > > return void") .remove() is (again) the right callback to implement for > > platform drivers. > > > > Convert all platform drivers below drivers/staging/media/ to use > > .remove(), with the eventual goal to drop struct > > platform_driver::remove_new(). As .remove() and .remove_new() have the > > same prototypes, conversion is done by just changing the structure > > member name in the driver initializer. > > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> > > I sent a patch the other day to convert all staging drivers to use > remove which was applied yesterday. > > See: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/commit/?h=staging-next&id=c1a5060ec80020ce879fa5b2a16875bd9a5ab930 If you really must grab this quest from me, please coordinate, or at least Cc: me on your patches. Uwe
On Fri, Oct 11, 2024 at 11:46 PM Uwe Kleine-König <u.kleine-koenig@baylibre.com> wrote: > > Hello Sergio, > > On Fri, Oct 11, 2024 at 09:39:09AM +0200, Sergio Paracuellos wrote: > > On Fri, Oct 11, 2024 at 9:09 AM Uwe Kleine-König > > <u.kleine-koenig@baylibre.com> wrote: > > > > > > After commit 0edb555a65d1 ("platform: Make platform_driver::remove() > > > return void") .remove() is (again) the right callback to implement for > > > platform drivers. > > > > > > Convert all platform drivers below drivers/staging/media/ to use > > > .remove(), with the eventual goal to drop struct > > > platform_driver::remove_new(). As .remove() and .remove_new() have the > > > same prototypes, conversion is done by just changing the structure > > > member name in the driver initializer. > > > > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> > > > > I sent a patch the other day to convert all staging drivers to use > > remove which was applied yesterday. > > > > See: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/commit/?h=staging-next&id=c1a5060ec80020ce879fa5b2a16875bd9a5ab930 > > If you really must grab this quest from me, please coordinate, or at > least Cc: me on your patches. I did not know you already have patches for staging and only sent this to the staging list itself. Sorry for that. If you already have patches for remaining stuff I stop sending patches about this. Sorry for the inconvenience and let me know if you need my help in any way. Best regards, Sergio Paracuellos > > Uwe
diff --git a/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c b/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c index 712f916f0935..bc360875516c 100644 --- a/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c +++ b/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c @@ -629,7 +629,7 @@ MODULE_DEVICE_TABLE(of, atmel_isc_of_match); static struct platform_driver atmel_isc_driver = { .probe = atmel_isc_probe, - .remove_new = atmel_isc_remove, + .remove = atmel_isc_remove, .driver = { .name = "atmel-sama5d2-isc", .pm = &atmel_isc_dev_pm_ops, diff --git a/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c b/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c index 9485167d5b7d..c62985e502e4 100644 --- a/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c +++ b/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c @@ -592,7 +592,7 @@ MODULE_DEVICE_TABLE(of, microchip_xisc_of_match); static struct platform_driver microchip_xisc_driver = { .probe = microchip_xisc_probe, - .remove_new = microchip_xisc_remove, + .remove = microchip_xisc_remove, .driver = { .name = "microchip-sama7g5-xisc", .pm = µchip_xisc_dev_pm_ops, diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c index 785aac881922..3edbc57be2ca 100644 --- a/drivers/staging/media/imx/imx-media-csi.c +++ b/drivers/staging/media/imx/imx-media-csi.c @@ -2076,7 +2076,7 @@ MODULE_DEVICE_TABLE(platform, imx_csi_ids); static struct platform_driver imx_csi_driver = { .probe = imx_csi_probe, - .remove_new = imx_csi_remove, + .remove = imx_csi_remove, .id_table = imx_csi_ids, .driver = { .name = "imx-ipuv3-csi", diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c index be54dca11465..a08389b99d14 100644 --- a/drivers/staging/media/imx/imx-media-dev.c +++ b/drivers/staging/media/imx/imx-media-dev.c @@ -129,7 +129,7 @@ MODULE_DEVICE_TABLE(of, imx_media_dt_ids); static struct platform_driver imx_media_pdrv = { .probe = imx_media_probe, - .remove_new = imx_media_remove, + .remove = imx_media_remove, .driver = { .name = "imx-media", .of_match_table = imx_media_dt_ids, diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/media/imx/imx6-mipi-csi2.c index 0d8b42061623..dd8c7b3233bc 100644 --- a/drivers/staging/media/imx/imx6-mipi-csi2.c +++ b/drivers/staging/media/imx/imx6-mipi-csi2.c @@ -836,7 +836,7 @@ static struct platform_driver csi2_driver = { .of_match_table = csi2_dt_ids, }, .probe = csi2_probe, - .remove_new = csi2_remove, + .remove = csi2_remove, }; module_platform_driver(csi2_driver); diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c index 5e5b296f93ba..6bf7ade0c6a1 100644 --- a/drivers/staging/media/meson/vdec/vdec.c +++ b/drivers/staging/media/meson/vdec/vdec.c @@ -1119,7 +1119,7 @@ static void vdec_remove(struct platform_device *pdev) static struct platform_driver meson_vdec_driver = { .probe = vdec_probe, - .remove_new = vdec_remove, + .remove = vdec_remove, .driver = { .name = "meson-vdec", .of_match_table = vdec_dt_match, diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c index ac398b5a9736..433df4778c95 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -1103,7 +1103,7 @@ static const struct dev_pm_ops rkvdec_pm_ops = { static struct platform_driver rkvdec_driver = { .probe = rkvdec_probe, - .remove_new = rkvdec_remove, + .remove = rkvdec_remove, .driver = { .name = "rkvdec", .of_match_table = of_rkvdec_match, diff --git a/drivers/staging/media/starfive/camss/stf-camss.c b/drivers/staging/media/starfive/camss/stf-camss.c index b6d34145bc19..259aaad010d2 100644 --- a/drivers/staging/media/starfive/camss/stf-camss.c +++ b/drivers/staging/media/starfive/camss/stf-camss.c @@ -422,7 +422,7 @@ static const struct dev_pm_ops stfcamss_pm_ops = { static struct platform_driver stfcamss_driver = { .probe = stfcamss_probe, - .remove_new = stfcamss_remove, + .remove = stfcamss_remove, .driver = { .name = "starfive-camss", .pm = &stfcamss_pm_ops, diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c index f52df6836045..52a9588462ce 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c @@ -705,7 +705,7 @@ static const struct dev_pm_ops cedrus_dev_pm_ops = { static struct platform_driver cedrus_driver = { .probe = cedrus_probe, - .remove_new = cedrus_remove, + .remove = cedrus_remove, .driver = { .name = CEDRUS_NAME, .of_match_table = cedrus_dt_match, diff --git a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c index 58f8ae92320d..f087643ea2cb 100644 --- a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c +++ b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c @@ -536,7 +536,7 @@ MODULE_DEVICE_TABLE(of, sun6i_isp_of_match); static struct platform_driver sun6i_isp_platform_driver = { .probe = sun6i_isp_probe, - .remove_new = sun6i_isp_remove, + .remove = sun6i_isp_remove, .driver = { .name = SUN6I_ISP_NAME, .of_match_table = sun6i_isp_of_match, diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c index 255cccd0c5fd..604185c00a1a 100644 --- a/drivers/staging/media/tegra-video/csi.c +++ b/drivers/staging/media/tegra-video/csi.c @@ -858,5 +858,5 @@ struct platform_driver tegra_csi_driver = { .pm = &tegra_csi_pm_ops, }, .probe = tegra_csi_probe, - .remove_new = tegra_csi_remove, + .remove = tegra_csi_remove, }; diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c index 57a856a21e90..c068dfedd97a 100644 --- a/drivers/staging/media/tegra-video/vi.c +++ b/drivers/staging/media/tegra-video/vi.c @@ -1979,5 +1979,5 @@ struct platform_driver tegra_vi_driver = { .pm = &tegra_vi_pm_ops, }, .probe = tegra_vi_probe, - .remove_new = tegra_vi_remove, + .remove = tegra_vi_remove, }; diff --git a/drivers/staging/media/tegra-video/vip.c b/drivers/staging/media/tegra-video/vip.c index 8504b9ea9cea..5ec717f3afd5 100644 --- a/drivers/staging/media/tegra-video/vip.c +++ b/drivers/staging/media/tegra-video/vip.c @@ -281,5 +281,5 @@ struct platform_driver tegra_vip_driver = { .of_match_table = tegra_vip_of_id_table, }, .probe = tegra_vip_probe, - .remove_new = tegra_vip_remove, + .remove = tegra_vip_remove, };
After commit 0edb555a65d1 ("platform: Make platform_driver::remove() return void") .remove() is (again) the right callback to implement for platform drivers. Convert all platform drivers below drivers/staging/media/ to use .remove(), with the eventual goal to drop struct platform_driver::remove_new(). As .remove() and .remove_new() have the same prototypes, conversion is done by just changing the structure member name in the driver initializer. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> --- Hello, just rebase to https://gitlab.freedesktop.org/linux-media/media-committers.git next to make the CI happy. The only change is that the adaption for drivers/staging/media/omap4iss/iss.c is dropped from v2 as this file was deleted in above branch (since yesterday's next). v1 available at https://lore.kernel.org/linux-media/20241011055540.844629-2-u.kleine-koenig@baylibre.com Best regards Uwe drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c | 2 +- drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c | 2 +- drivers/staging/media/imx/imx-media-csi.c | 2 +- drivers/staging/media/imx/imx-media-dev.c | 2 +- drivers/staging/media/imx/imx6-mipi-csi2.c | 2 +- drivers/staging/media/meson/vdec/vdec.c | 2 +- drivers/staging/media/rkvdec/rkvdec.c | 2 +- drivers/staging/media/starfive/camss/stf-camss.c | 2 +- drivers/staging/media/sunxi/cedrus/cedrus.c | 2 +- drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c | 2 +- drivers/staging/media/tegra-video/csi.c | 2 +- drivers/staging/media/tegra-video/vi.c | 2 +- drivers/staging/media/tegra-video/vip.c | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) base-commit: 4115edeff98f2ce9f821a8bddcd7a646cfdde77a