Message ID | 20211105075119.2327190-1-arnd@kernel.org (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Series | soc: ti: fix wkup_m3_rproc_boot_thread return type | expand |
> On Nov 5, 2021, at 12:51 AM, Arnd Bergmann <arnd@kernel.org> wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > The wkup_m3_rproc_boot_thread() function uses a nonstandard prototype, > which broke after Eric's recent cleanup: > > drivers/soc/ti/wkup_m3_ipc.c: In function 'wkup_m3_rproc_boot_thread': > drivers/soc/ti/wkup_m3_ipc.c:429:16: error: 'return' with a value, in function returning void [-Werror=return-type] > 429 | return 0; > | ^ > drivers/soc/ti/wkup_m3_ipc.c:416:13: note: declared here > 416 | static void wkup_m3_rproc_boot_thread(struct wkup_m3_ipc *m3_ipc) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > > Change it to the normal prototype as it should have been from the > start. > > Fixes: 111e70490d2a ("exit/kthread: Have kernel threads return instead of calling do_exit") > Fixes: cdd5de500b2c ("soc: ti: Add wkup_m3_ipc driver") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > — Looks good to me. Thanks !! Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
* Arnd Bergmann <arnd@kernel.org> [211105 07:52]: > From: Arnd Bergmann <arnd@arndb.de> > > The wkup_m3_rproc_boot_thread() function uses a nonstandard prototype, > which broke after Eric's recent cleanup: > > drivers/soc/ti/wkup_m3_ipc.c: In function 'wkup_m3_rproc_boot_thread': > drivers/soc/ti/wkup_m3_ipc.c:429:16: error: 'return' with a value, in function returning void [-Werror=return-type] > 429 | return 0; > | ^ > drivers/soc/ti/wkup_m3_ipc.c:416:13: note: declared here > 416 | static void wkup_m3_rproc_boot_thread(struct wkup_m3_ipc *m3_ipc) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > > Change it to the normal prototype as it should have been from the > start. Thanks Acked-by: Tony Lindgren <tony@atomide.com>
Arnd Bergmann <arnd@kernel.org> writes: > From: Arnd Bergmann <arnd@arndb.de> > > The wkup_m3_rproc_boot_thread() function uses a nonstandard prototype, > which broke after Eric's recent cleanup: > > drivers/soc/ti/wkup_m3_ipc.c: In function 'wkup_m3_rproc_boot_thread': > drivers/soc/ti/wkup_m3_ipc.c:429:16: error: 'return' with a value, in function returning void [-Werror=return-type] > 429 | return 0; > | ^ > drivers/soc/ti/wkup_m3_ipc.c:416:13: note: declared here > 416 | static void wkup_m3_rproc_boot_thread(struct wkup_m3_ipc *m3_ipc) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > > Change it to the normal prototype as it should have been from the > start. Thanks for catching this. I will add it to my tree. Eric > > Fixes: 111e70490d2a ("exit/kthread: Have kernel threads return instead of calling do_exit") > Fixes: cdd5de500b2c ("soc: ti: Add wkup_m3_ipc driver") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/soc/ti/wkup_m3_ipc.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/soc/ti/wkup_m3_ipc.c b/drivers/soc/ti/wkup_m3_ipc.c > index 0733443a2631..72386bd393fe 100644 > --- a/drivers/soc/ti/wkup_m3_ipc.c > +++ b/drivers/soc/ti/wkup_m3_ipc.c > @@ -413,8 +413,9 @@ void wkup_m3_ipc_put(struct wkup_m3_ipc *m3_ipc) > } > EXPORT_SYMBOL_GPL(wkup_m3_ipc_put); > > -static void wkup_m3_rproc_boot_thread(struct wkup_m3_ipc *m3_ipc) > +static int wkup_m3_rproc_boot_thread(void *arg) > { > + struct wkup_m3_ipc *m3_ipc = arg; > struct device *dev = m3_ipc->dev; > int ret; > > @@ -500,7 +501,7 @@ static int wkup_m3_ipc_probe(struct platform_device *pdev) > * can boot the wkup_m3 as soon as it's ready without holding > * up kernel boot > */ > - task = kthread_run((void *)wkup_m3_rproc_boot_thread, m3_ipc, > + task = kthread_run(wkup_m3_rproc_boot_thread, m3_ipc, > "wkup_m3_rproc_loader"); > > if (IS_ERR(task)) {
diff --git a/drivers/soc/ti/wkup_m3_ipc.c b/drivers/soc/ti/wkup_m3_ipc.c index 0733443a2631..72386bd393fe 100644 --- a/drivers/soc/ti/wkup_m3_ipc.c +++ b/drivers/soc/ti/wkup_m3_ipc.c @@ -413,8 +413,9 @@ void wkup_m3_ipc_put(struct wkup_m3_ipc *m3_ipc) } EXPORT_SYMBOL_GPL(wkup_m3_ipc_put); -static void wkup_m3_rproc_boot_thread(struct wkup_m3_ipc *m3_ipc) +static int wkup_m3_rproc_boot_thread(void *arg) { + struct wkup_m3_ipc *m3_ipc = arg; struct device *dev = m3_ipc->dev; int ret; @@ -500,7 +501,7 @@ static int wkup_m3_ipc_probe(struct platform_device *pdev) * can boot the wkup_m3 as soon as it's ready without holding * up kernel boot */ - task = kthread_run((void *)wkup_m3_rproc_boot_thread, m3_ipc, + task = kthread_run(wkup_m3_rproc_boot_thread, m3_ipc, "wkup_m3_rproc_loader"); if (IS_ERR(task)) {