| Message ID | 20210202194308.jm66vblqjwr5wo6v@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | 860660fd829e64d4deb255fac9d73ab84a1440c3 |
| Headers | show |
| Series | mailbox: arm_mhuv2: make remove callback return void | expand |
On 02-02-21, 20:43, Uwe Kleine-König wrote: > 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> > --- > Hello, > > I guess I missed that driver during rebase as it was only introduced in > the last merge window. Sorry for that. > > I'm unsure what is the right thing to do now. Should I redo the pull > request (with this patch squashed into 3fd269e74f2f)? Or do we just > apply this patch on top? > > FTR, the test robot report is at https://lore.kernel.org/r/202102030343.D9j1wukx-lkp@intel.com > > Best regards > Uwe > > 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 67fb10885bb4..6cf1991a5c9c 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[] = { Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
diff --git a/drivers/mailbox/arm_mhuv2.c b/drivers/mailbox/arm_mhuv2.c index 67fb10885bb4..6cf1991a5c9c 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[] = {
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> --- Hello, I guess I missed that driver during rebase as it was only introduced in the last merge window. Sorry for that. I'm unsure what is the right thing to do now. Should I redo the pull request (with this patch squashed into 3fd269e74f2f)? Or do we just apply this patch on top? FTR, the test robot report is at https://lore.kernel.org/r/202102030343.D9j1wukx-lkp@intel.com Best regards Uwe drivers/mailbox/arm_mhuv2.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)