Merge tag 'char-misc-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / misc / fastrpc.c

diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index dbd26c3b245bca56adffc8288d5657dd3c61d3b8..4c67e2c5a82e1f85f3e6e07e20b22d14b25f3051 100644 (file)
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -2186,7 +2186,7 @@ static int fastrpc_cb_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int fastrpc_cb_remove(struct platform_device *pdev)
+static void fastrpc_cb_remove(struct platform_device *pdev)
 {
        struct fastrpc_channel_ctx *cctx = dev_get_drvdata(pdev->dev.parent);
        struct fastrpc_session_ctx *sess = dev_get_drvdata(&pdev->dev);
@@ -2201,8 +2201,6 @@ static int fastrpc_cb_remove(struct platform_device *pdev)
                }
        }
        spin_unlock_irqrestore(&cctx->lock, flags);
-
-       return 0;
 }
 
 static const struct of_device_id fastrpc_match_table[] = {
@@ -2212,7 +2210,7 @@ static const struct of_device_id fastrpc_match_table[] = {
 
 static struct platform_driver fastrpc_cb_driver = {
        .probe = fastrpc_cb_probe,
-       .remove = fastrpc_cb_remove,
+       .remove_new = fastrpc_cb_remove,
        .driver = {
                .name = "qcom,fastrpc-cb",
                .of_match_table = fastrpc_match_table,