Merge tag '6.8-rc-smb-server-fixes-part2' of git://git.samba.org/ksmbd

[linux-2.6-microblaze.git] / drivers / mailbox / tegra-hsp.c

diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
index fe29fc2..19ef56c 100644 (file)
--- a/drivers/mailbox/tegra-hsp.c
+++ b/drivers/mailbox/tegra-hsp.c
@@ -868,13 +868,11 @@ static int tegra_hsp_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int tegra_hsp_remove(struct platform_device *pdev)
+static void tegra_hsp_remove(struct platform_device *pdev)
 {
        struct tegra_hsp *hsp = platform_get_drvdata(pdev);
 
        lockdep_unregister_key(&hsp->lock_key);
-
-       return 0;
 }
 
 static int __maybe_unused tegra_hsp_resume(struct device *dev)
@@ -953,7 +951,7 @@ static struct platform_driver tegra_hsp_driver = {
                .pm = &tegra_hsp_pm_ops,
        },
        .probe = tegra_hsp_probe,
-       .remove = tegra_hsp_remove,
+       .remove_new = tegra_hsp_remove,
 };
 
 static int __init tegra_hsp_init(void)