Commit b32913a5 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Jakub Kicinski
Browse files

ptp: 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/ptp 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.

While touching these drivers, make the alignment of the touched
initializers consistent.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 65ae975e

drivers/ptp/ptp_clockmatrix.c

+1 −1
Original line number Diff line number Diff line
@@ -2471,7 +2471,7 @@ static struct platform_driver idtcm_driver = { 
		.name = "8a3400x-phc",

	},

	.probe = idtcm_probe,

	.remove_new = idtcm_remove,

	.remove = idtcm_remove,

};



module_platform_driver(idtcm_driver);

drivers/ptp/ptp_dte.c

+2 −2
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static struct platform_driver ptp_dte_driver = { 
		.of_match_table = ptp_dte_of_match,

	},

	.probe = ptp_dte_probe,

	.remove_new = ptp_dte_remove,

	.remove = ptp_dte_remove,

};

module_platform_driver(ptp_dte_driver);

drivers/ptp/ptp_fc3.c

+1 −1
Original line number Diff line number Diff line
@@ -1003,7 +1003,7 @@ static struct platform_driver idtfc3_driver = { 
		.name = "rc38xxx-phc",

	},

	.probe = idtfc3_probe,

	.remove_new = idtfc3_remove,

	.remove = idtfc3_remove,

};



module_platform_driver(idtfc3_driver);

drivers/ptp/ptp_idt82p33.c

+1 −1
Original line number Diff line number Diff line
@@ -1461,7 +1461,7 @@ static struct platform_driver idt82p33_driver = { 
		.name = "82p33x1x-phc",

	},

	.probe = idt82p33_probe,

	.remove_new = idt82p33_remove,

	.remove = idt82p33_remove,

};



module_platform_driver(idt82p33_driver);

drivers/ptp/ptp_ines.c

+2 −2
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ MODULE_DEVICE_TABLE(of, ines_ptp_ctrl_of_match); 


static struct platform_driver ines_ptp_ctrl_driver = {

	.probe = ines_ptp_ctrl_probe,

	.remove_new = ines_ptp_ctrl_remove,

	.remove = ines_ptp_ctrl_remove,

	.driver = {

		.name = "ines_ptp_ctrl",

		.of_match_table = ines_ptp_ctrl_of_match,