Merge tag 'selinux-pr-20190115' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / mailbox / mtk-cmdq-mailbox.c

diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
index f7cc29c00302a493ee4136fe41273775b706c35a..22811784dc7de9527ddbe60221a8cbb6bac3ca87 100644 (file)
--- a/drivers/mailbox/mtk-cmdq-mailbox.c
+++ b/drivers/mailbox/mtk-cmdq-mailbox.c
@@ -337,17 +337,8 @@ static int cmdq_remove(struct platform_device *pdev)
 {
        struct cmdq *cmdq = platform_get_drvdata(pdev);
 
-       mbox_controller_unregister(&cmdq->mbox);
        clk_unprepare(cmdq->clock);
 
-       if (cmdq->mbox.chans)
-               devm_kfree(&pdev->dev, cmdq->mbox.chans);
-
-       if (cmdq->thread)
-               devm_kfree(&pdev->dev, cmdq->thread);
-
-       devm_kfree(&pdev->dev, cmdq);
-
        return 0;
 }
 
@@ -524,7 +515,7 @@ static int cmdq_probe(struct platform_device *pdev)
                cmdq->mbox.chans[i].con_priv = (void *)&cmdq->thread[i];
        }
 
-       err = mbox_controller_register(&cmdq->mbox);
+       err = devm_mbox_controller_register(dev, &cmdq->mbox);
        if (err < 0) {
                dev_err(dev, "failed to register mailbox: %d\n", err);
                return err;