| From 107f39e7741bb77688df47ce3f56b25cceb301c3 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de> |
| Date: Tue, 2 Feb 2021 20:43:08 +0100 |
| Subject: [PATCH 06/22] mailbox: arm_mhuv2: make remove callback return void |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| My build tests failed to catch that amba driver that would have needed |
| adaption in commit 3fd269e74f2f ("amba: Make the remove callback return |
| void"). Change the remove function to make the driver build again. |
| |
| Reported-by: kernel test robot <lkp@intel.com> |
| Fixes: 3fd269e74f2f ("amba: Make the remove callback return void") |
| Signed-off-by: Uwe Kleine-Kรถnig <u.kleine-koenig@pengutronix.de> |
| Acked-by: Viresh Kumar <viresh.kumar@linaro.org> |
| Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org> |
| |
| Upstream-Status: Backport [https://lkml.org/lkml/2021/2/2/1525] |
| Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> |
| --- |
| drivers/mailbox/arm_mhuv2.c | 4 +--- |
| 1 file changed, 1 insertion(+), 3 deletions(-) |
| |
| diff --git a/drivers/mailbox/arm_mhuv2.c b/drivers/mailbox/arm_mhuv2.c |
| index 8223c1005254..cdfb1939fabf 100644 |
| --- a/drivers/mailbox/arm_mhuv2.c |
| +++ b/drivers/mailbox/arm_mhuv2.c |
| @@ -1095,14 +1095,12 @@ static int mhuv2_probe(struct amba_device *adev, const struct amba_id *id) |
| return ret; |
| } |
| |
| -static int mhuv2_remove(struct amba_device *adev) |
| +static void mhuv2_remove(struct amba_device *adev) |
| { |
| struct mhuv2 *mhu = amba_get_drvdata(adev); |
| |
| if (mhu->frame == SENDER_FRAME) |
| writel_relaxed(0x0, &mhu->send->access_request); |
| - |
| - return 0; |
| } |
| |
| static struct amba_id mhuv2_ids[] = { |
| -- |
| 2.17.1 |
| |