summaryrefslogtreecommitdiff
path: root/drivers/mailbox/tegra-hsp.c
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2018-11-28 10:54:16 +0100
committerJassi Brar <jaswinder.singh@linaro.org>2018-12-21 22:31:26 -0600
commitd69e11648e486ee0f21cb246f687b083f0d4e124 (patch)
treef49ad2f0f5939c8c2276305d0198cafd5bb58cb4 /drivers/mailbox/tegra-hsp.c
parenta54d03ed01b4ed64c22d2b53d61d4049ec49a51f (diff)
mailbox: tegra-hsp: Use device-managed registration API
In order to get rid of a lot of cleanup boilerplate code, use the device-managed registration API. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Diffstat (limited to 'drivers/mailbox/tegra-hsp.c')
-rw-r--r--drivers/mailbox/tegra-hsp.c30
1 files changed, 6 insertions, 24 deletions
diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
index 9628e52e2371..e443f6a2ec4b 100644
--- a/drivers/mailbox/tegra-hsp.c
+++ b/drivers/mailbox/tegra-hsp.c
@@ -721,7 +721,7 @@ static int tegra_hsp_probe(struct platform_device *pdev)
}
}
- err = mbox_controller_register(&hsp->mbox_db);
+ err = devm_mbox_controller_register(&pdev->dev, &hsp->mbox_db);
if (err < 0) {
dev_err(&pdev->dev, "failed to register doorbell mailbox: %d\n",
err);
@@ -745,15 +745,15 @@ static int tegra_hsp_probe(struct platform_device *pdev)
if (err < 0) {
dev_err(&pdev->dev, "failed to add mailboxes: %d\n",
err);
- goto unregister_mbox_db;
+ return err;
}
}
- err = mbox_controller_register(&hsp->mbox_sm);
+ err = devm_mbox_controller_register(&pdev->dev, &hsp->mbox_sm);
if (err < 0) {
dev_err(&pdev->dev, "failed to register shared mailbox: %d\n",
err);
- goto unregister_mbox_db;
+ return err;
}
platform_set_drvdata(pdev, hsp);
@@ -766,34 +766,17 @@ static int tegra_hsp_probe(struct platform_device *pdev)
dev_err(&pdev->dev,
"failed to request doorbell IRQ#%u: %d\n",
hsp->doorbell_irq, err);
- goto unregister_mbox_sm;
+ return err;
}
}
if (hsp->shared_irqs) {
err = tegra_hsp_request_shared_irq(hsp);
if (err < 0)
- goto unregister_mbox_sm;
+ return err;
}
return 0;
-
-unregister_mbox_sm:
- mbox_controller_unregister(&hsp->mbox_sm);
-unregister_mbox_db:
- mbox_controller_unregister(&hsp->mbox_db);
-
- return err;
-}
-
-static int tegra_hsp_remove(struct platform_device *pdev)
-{
- struct tegra_hsp *hsp = platform_get_drvdata(pdev);
-
- mbox_controller_unregister(&hsp->mbox_sm);
- mbox_controller_unregister(&hsp->mbox_db);
-
- return 0;
}
static int tegra_hsp_resume(struct device *dev)
@@ -842,7 +825,6 @@ static struct platform_driver tegra_hsp_driver = {
.pm = &tegra_hsp_pm_ops,
},
.probe = tegra_hsp_probe,
- .remove = tegra_hsp_remove,
};
static int __init tegra_hsp_init(void)