Merge tag 'ext4_for_linus-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / acpi / pfr_update.c

diff --git a/drivers/acpi/pfr_update.c b/drivers/acpi/pfr_update.c
index 98267f1..8b29109 100644 (file)
--- a/drivers/acpi/pfr_update.c
+++ b/drivers/acpi/pfr_update.c
@@ -489,13 +489,11 @@ static const struct file_operations acpi_pfru_fops = {
        .llseek         = noop_llseek,
 };
 
-static int acpi_pfru_remove(struct platform_device *pdev)
+static void acpi_pfru_remove(struct platform_device *pdev)
 {
        struct pfru_device *pfru_dev = platform_get_drvdata(pdev);
 
        misc_deregister(&pfru_dev->miscdev);
-
-       return 0;
 }
 
 static void pfru_put_idx(void *data)
@@ -567,7 +565,7 @@ static struct platform_driver acpi_pfru_driver = {
                .acpi_match_table = acpi_pfru_ids,
        },
        .probe = acpi_pfru_probe,
-       .remove = acpi_pfru_remove,
+       .remove_new = acpi_pfru_remove,
 };
 module_platform_driver(acpi_pfru_driver);