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

[linux.git] / drivers / mailbox / imx-mailbox.c

diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c
index 363d35d5e49dcb22bec03bf748536dee93b301d8..774362a05159a9e6c726dba4d31aff531de80bce 100644 (file)
--- a/drivers/mailbox/imx-mailbox.c
+++ b/drivers/mailbox/imx-mailbox.c
@@ -324,14 +324,13 @@ static int imx_mu_probe(struct platform_device *pdev)
 
        imx_mu_init_generic(priv);
 
-       return mbox_controller_register(&priv->mbox);
+       return devm_mbox_controller_register(dev, &priv->mbox);
 }
 
 static int imx_mu_remove(struct platform_device *pdev)
 {
        struct imx_mu_priv *priv = platform_get_drvdata(pdev);
 
-       mbox_controller_unregister(&priv->mbox);
        clk_disable_unprepare(priv->clk);
 
        return 0;