| Message ID | 20200327185055.GA22438@ubuntu-m2-xlarge-x86 (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | e6d05acd57013114977ec77a131fe79d2f542774 |
| Headers | show |
| Series | Build failure in omap_remoteproc due to 02e6d546e3bd | expand |
Hi Nathan, On Fri, 27 Mar 2020 11:50:55 -0700 Nathan Chancellor <natechancellor@gmail.com> wrote: > > Apologies if this has already been reported, I did not see anything in > the archives. On next-20200327, I see the following build error: > > drivers/remoteproc/omap_remoteproc.c:174:44: error: too many arguments > to function call, expected 2, have 3 > timer->timer_ops->set_load(timer->odt, 0, 0); > ~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ > 1 error generated. > > This is due to commit 02e6d546e3bd ("clocksource/drivers/timer-ti-dm: > Enable autoreload in set_pwm") in the clockevents tree interacting with > commit e28edc571925 ("remoteproc/omap: Request a timer(s) for remoteproc > usage") from the rpmsg tree. > > Something like the diff below should resolve it but it cannot be applied > to the rpmsg tree because it does not have the clockevents change. It > will have to be applied by Linus as a merge fixup. > > Stephen, would you mind applying this to whichever merge happens second? > > Cheers, > Nathan > > diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c > index cdb546f7232e..6955fab0a78b 100644 > --- a/drivers/remoteproc/omap_remoteproc.c > +++ b/drivers/remoteproc/omap_remoteproc.c > @@ -171,7 +171,7 @@ static int omap_rproc_request_timer(struct device *dev, struct device_node *np, > } > > /* clean counter, remoteproc code will set the value */ > - timer->timer_ops->set_load(timer->odt, 0, 0); > + timer->timer_ops->set_load(timer->odt, 0); > > return 0; > } Thanks, I will use that as a merge fix up from today.
Hello: This patch was applied to andersson/remoteproc.git (refs/heads/for-next). On Fri, 27 Mar 2020 11:50:55 -0700 you wrote: > Hi all, > > Apologies if this has already been reported, I did not see anything in > the archives. On next-20200327, I see the following build error: > > drivers/remoteproc/omap_remoteproc.c:174:44: error: too many arguments > to function call, expected 2, have 3 > timer->timer_ops->set_load(timer->odt, 0, 0); > ~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ > 1 error generated. > > [...] Here is a summary with links: - Build failure in omap_remoteproc due to 02e6d546e3bd https://git.kernel.org/andersson/remoteproc/c/e6d05acd57013114977ec77a131fe79d2f542774 You are awesome, thank you!
diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c index cdb546f7232e..6955fab0a78b 100644 --- a/drivers/remoteproc/omap_remoteproc.c +++ b/drivers/remoteproc/omap_remoteproc.c @@ -171,7 +171,7 @@ static int omap_rproc_request_timer(struct device *dev, struct device_node *np, } /* clean counter, remoteproc code will set the value */ - timer->timer_ops->set_load(timer->odt, 0, 0); + timer->timer_ops->set_load(timer->odt, 0); return 0; }
Hi all, Apologies if this has already been reported, I did not see anything in the archives. On next-20200327, I see the following build error: drivers/remoteproc/omap_remoteproc.c:174:44: error: too many arguments to function call, expected 2, have 3 timer->timer_ops->set_load(timer->odt, 0, 0); ~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ 1 error generated. This is due to commit 02e6d546e3bd ("clocksource/drivers/timer-ti-dm: Enable autoreload in set_pwm") in the clockevents tree interacting with commit e28edc571925 ("remoteproc/omap: Request a timer(s) for remoteproc usage") from the rpmsg tree. Something like the diff below should resolve it but it cannot be applied to the rpmsg tree because it does not have the clockevents change. It will have to be applied by Linus as a merge fixup. Stephen, would you mind applying this to whichever merge happens second? Cheers, Nathan