Merge tag 'hid-for-linus-2024020101' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / mfd / kempld-core.c

diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
index 33c6cfe9fe42d23d8943447aa6915b43aa357f7a..67af36a3891361cd29b573acf23a8453aeffa8af 100644 (file)
--- a/drivers/mfd/kempld-core.c
+++ b/drivers/mfd/kempld-core.c
@@ -535,7 +535,7 @@ static int kempld_probe(struct platform_device *pdev)
        return kempld_detect_device(pld);
 }
 
-static int kempld_remove(struct platform_device *pdev)
+static void kempld_remove(struct platform_device *pdev)
 {
        struct kempld_device_data *pld = platform_get_drvdata(pdev);
        const struct kempld_platform_data *pdata = dev_get_platdata(pld->dev);
@@ -544,8 +544,6 @@ static int kempld_remove(struct platform_device *pdev)
 
        mfd_remove_devices(&pdev->dev);
        pdata->release_hardware_mutex(pld);
-
-       return 0;
 }
 
 #ifdef CONFIG_ACPI
@@ -563,7 +561,7 @@ static struct platform_driver kempld_driver = {
                .acpi_match_table = ACPI_PTR(kempld_acpi_table),
        },
        .probe          = kempld_probe,
-       .remove         = kempld_remove,
+       .remove_new     = kempld_remove,
 };
 
 static const struct dmi_system_id kempld_dmi_table[] __initconst = {