Re: [PATCH] platform/surface: Switch back to struct platform_driver::remove()

[Maximilian Luz <luzmaximilian@xxxxxxxxx>]

On 11/25/24 11:11 AM, Uwe Kleine-König 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/platform/surface 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>

Looks good to me.

Reviewed-by: Maximilian Luz <luzmaximilian@xxxxxxxxx>

> ---
> Hello,
>
> this is based on todays next, feel free to drop changes that result in a
> conflict when you come around to apply this. I'll care for the fallout
> at a later time then. (Having said that, if you use b4 am -3 and git am
> -3, there should be hardly any conflict.)
>
> The change isn't urgent (as there are still quite a few users of
> .remove_new()) and merge window material. Still it would be nice if you
> scheduled it for v6.14-rc1.
>
> Best regards
> Uwe
>
>   drivers/platform/surface/surface3-wmi.c                | 2 +-
>   drivers/platform/surface/surface_acpi_notify.c         | 2 +-
>   drivers/platform/surface/surface_aggregator_cdev.c     | 2 +-
>   drivers/platform/surface/surface_aggregator_registry.c | 2 +-
>   drivers/platform/surface/surface_dtx.c                 | 2 +-
>   drivers/platform/surface/surface_gpe.c                 | 2 +-
>   drivers/platform/surface/surface_hotplug.c             | 2 +-
>   7 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/platform/surface/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c
> index c15ed7a12784..6c8fb7a4dde4 100644
> --- a/drivers/platform/surface/surface3-wmi.c
> +++ b/drivers/platform/surface/surface3-wmi.c
> @@ -247,7 +247,7 @@ static struct platform_driver s3_wmi_driver = {
>   		.name = "surface3-wmi",
>   		.pm = &s3_wmi_pm,
>   	},
> -	.remove_new = s3_wmi_remove,
> +	.remove = s3_wmi_remove,
>   };
>   
>   static int __init s3_wmi_init(void)
> diff --git a/drivers/platform/surface/surface_acpi_notify.c b/drivers/platform/surface/surface_acpi_notify.c
> index 14a9d8a267cb..3b30cfe3466b 100644
> --- a/drivers/platform/surface/surface_acpi_notify.c
> +++ b/drivers/platform/surface/surface_acpi_notify.c
> @@ -850,7 +850,7 @@ MODULE_DEVICE_TABLE(acpi, san_match);
>   
>   static struct platform_driver surface_acpi_notify = {
>   	.probe = san_probe,
> -	.remove_new = san_remove,
> +	.remove = san_remove,
>   	.driver = {
>   		.name = "surface_acpi_notify",
>   		.acpi_match_table = san_match,
> diff --git a/drivers/platform/surface/surface_aggregator_cdev.c b/drivers/platform/surface/surface_aggregator_cdev.c
> index 165b1416230d..bfaa09d1648b 100644
> --- a/drivers/platform/surface/surface_aggregator_cdev.c
> +++ b/drivers/platform/surface/surface_aggregator_cdev.c
> @@ -762,7 +762,7 @@ static struct platform_device *ssam_cdev_device;
>   
>   static struct platform_driver ssam_cdev_driver = {
>   	.probe = ssam_dbg_device_probe,
> -	.remove_new = ssam_dbg_device_remove,
> +	.remove = ssam_dbg_device_remove,
>   	.driver = {
>   		.name = SSAM_CDEV_DEVICE_NAME,
>   		.probe_type = PROBE_PREFER_ASYNCHRONOUS,
> diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
> index 06e45f0b9817..d4f32ad66530 100644
> --- a/drivers/platform/surface/surface_aggregator_registry.c
> +++ b/drivers/platform/surface/surface_aggregator_registry.c
> @@ -554,7 +554,7 @@ static void ssam_platform_hub_remove(struct platform_device *pdev)
>   
>   static struct platform_driver ssam_platform_hub_driver = {
>   	.probe = ssam_platform_hub_probe,
> -	.remove_new = ssam_platform_hub_remove,
> +	.remove = ssam_platform_hub_remove,
>   	.driver = {
>   		.name = "surface_aggregator_platform_hub",
>   		.acpi_match_table = ssam_platform_hub_acpi_match,
> diff --git a/drivers/platform/surface/surface_dtx.c b/drivers/platform/surface/surface_dtx.c
> index 89ca6b50e812..97ae010069e4 100644
> --- a/drivers/platform/surface/surface_dtx.c
> +++ b/drivers/platform/surface/surface_dtx.c
> @@ -1180,7 +1180,7 @@ MODULE_DEVICE_TABLE(acpi, surface_dtx_acpi_match);
>   
>   static struct platform_driver surface_dtx_platform_driver = {
>   	.probe = surface_dtx_platform_probe,
> -	.remove_new = surface_dtx_platform_remove,
> +	.remove = surface_dtx_platform_remove,
>   	.driver = {
>   		.name = "surface_dtx_pltf",
>   		.acpi_match_table = surface_dtx_acpi_match,
> diff --git a/drivers/platform/surface/surface_gpe.c b/drivers/platform/surface/surface_gpe.c
> index 62fd4004db31..b359413903b1 100644
> --- a/drivers/platform/surface/surface_gpe.c
> +++ b/drivers/platform/surface/surface_gpe.c
> @@ -278,7 +278,7 @@ static void surface_gpe_remove(struct platform_device *pdev)
>   
>   static struct platform_driver surface_gpe_driver = {
>   	.probe = surface_gpe_probe,
> -	.remove_new = surface_gpe_remove,
> +	.remove = surface_gpe_remove,
>   	.driver = {
>   		.name = "surface_gpe",
>   		.pm = &surface_gpe_pm,
> diff --git a/drivers/platform/surface/surface_hotplug.c b/drivers/platform/surface/surface_hotplug.c
> index a404f26cfae8..c0d83ed5a208 100644
> --- a/drivers/platform/surface/surface_hotplug.c
> +++ b/drivers/platform/surface/surface_hotplug.c
> @@ -259,7 +259,7 @@ MODULE_DEVICE_TABLE(acpi, surface_hotplug_acpi_match);
>   
>   static struct platform_driver surface_hotplug_driver = {
>   	.probe = surface_hotplug_probe,
> -	.remove_new = surface_hotplug_remove,
> +	.remove = surface_hotplug_remove,
>   	.driver = {
>   		.name = "surface_hotplug",
>   		.acpi_match_table = surface_hotplug_acpi_match,
>
> base-commit: 85a2dd7d7c8152cb125712a1ecae1d0a6ccac250