Commit ebf7f7d6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Revert "ptp: Switch back to struct platform_driver::remove()" 

This reverts commit b32913a5.

Linus applied directly commit e70140ba ("Get rid of 'remove_new'
relic from platform driver struct"), drop our local change to avoid
conflicts.

Link: https://lore.kernel.org/CAMuHMdV3J=o2x9G=1t_y97iv9eLsPfiej108vU6JHnn=AR-Nvw@mail.gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e8e7be7d

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 = idtcm_remove,

	.remove_new = 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 = ptp_dte_remove,

	.remove_new = 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 = idtfc3_remove,

	.remove_new = 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 = idt82p33_remove,

	.remove_new = 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 = ines_ptp_ctrl_remove,

	.remove_new = ines_ptp_ctrl_remove,

	.driver = {

		.name = "ines_ptp_ctrl",

		.of_match_table = ines_ptp_ctrl_of_match,