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

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

diff --git a/drivers/mailbox/arm_mhu.c b/drivers/mailbox/arm_mhu.c
index 99befa76e37c70d70d7f89b0db0c7aa6e1a24701..64d85c6a2bdfa8af4e9a53fa85ca39675ff0e943 100644 (file)
--- a/drivers/mailbox/arm_mhu.c
+++ b/drivers/mailbox/arm_mhu.c
@@ -152,7 +152,7 @@ static int mhu_probe(struct amba_device *adev, const struct amba_id *id)
 
        amba_set_drvdata(adev, 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;
@@ -162,15 +162,6 @@ static int mhu_probe(struct amba_device *adev, const struct amba_id *id)
        return 0;
 }
 
-static int mhu_remove(struct amba_device *adev)
-{
-       struct arm_mhu *mhu = amba_get_drvdata(adev);
-
-       mbox_controller_unregister(&mhu->mbox);
-
-       return 0;
-}
-
 static struct amba_id mhu_ids[] = {
        {
                .id     = 0x1bb098,
@@ -186,7 +177,6 @@ static struct amba_driver arm_mhu_driver = {
        },
        .id_table       = mhu_ids,
        .probe          = mhu_probe,
-       .remove         = mhu_remove,
 };
 module_amba_driver(arm_mhu_driver);