On Tue, Nov 12, 2024 at 9:35 AM Uwe Kleine-König
<u.kleine-koenig@xxxxxxxxxxxx> wrote:
>
> After commit 0edb555a65d1 ("platform: Make platform_driver::remove()
> return void") .remove() is (again) the right callback to implement for
> platform drivers.
>
> Convert all platform drivers below drivers/acpi 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: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxx>
> ---
> Hello,
>
> I did a single patch for all of drivers/acpi. While I usually prefer
> to do one logical change per patch, this seems to be overengineering
> here as the individual changes are really trivial and shouldn't be much
> in the way for stable backports. But I'll happily split the patch if you
> prefer it split. Also if you object the indentation stuff, I can rework
> that.
>
> This is based on yesterday's next, if conflicts arise when you apply it
> at some later time and don't want to resolve them, feel free to just
> drop the changes to the conflicting files. I'll notice and followup at a
> later time then. Or ask me for a fixed resend. (Having said that, I
> recommend b4 am -3 + git am -3 which should resolve most conflicts just
> fine.)
>
> Best regards
> Uwe
>
> drivers/acpi/ac.c | 2 +-
> drivers/acpi/acpi_pad.c | 2 +-
> drivers/acpi/acpi_tad.c | 2 +-
> drivers/acpi/apei/einj-core.c | 2 +-
> drivers/acpi/apei/ghes.c | 2 +-
> drivers/acpi/arm64/agdi.c | 2 +-
> drivers/acpi/dptf/dptf_pch_fivr.c | 2 +-
> drivers/acpi/dptf/dptf_power.c | 2 +-
> drivers/acpi/evged.c | 2 +-
> drivers/acpi/fan_core.c | 2 +-
> drivers/acpi/pfr_telemetry.c | 2 +-
> drivers/acpi/pfr_update.c | 2 +-
> 12 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
> index 7c5b040a83e8..1f69be8f51a2 100644
> --- a/drivers/acpi/ac.c
> +++ b/drivers/acpi/ac.c
> @@ -290,7 +290,7 @@ static void acpi_ac_remove(struct platform_device *pdev)
>
> static struct platform_driver acpi_ac_driver = {
> .probe = acpi_ac_probe,
> - .remove_new = acpi_ac_remove,
> + .remove = acpi_ac_remove,
> .driver = {
> .name = "ac",
> .acpi_match_table = ac_device_ids,
> diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
> index 42b7220d4cfd..4ec20fd56985 100644
> --- a/drivers/acpi/acpi_pad.c
> +++ b/drivers/acpi/acpi_pad.c
> @@ -462,7 +462,7 @@ MODULE_DEVICE_TABLE(acpi, pad_device_ids);
>
> static struct platform_driver acpi_pad_driver = {
> .probe = acpi_pad_probe,
> - .remove_new = acpi_pad_remove,
> + .remove = acpi_pad_remove,
> .driver = {
> .dev_groups = acpi_pad_groups,
> .name = "processor_aggregator",
> diff --git a/drivers/acpi/acpi_tad.c b/drivers/acpi/acpi_tad.c
> index b831cb8e53dc..825c2a8acea4 100644
> --- a/drivers/acpi/acpi_tad.c
> +++ b/drivers/acpi/acpi_tad.c
> @@ -684,7 +684,7 @@ static struct platform_driver acpi_tad_driver = {
> .acpi_match_table = acpi_tad_ids,
> },
> .probe = acpi_tad_probe,
> - .remove_new = acpi_tad_remove,
> + .remove = acpi_tad_remove,
> };
> MODULE_DEVICE_TABLE(acpi, acpi_tad_ids);
>
> diff --git a/drivers/acpi/apei/einj-core.c b/drivers/acpi/apei/einj-core.c
> index 5c22720f43cc..04731a5b01fa 100644
> --- a/drivers/acpi/apei/einj-core.c
> +++ b/drivers/acpi/apei/einj-core.c
> @@ -880,7 +880,7 @@ static struct platform_device *einj_dev;
> * triggering a section mismatch warning.
> */
> static struct platform_driver einj_driver __refdata = {
> - .remove_new = __exit_p(einj_remove),
> + .remove = __exit_p(einj_remove),
> .driver = {
> .name = "acpi-einj",
> },
> diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
> index ada93cfde9ba..a2491905f165 100644
> --- a/drivers/acpi/apei/ghes.c
> +++ b/drivers/acpi/apei/ghes.c
> @@ -1605,7 +1605,7 @@ static struct platform_driver ghes_platform_driver = {
> .name = "GHES",
> },
> .probe = ghes_probe,
> - .remove_new = ghes_remove,
> + .remove = ghes_remove,
> };
>
> void __init acpi_ghes_init(void)
> diff --git a/drivers/acpi/arm64/agdi.c b/drivers/acpi/arm64/agdi.c
> index f5f21dd0d277..e0df3daa4abf 100644
> --- a/drivers/acpi/arm64/agdi.c
> +++ b/drivers/acpi/arm64/agdi.c
> @@ -88,7 +88,7 @@ static struct platform_driver agdi_driver = {
> .name = "agdi",
> },
> .probe = agdi_probe,
> - .remove_new = agdi_remove,
> + .remove = agdi_remove,
> };
>
> void __init acpi_agdi_init(void)
> diff --git a/drivers/acpi/dptf/dptf_pch_fivr.c b/drivers/acpi/dptf/dptf_pch_fivr.c
> index d202730fafd8..624fce67ce43 100644
> --- a/drivers/acpi/dptf/dptf_pch_fivr.c
> +++ b/drivers/acpi/dptf/dptf_pch_fivr.c
> @@ -158,7 +158,7 @@ MODULE_DEVICE_TABLE(acpi, pch_fivr_device_ids);
>
> static struct platform_driver pch_fivr_driver = {
> .probe = pch_fivr_add,
> - .remove_new = pch_fivr_remove,
> + .remove = pch_fivr_remove,
> .driver = {
> .name = "dptf_pch_fivr",
> .acpi_match_table = pch_fivr_device_ids,
> diff --git a/drivers/acpi/dptf/dptf_power.c b/drivers/acpi/dptf/dptf_power.c
> index 8023b3e23315..3d3edd81b172 100644
> --- a/drivers/acpi/dptf/dptf_power.c
> +++ b/drivers/acpi/dptf/dptf_power.c
> @@ -242,7 +242,7 @@ MODULE_DEVICE_TABLE(acpi, int3407_device_ids);
>
> static struct platform_driver dptf_power_driver = {
> .probe = dptf_power_add,
> - .remove_new = dptf_power_remove,
> + .remove = dptf_power_remove,
> .driver = {
> .name = "dptf_power",
> .acpi_match_table = int3407_device_ids,
> diff --git a/drivers/acpi/evged.c b/drivers/acpi/evged.c
> index 11778c93254b..5c35cbc7f6ff 100644
> --- a/drivers/acpi/evged.c
> +++ b/drivers/acpi/evged.c
> @@ -185,7 +185,7 @@ static const struct acpi_device_id ged_acpi_ids[] = {
>
> static struct platform_driver ged_driver = {
> .probe = ged_probe,
> - .remove_new = ged_remove,
> + .remove = ged_remove,
> .shutdown = ged_shutdown,
> .driver = {
> .name = MODULE_NAME,
> diff --git a/drivers/acpi/fan_core.c b/drivers/acpi/fan_core.c
> index 7cea4495f19b..3ea9cfcff46e 100644
> --- a/drivers/acpi/fan_core.c
> +++ b/drivers/acpi/fan_core.c
> @@ -448,7 +448,7 @@ static const struct dev_pm_ops acpi_fan_pm = {
>
> static struct platform_driver acpi_fan_driver = {
> .probe = acpi_fan_probe,
> - .remove_new = acpi_fan_remove,
> + .remove = acpi_fan_remove,
> .driver = {
> .name = "acpi-fan",
> .acpi_match_table = fan_device_ids,
> diff --git a/drivers/acpi/pfr_telemetry.c b/drivers/acpi/pfr_telemetry.c
> index a32798787ed9..32bdf8cbe8f2 100644
> --- a/drivers/acpi/pfr_telemetry.c
> +++ b/drivers/acpi/pfr_telemetry.c
> @@ -422,7 +422,7 @@ static struct platform_driver acpi_pfrt_log_driver = {
> .acpi_match_table = acpi_pfrt_log_ids,
> },
> .probe = acpi_pfrt_log_probe,
> - .remove_new = acpi_pfrt_log_remove,
> + .remove = acpi_pfrt_log_remove,
> };
> module_platform_driver(acpi_pfrt_log_driver);
>
> diff --git a/drivers/acpi/pfr_update.c b/drivers/acpi/pfr_update.c
> index 8b2910995fc1..031d1ba81b86 100644
> --- a/drivers/acpi/pfr_update.c
> +++ b/drivers/acpi/pfr_update.c
> @@ -565,7 +565,7 @@ static struct platform_driver acpi_pfru_driver = {
> .acpi_match_table = acpi_pfru_ids,
> },
> .probe = acpi_pfru_probe,
> - .remove_new = acpi_pfru_remove,
> + .remove = acpi_pfru_remove,
> };
> module_platform_driver(acpi_pfru_driver);
>
>
> base-commit: 6d59cab07b8d74d0f0422b750038123334f6ecc2
> --
Applied as 6.13 material, thanks!
