aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mailbox
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2018-12-20 12:19:45 -0500
committerJassi Brar <jaswinder.singh@linaro.org>2018-12-21 17:49:25 -0500
commit6aba2f4aac1ac030edacc76a10043e4d1b885e3d (patch)
treed455eb036d54ea6424e24b66c82a18e02a2a7f6a /drivers/mailbox
parente898d9cdd3a9f105863d63dd3b46443742a4757c (diff)
mailbox: arm-mhu: Use device-managed registration API
Get rid of some boilerplate driver removal code by using the newly added device-managed registration API. Reviewed-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Diffstat (limited to 'drivers/mailbox')
-rw-r--r--drivers/mailbox/arm_mhu.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/mailbox/arm_mhu.c b/drivers/mailbox/arm_mhu.c
index 99befa76e37c..64d85c6a2bdf 100644
--- a/drivers/mailbox/arm_mhu.c
+++ b/drivers/mailbox/arm_mhu.c
@@ -152,7 +152,7 @@ static int mhu_probe(struct amba_device *adev, const struct amba_id *id)
152 152
153 amba_set_drvdata(adev, mhu); 153 amba_set_drvdata(adev, mhu);
154 154
155 err = mbox_controller_register(&mhu->mbox); 155 err = devm_mbox_controller_register(dev, &mhu->mbox);
156 if (err) { 156 if (err) {
157 dev_err(dev, "Failed to register mailboxes %d\n", err); 157 dev_err(dev, "Failed to register mailboxes %d\n", err);
158 return err; 158 return err;
@@ -162,15 +162,6 @@ static int mhu_probe(struct amba_device *adev, const struct amba_id *id)
162 return 0; 162 return 0;
163} 163}
164 164
165static int mhu_remove(struct amba_device *adev)
166{
167 struct arm_mhu *mhu = amba_get_drvdata(adev);
168
169 mbox_controller_unregister(&mhu->mbox);
170
171 return 0;
172}
173
174static struct amba_id mhu_ids[] = { 165static struct amba_id mhu_ids[] = {
175 { 166 {
176 .id = 0x1bb098, 167 .id = 0x1bb098,
@@ -186,7 +177,6 @@ static struct amba_driver arm_mhu_driver = {
186 }, 177 },
187 .id_table = mhu_ids, 178 .id_table = mhu_ids,
188 .probe = mhu_probe, 179 .probe = mhu_probe,
189 .remove = mhu_remove,
190}; 180};
191module_amba_driver(arm_mhu_driver); 181module_amba_driver(arm_mhu_driver);
192 182