Merge tag 'for-linus-5.2b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/drivers/mailbox/mailbox-sti.c b/drivers/mailbox/mailbox-sti.c
index 779d412..adf82b8 100644 (file)
--- a/drivers/mailbox/mailbox-sti.c
+++ b/drivers/mailbox/mailbox-sti.c
@@ -462,7 +462,7 @@ static int sti_mbox_probe(struct platform_device *pdev)
        mbox->chans             = chans;
        mbox->num_chans         = STI_MBOX_CHAN_MAX;
 
-       ret = mbox_controller_register(mbox);
+       ret = devm_mbox_controller_register(&pdev->dev, mbox);
        if (ret)
                return ret;
 
@@ -480,7 +480,6 @@ static int sti_mbox_probe(struct platform_device *pdev)
                                        IRQF_ONESHOT, mdev->name, mdev);
        if (ret) {
                dev_err(&pdev->dev, "Can't claim IRQ %d\n", irq);
-               mbox_controller_unregister(mbox);
                return -EINVAL;
        }
 
@@ -489,18 +488,8 @@ static int sti_mbox_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int sti_mbox_remove(struct platform_device *pdev)
-{
-       struct sti_mbox_device *mdev = platform_get_drvdata(pdev);
-
-       mbox_controller_unregister(mdev->mbox);
-
-       return 0;
-}
-
 static struct platform_driver sti_mbox_driver = {
        .probe = sti_mbox_probe,
-       .remove = sti_mbox_remove,
        .driver = {
                .name = "sti-mailbox",
                .of_match_table = sti_mailbox_match,