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

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

diff --git a/drivers/edac/aspeed_edac.c b/drivers/edac/aspeed_edac.c
index 6bd5f88..157a480 100644 (file)
--- a/drivers/edac/aspeed_edac.c
+++ b/drivers/edac/aspeed_edac.c
@@ -357,7 +357,7 @@ probe_exit02:
 }
 
 
-static int aspeed_remove(struct platform_device *pdev)
+static void aspeed_remove(struct platform_device *pdev)
 {
        struct mem_ctl_info *mci;
 
@@ -369,8 +369,6 @@ static int aspeed_remove(struct platform_device *pdev)
        mci = edac_mc_del_mc(&pdev->dev);
        if (mci)
                edac_mc_free(mci);
-
-       return 0;
 }
 
 
@@ -389,7 +387,7 @@ static struct platform_driver aspeed_driver = {
                .of_match_table = aspeed_of_match
        },
        .probe          = aspeed_probe,
-       .remove         = aspeed_remove
+       .remove_new     = aspeed_remove
 };
 module_platform_driver(aspeed_driver);