mailbox: mailbox-test: Convert to platform remove callback returning void

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

diff --git a/drivers/mailbox/mailbox-test.c b/drivers/mailbox/mailbox-test.c
index 22d6018..3386b4e 100644 (file)
--- a/drivers/mailbox/mailbox-test.c
+++ b/drivers/mailbox/mailbox-test.c
@@ -418,7 +418,7 @@ static int mbox_test_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int mbox_test_remove(struct platform_device *pdev)
+static void mbox_test_remove(struct platform_device *pdev)
 {
        struct mbox_test_device *tdev = platform_get_drvdata(pdev);
 
@@ -428,8 +428,6 @@ static int mbox_test_remove(struct platform_device *pdev)
                mbox_free_channel(tdev->tx_channel);
        if (tdev->rx_channel)
                mbox_free_channel(tdev->rx_channel);
-
-       return 0;
 }
 
 static const struct of_device_id mbox_test_match[] = {
@@ -444,7 +442,7 @@ static struct platform_driver mbox_test_driver = {
                .of_match_table = mbox_test_match,
        },
        .probe  = mbox_test_probe,
-       .remove = mbox_test_remove,
+       .remove_new = mbox_test_remove,
 };
 module_platform_driver(mbox_test_driver);