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

[linux.git] / drivers / mailbox / qcom-apcs-ipc-mailbox.c

diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
index aed23ac9550dff8ef24761a18776ca650d082c7a..3cf2937be14912a70d5c82a5cc79e09dee8bf995 100644 (file)
--- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
+++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
@@ -91,7 +91,7 @@ static int qcom_apcs_ipc_probe(struct platform_device *pdev)
        apcs->mbox.chans = apcs->mbox_chans;
        apcs->mbox.num_chans = ARRAY_SIZE(apcs->mbox_chans);
 
-       ret = mbox_controller_register(&apcs->mbox);
+       ret = devm_mbox_controller_register(&pdev->dev, &apcs->mbox);
        if (ret) {
                dev_err(&pdev->dev, "failed to register APCS IPC controller\n");
                return ret;
@@ -115,7 +115,6 @@ static int qcom_apcs_ipc_remove(struct platform_device *pdev)
        struct qcom_apcs_ipc *apcs = platform_get_drvdata(pdev);
        struct platform_device *clk = apcs->clk;
 
-       mbox_controller_unregister(&apcs->mbox);
        platform_device_unregister(clk);
 
        return 0;