Merge tag 'edac_updates_for_v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / edac / octeon_edac-pc.c

diff --git a/drivers/edac/octeon_edac-pc.c b/drivers/edac/octeon_edac-pc.c
index 754eced..ea8a8e3 100644 (file)
--- a/drivers/edac/octeon_edac-pc.c
+++ b/drivers/edac/octeon_edac-pc.c
@@ -119,19 +119,18 @@ err:
        return -ENXIO;
 }
 
-static int co_cache_error_remove(struct platform_device *pdev)
+static void co_cache_error_remove(struct platform_device *pdev)
 {
        struct co_cache_error *p = platform_get_drvdata(pdev);
 
        unregister_co_cache_error_notifier(&p->notifier);
        edac_device_del_device(&pdev->dev);
        edac_device_free_ctl_info(p->ed);
-       return 0;
 }
 
 static struct platform_driver co_cache_error_driver = {
        .probe = co_cache_error_probe,
-       .remove = co_cache_error_remove,
+       .remove_new = co_cache_error_remove,
        .driver = {
                   .name = "octeon_pc_edac",
        }