| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 1 | From 107f39e7741bb77688df47ce3f56b25cceb301c3 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de> |
| 3 | Date: Tue, 2 Feb 2021 20:43:08 +0100 |
| 4 | Subject: [PATCH 06/22] mailbox: arm_mhuv2: make remove callback return void |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | My build tests failed to catch that amba driver that would have needed |
| 10 | adaption in commit 3fd269e74f2f ("amba: Make the remove callback return |
| 11 | void"). Change the remove function to make the driver build again. |
| 12 | |
| 13 | Reported-by: kernel test robot <lkp@intel.com> |
| 14 | Fixes: 3fd269e74f2f ("amba: Make the remove callback return void") |
| 15 | Signed-off-by: Uwe Kleine-Kรถnig <u.kleine-koenig@pengutronix.de> |
| 16 | Acked-by: Viresh Kumar <viresh.kumar@linaro.org> |
| 17 | Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org> |
| 18 | |
| 19 | Upstream-Status: Backport [https://lkml.org/lkml/2021/2/2/1525] |
| 20 | Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> |
| 21 | --- |
| 22 | drivers/mailbox/arm_mhuv2.c | 4 +--- |
| 23 | 1 file changed, 1 insertion(+), 3 deletions(-) |
| 24 | |
| 25 | diff --git a/drivers/mailbox/arm_mhuv2.c b/drivers/mailbox/arm_mhuv2.c |
| 26 | index 8223c1005254..cdfb1939fabf 100644 |
| 27 | --- a/drivers/mailbox/arm_mhuv2.c |
| 28 | +++ b/drivers/mailbox/arm_mhuv2.c |
| 29 | @@ -1095,14 +1095,12 @@ static int mhuv2_probe(struct amba_device *adev, const struct amba_id *id) |
| 30 | return ret; |
| 31 | } |
| 32 | |
| 33 | -static int mhuv2_remove(struct amba_device *adev) |
| 34 | +static void mhuv2_remove(struct amba_device *adev) |
| 35 | { |
| 36 | struct mhuv2 *mhu = amba_get_drvdata(adev); |
| 37 | |
| 38 | if (mhu->frame == SENDER_FRAME) |
| 39 | writel_relaxed(0x0, &mhu->send->access_request); |
| 40 | - |
| 41 | - return 0; |
| 42 | } |
| 43 | |
| 44 | static struct amba_id mhuv2_ids[] = { |
| 45 | -- |
| 46 | 2.17.1 |
| 47 | |