Merge tag 'platform-drivers-x86-v6.4-1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / drivers / platform / x86 / intel / pmc / core.c

diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c
index b9591969e0fa119bf84710e2cee4cddf61541ee0..61ca7c37fb02022e10c580b027d2fa629575cce7 100644 (file)
--- a/drivers/platform/x86/intel/pmc/core.c
+++ b/drivers/platform/x86/intel/pmc/core.c
@@ -1160,7 +1160,7 @@ static int pmc_core_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int pmc_core_remove(struct platform_device *pdev)
+static void pmc_core_remove(struct platform_device *pdev)
 {
        struct pmc_dev *pmcdev = platform_get_drvdata(pdev);
 
@@ -1168,7 +1168,6 @@ static int pmc_core_remove(struct platform_device *pdev)
        platform_set_drvdata(pdev, NULL);
        mutex_destroy(&pmcdev->lock);
        iounmap(pmcdev->regbase);
-       return 0;
 }
 
 static bool warn_on_s0ix_failures;
@@ -1275,7 +1274,7 @@ static struct platform_driver pmc_core_driver = {
                .dev_groups = pmc_dev_groups,
        },
        .probe = pmc_core_probe,
-       .remove = pmc_core_remove,
+       .remove_new = pmc_core_remove,
 };
 
 module_platform_driver(pmc_core_driver);