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

[linux.git] / drivers / mailbox / bcm-pdc-mailbox.c

diff --git a/drivers/mailbox/bcm-pdc-mailbox.c b/drivers/mailbox/bcm-pdc-mailbox.c
index 4fe7be0bdd11f2e836897e9783b3c7fec8a7534d..ccf3d62af7e7b05a8d53ac8914cd9cbda4512bc0 100644 (file)
--- a/drivers/mailbox/bcm-pdc-mailbox.c
+++ b/drivers/mailbox/bcm-pdc-mailbox.c
@@ -1471,7 +1471,7 @@ static int pdc_mb_init(struct pdc_state *pdcs)
                mbc->chans[chan_index].con_priv = pdcs;
 
        /* Register mailbox controller */
-       err = mbox_controller_register(mbc);
+       err = devm_mbox_controller_register(dev, mbc);
        if (err) {
                dev_crit(dev,
                         "Failed to register PDC mailbox controller. Error %d.",
@@ -1641,8 +1641,6 @@ static int pdc_remove(struct platform_device *pdev)
 
        pdc_hw_disable(pdcs);
 
-       mbox_controller_unregister(&pdcs->mbc);
-
        dma_pool_destroy(pdcs->rx_buf_pool);
        dma_pool_destroy(pdcs->ring_pool);
        return 0;