Commit b8fc42dc authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Hans Verkuil
Browse files

media: 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 platform drivers below drivers/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: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 2f88509d

drivers/media/cec/platform/cec-gpio/cec-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ MODULE_DEVICE_TABLE(of, cec_gpio_match); 


static struct platform_driver cec_gpio_pdrv = {

	.probe	= cec_gpio_probe,

	.remove_new = cec_gpio_remove,

	.remove = cec_gpio_remove,

	.driver = {

		.name		= "cec-gpio",

		.of_match_table	= cec_gpio_match,

drivers/media/cec/platform/cros-ec/cros-ec-cec.c

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ MODULE_DEVICE_TABLE(platform, cros_ec_cec_id); 


static struct platform_driver cros_ec_cec_driver = {

	.probe = cros_ec_cec_probe,

	.remove_new = cros_ec_cec_remove,

	.remove = cros_ec_cec_remove,

	.driver = {

		.name = DRV_NAME,

		.pm = &cros_ec_cec_pm_ops,

drivers/media/cec/platform/meson/ao-cec-g12a.c

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ MODULE_DEVICE_TABLE(of, meson_ao_cec_g12a_of_match); 


static struct platform_driver meson_ao_cec_g12a_driver = {

	.probe   = meson_ao_cec_g12a_probe,

	.remove_new = meson_ao_cec_g12a_remove,

	.remove = meson_ao_cec_g12a_remove,

	.driver  = {

		.name = "meson-ao-cec-g12a",

		.of_match_table = of_match_ptr(meson_ao_cec_g12a_of_match),

drivers/media/cec/platform/meson/ao-cec.c

+1 −1
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ MODULE_DEVICE_TABLE(of, meson_ao_cec_of_match); 


static struct platform_driver meson_ao_cec_driver = {

	.probe   = meson_ao_cec_probe,

	.remove_new = meson_ao_cec_remove,

	.remove = meson_ao_cec_remove,

	.driver  = {

		.name = "meson-ao-cec",

		.of_match_table = meson_ao_cec_of_match,

drivers/media/cec/platform/s5p/s5p_cec.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ MODULE_DEVICE_TABLE(of, s5p_cec_match); 


static struct platform_driver s5p_cec_pdrv = {

	.probe	= s5p_cec_probe,

	.remove_new = s5p_cec_remove,

	.remove = s5p_cec_remove,

	.driver	= {

		.name		= CEC_NAME,

		.of_match_table	= s5p_cec_match,