Skip to content

Commit

Permalink
ptp: Switch back to struct platform_driver::remove()
Browse files Browse the repository at this point in the history
After commit 0edb555 ("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: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Uwe Kleine-König authored and Jakub Kicinski committed Dec 2, 2024
1 parent 65ae975 commit b32913a
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion drivers/ptp/ptp_clockmatrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
4 changes: 2 additions & 2 deletions drivers/ptp/ptp_dte.c
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,8 @@ static struct platform_driver ptp_dte_driver = {
.pm = PTP_DTE_PM_OPS,
.of_match_table = ptp_dte_of_match,
},
.probe = ptp_dte_probe,
.remove_new = ptp_dte_remove,
.probe = ptp_dte_probe,
.remove = ptp_dte_remove,
};
module_platform_driver(ptp_dte_driver);

Expand Down
2 changes: 1 addition & 1 deletion drivers/ptp/ptp_fc3.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
2 changes: 1 addition & 1 deletion drivers/ptp/ptp_idt82p33.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
4 changes: 2 additions & 2 deletions drivers/ptp/ptp_ines.c
Original file line number Diff line number Diff line change
Expand Up @@ -781,8 +781,8 @@ static const struct of_device_id ines_ptp_ctrl_of_match[] = {
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,
.probe = ines_ptp_ctrl_probe,
.remove = ines_ptp_ctrl_remove,
.driver = {
.name = "ines_ptp_ctrl",
.of_match_table = ines_ptp_ctrl_of_match,
Expand Down
2 changes: 1 addition & 1 deletion drivers/ptp/ptp_qoriq.c
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ static struct platform_driver ptp_qoriq_driver = {
.of_match_table = match_table,
},
.probe = ptp_qoriq_probe,
.remove_new = ptp_qoriq_remove,
.remove = ptp_qoriq_remove,
};

module_platform_driver(ptp_qoriq_driver);
Expand Down
2 changes: 1 addition & 1 deletion drivers/ptp/ptp_vmclock.c
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ MODULE_DEVICE_TABLE(acpi, vmclock_acpi_ids);

static struct platform_driver vmclock_platform_driver = {
.probe = vmclock_probe,
.remove_new = vmclock_remove,
.remove = vmclock_remove,
.driver = {
.name = "vmclock",
.acpi_match_table = vmclock_acpi_ids,
Expand Down

0 comments on commit b32913a

Please sign in to comment.