Commit c1a5060e authored Oct 01, 2024 by Sergio Paracuellos Committed by Greg Kroah-Hartman Oct 09, 2024

staging: Switch back to struct platform_driver::remove()

After commit 0edb555a ("platform: Make platform_driver::remove()
return void") .remove() is (again) the right callback to implement for
platform drivers.

Convert all staging drivers 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: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Link: https://lore.kernel.org/r/20241001085751.282113-1-sergio.paracuellos@gmail.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent d09d3485

drivers/staging/axis-fifo/axis-fifo.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -919,7 +919,7 @@ static struct platform_driver axis_fifo_driver = {
		.of_match_table = axis_fifo_of_match,
		},
		.probe = axis_fifo_probe,
		.remove_new = axis_fifo_remove,
		.remove = axis_fifo_remove,
		};

		static int __init axis_fifo_init(void)

drivers/staging/fbtft/fbtft.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -330,7 +330,7 @@ static struct platform_driver fbtft_driver_platform_driver = { \
		.of_match_table = dt_ids, \
		}, \
		.probe = fbtft_driver_probe_pdev, \
		.remove_new = fbtft_driver_remove_pdev, \
		.remove = fbtft_driver_remove_pdev, \
		}; \
		\
		static int __init fbtft_driver_module_init(void) \

drivers/staging/fieldbus/anybuss/arcx-anybus.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -343,7 +343,7 @@ MODULE_DEVICE_TABLE(of, controller_of_match);

		static struct platform_driver controller_driver = {
		.probe = controller_probe,
		.remove_new = controller_remove,
		.remove = controller_remove,
		.driver = {
		.name = "arcx-anybus-controller",
		.of_match_table = controller_of_match,

drivers/staging/greybus/arche-apb-ctrl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -470,7 +470,7 @@ MODULE_DEVICE_TABLE(of, arche_apb_ctrl_of_match);

		static struct platform_driver arche_apb_ctrl_device_driver = {
		.probe = arche_apb_ctrl_probe,
		.remove_new = arche_apb_ctrl_remove,
		.remove = arche_apb_ctrl_remove,
		.shutdown = arche_apb_ctrl_shutdown,
		.driver = {
		.name = "arche-apb-ctrl",

drivers/staging/greybus/arche-platform.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -623,7 +623,7 @@ MODULE_DEVICE_TABLE(of, arche_platform_of_match);

		static struct platform_driver arche_platform_device_driver = {
		.probe = arche_platform_probe,
		.remove_new = arche_platform_remove,
		.remove = arche_platform_remove,
		.shutdown = arche_platform_shutdown,
		.driver = {
		.name = "arche-platform-ctrl",