| Message ID | 20200403013134.11407-1-natechancellor@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | e6d05acd57013114977ec77a131fe79d2f542774 |
| Headers | show |
| Series | remoteproc/omap: Fix set_load call in omap_rproc_request_timer | expand |
On 4/2/20 8:31 PM, Nathan Chancellor wrote: > When building arm allyesconfig: Thanks, Nathan. Also throws up with omap2plus_defconfig. > > 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. > > This should have been fixed during the merge of the remoteproc tree > since it happened after the clockevents tree merge; however, it does not > look like my email was noticed by either maintainer and I did not pay > attention when the pull was sent since I was on CC. > > Fixes: c6570114316f ("Merge tag 'rproc-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc") > Link: https://lore.kernel.org/lkml/20200327185055.GA22438@ubuntu-m2-xlarge-x86/ > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Acked-by: Suman Anna <s-anna@ti.com> > --- > drivers/remoteproc/omap_remoteproc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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; > } >
On Thu, Apr 2, 2020 at 6:32 PM Nathan Chancellor <natechancellor@gmail.com> wrote: > > 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. > > This should have been fixed during the merge of the remoteproc tree > since it happened after the clockevents tree merge; however, it does not > look like my email was noticed by either maintainer and I did not pay > attention when the pull was sent since I was on CC. Thanks, I've taken this patch directly into my tree since it was my merge that screwed up. Linus
On Fri 03 Apr 10:48 PDT 2020, Linus Torvalds wrote: > On Thu, Apr 2, 2020 at 6:32 PM Nathan Chancellor > <natechancellor@gmail.com> wrote: > > > > 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. > > > > This should have been fixed during the merge of the remoteproc tree > > since it happened after the clockevents tree merge; however, it does not > > look like my email was noticed by either maintainer and I did not pay > > attention when the pull was sent since I was on CC. > > Thanks, I've taken this patch directly into my tree since it was my > merge that screwed up. > Thanks Nathan, Suman and Linus.
Hello: This patch was applied to andersson/remoteproc.git (refs/heads/for-next). On Thu, 2 Apr 2020 18:31:35 -0700 you wrote: > When building arm allyesconfig: > > 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: - remoteproc/omap: Fix set_load call in omap_rproc_request_timer 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; }
When building arm allyesconfig: 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. This should have been fixed during the merge of the remoteproc tree since it happened after the clockevents tree merge; however, it does not look like my email was noticed by either maintainer and I did not pay attention when the pull was sent since I was on CC. Fixes: c6570114316f ("Merge tag 'rproc-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc") Link: https://lore.kernel.org/lkml/20200327185055.GA22438@ubuntu-m2-xlarge-x86/ Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- drivers/remoteproc/omap_remoteproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)