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

[linux.git] / drivers / mailbox / stm32-ipcc.c

diff --git a/drivers/mailbox/stm32-ipcc.c b/drivers/mailbox/stm32-ipcc.c
index 533b0da5235d43b52e1f75ab68537ff5f7ab1e35..a338bd4cd7db69ccd539af77b75c26a612d1c9eb 100644 (file)
--- a/drivers/mailbox/stm32-ipcc.c
+++ b/drivers/mailbox/stm32-ipcc.c
@@ -299,7 +299,7 @@ static int stm32_ipcc_probe(struct platform_device *pdev)
        for (i = 0; i < ipcc->controller.num_chans; i++)
                ipcc->controller.chans[i].con_priv = (void *)i;
 
-       ret = mbox_controller_register(&ipcc->controller);
+       ret = devm_mbox_controller_register(dev, &ipcc->controller);
        if (ret)
                goto err_irq_wkp;
 
@@ -329,8 +329,6 @@ static int stm32_ipcc_remove(struct platform_device *pdev)
 {
        struct stm32_ipcc *ipcc = platform_get_drvdata(pdev);
 
-       mbox_controller_unregister(&ipcc->controller);
-
        if (ipcc->wkp)
                dev_pm_clear_wake_irq(&pdev->dev);