Merge tag 'hsi-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

[linux-2.6-block.git] / drivers / hsi / controllers / omap_ssi_core.c

diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c
index 6802efb4d6cdc8cfba37526bb26f1a51e3f17a83..3140990a61644e43b27a3030da074b9dffaba269 100644 (file)
--- a/drivers/hsi/controllers/omap_ssi_core.c
+++ b/drivers/hsi/controllers/omap_ssi_core.c
@@ -547,7 +547,7 @@ out1:
        return err;
 }
 
-static int ssi_remove(struct platform_device *pd)
+static void ssi_remove(struct platform_device *pd)
 {
        struct hsi_controller *ssi = platform_get_drvdata(pd);
 
@@ -561,8 +561,6 @@ static int ssi_remove(struct platform_device *pd)
        platform_set_drvdata(pd, NULL);
 
        pm_runtime_disable(&pd->dev);
-
-       return 0;
 }
 
 #ifdef CONFIG_PM
@@ -618,7 +616,7 @@ MODULE_DEVICE_TABLE(of, omap_ssi_of_match);
 
 static struct platform_driver ssi_pdriver = {
        .probe = ssi_probe,
-       .remove = ssi_remove,
+       .remove_new = ssi_remove,
        .driver = {
                .name   = "omap_ssi",
                .pm     = DEV_PM_OPS,