Merge tag 'iomap-4.21-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux.git] / drivers / mailbox / platform_mhu.c

diff --git a/drivers/mailbox/platform_mhu.c b/drivers/mailbox/platform_mhu.c
index e13201a5cec686a63e7d82c30544ab6ee3e13ef9..d2502c5be13092d6a61349f8f2747746673b2ad1 100644 (file)
--- a/drivers/mailbox/platform_mhu.c
+++ b/drivers/mailbox/platform_mhu.c
@@ -163,7 +163,7 @@ static int platform_mhu_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, mhu);
 
-       err = mbox_controller_register(&mhu->mbox);
+       err = devm_mbox_controller_register(dev, &mhu->mbox);
        if (err) {
                dev_err(dev, "Failed to register mailboxes %d\n", err);
                return err;
@@ -173,15 +173,6 @@ static int platform_mhu_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int platform_mhu_remove(struct platform_device *pdev)
-{
-       struct platform_mhu *mhu = platform_get_drvdata(pdev);
-
-       mbox_controller_unregister(&mhu->mbox);
-
-       return 0;
-}
-
 static const struct of_device_id platform_mhu_dt_ids[] = {
        { .compatible = "amlogic,meson-gxbb-mhu", },
        { /* sentinel */ },
@@ -190,7 +181,6 @@ MODULE_DEVICE_TABLE(of, platform_mhu_dt_ids);
 
 static struct platform_driver platform_mhu_driver = {
        .probe  = platform_mhu_probe,
-       .remove = platform_mhu_remove,
        .driver = {
                .name = "platform-mhu",
                .of_match_table = platform_mhu_dt_ids,