pnpbios: Fix warning if no hotplug
RFC PATCH 1/1 pnpbios: Fix warning if no hotplug
pnpbios: Fix warning if no hotplug
When hotplug is turned off, I get:drivers/pnp/pnpbios/core.c: In function 'pnpbios_thread_init':drivers/pnp/pnpbios/core.c:578: warning: unused variable 'task'
Is this a good way to fix this? Or should I just a #ifdef CONFIG_HOTPLUG around the task variable?
---
drivers/pnp/pnpbios/core.c +7 -6
@@ -575,8 +575,6 @@ fs_initcall(pnpbios_init);static int __init pnpbios_thread_init (void ) { -struct task_struct *task; -#if defined(CONFIG_PPC )if (check_legacy_ioport (PNPBIOS_BASE ))return 0 ;
@@ -584,10 +582,13 @@ static int __init pnpbios_thread_init(void)if (pnpbios_disabled)return 0 ;#ifdef CONFIG_HOTPLUG -init_completion (&unload_sem); - task =kthread_run (pnp_dock_thread,NULL ,"kpnpbiosd" ); -if (!IS_ERR (task)) - unloading =0 ; + { +struct task_struct *task; +init_completion (&unload_sem); + task =kthread_run (pnp_dock_thread,NULL ,"kpnpbiosd" ); +if (!IS_ERR (task)) + unloading =0 ; + }#endif return 0 ; }
Quoted 32 lines · On Sat, 10 Jan 2009 11:52:19 +0100 Erik Ekman <[email protected]> wrote:
pnpbios: Fix warning if no hotplug
When hotplug is turned off, I get:
drivers/pnp/pnpbios/core.c: In function 'pnpbios_thread_init':drivers/pnp/pnpbios/core.c:578: warning: unused variable 'task'Is this a good way to fix this? Or should I just a #ifdef
CONFIG_HOTPLUGaround the task variable?Signed-off-by Erik Ekman <[email protected]>---
drivers/pnp/pnpbios/core.c +0
-6@@ -575,8 +575,6 @@ fs_initcall(pnpbios_init);static int __init pnpbios_thread_init (void ) { -struct task_struct *task; -#if defined(CONFIG_PPC )if (check_legacy_ioport (PNPBIOS_BASE ))return 0 ;@@ -584,10 +582,13 @@ static int __init pnpbios_thread_init(void)if (pnpbios_disabled)return 0 ;#ifdef CONFIG_HOTPLUG -init_completion (&unload_sem); - task =kthread_run (pnp_dock_thread,NULL ,"kpnpbiosd" ); -if (!IS_ERR (task)) - unloading =0 ;
drivers/pnp/pnpbios/core.c static int __init pnpbios_thread_init(void) · line 594
Quoted 10 lines
drivers/pnp/pnpbios/core.c +7
-0+ { +struct task_struct *task; +init_completion (&unload_sem); + task =kthread_run (pnp_dock_thread,NULL ,"kpnpbiosd" ); +if (!IS_ERR (task)) + unloading =0 ; + }#endif return 0 ; }
Well you could just remove `task' altogether and do
if (!IS_ERR(kthread_run(pnp_dock_thread, NULL, "kpnpbiosd"))) unloading = 0;
but
a) `unloading' doesn't actually do anything, and can be removed
b) this function shouldn't return 0 if kthread_run() failed
Quoted 48 lines · On Wed, 14 Jan 2009 13:13:21 -0800 Andrew Morton <[email protected]>…
Quoted 32 lines · On Sat, 10 Jan 2009 11:52:19 +0100 Erik Ekman <[email protected]> wrote:
pnpbios: Fix warning if no hotplug
When hotplug is turned off, I get:
drivers/pnp/pnpbios/core.c: In function 'pnpbios_thread_init':drivers/pnp/pnpbios/core.c:578: warning: unused variable 'task'Is this a good way to fix this? Or should I just a #ifdef
CONFIG_HOTPLUGaround the task variable?Signed-off-by Erik Ekman <[email protected]>---
drivers/pnp/pnpbios/core.c +0
-6@@ -575,8 +575,6 @@ fs_initcall(pnpbios_init);static int __init pnpbios_thread_init (void ) { -struct task_struct *task; -#if defined(CONFIG_PPC )if (check_legacy_ioport (PNPBIOS_BASE ))return 0 ;@@ -584,10 +582,13 @@ static int __init pnpbios_thread_init(void)if (pnpbios_disabled)return 0 ;#ifdef CONFIG_HOTPLUG -init_completion (&unload_sem); - task =kthread_run (pnp_dock_thread,NULL ,"kpnpbiosd" ); -if (!IS_ERR (task)) - unloading =0 ;drivers/pnp/pnpbios/core.c static int __init pnpbios_thread_init(void) · line 594
Quoted 10 lines
drivers/pnp/pnpbios/core.c +7
-0+ { +struct task_struct *task; +init_completion (&unload_sem); + task =kthread_run (pnp_dock_thread,NULL ,"kpnpbiosd" ); +if (!IS_ERR (task)) + unloading =0 ; + }#endif return 0 ; }Well you could just remove `task' altogether and do
Quoted 8 lines
if (!IS_ERR(kthread_run(pnp_dock_thread, NULL, "kpnpbiosd"))) unloading = 0;but
a) `unloading' doesn't actually do anything, and can be removed
b) this function shouldn't return 0 if
kthread_run()failed
Thanks for the info. Here is an additional patch to remove the unloading variable and propagate the error code. This at least compiles with CONFIG_HOTPLUG=y.
===
pnpbios: Propagate kthread_run() error
Error code from kthread_run() is now returned in pnpbios_thread_init() Removed variable which always was 0.
--- drivers/pnp/pnpbios/core.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/pnp/pnpbios/core.c +3 -4
@@ -94,7 +94,6 @@ struct pnp_dev_node_info node_info;#ifdef CONFIG_HOTPLUG -static int unloading =0 ;static struct completion unload_sem;/*
@@ -158,7 +157,7 @@ static int pnp_dock_thread(void *unused)int docked =-1 , d =0 ;set_freezable (); -while (!unloading) { +while (1 ) {int status;/*
@@ -586,8 +585,8 @@ static int __init pnpbios_thread_init(void)struct task_struct *task;init_completion (&unload_sem); task =kthread_run (pnp_dock_thread,NULL ,"kpnpbiosd" ); -if (!IS_ERR (task)) - unloading = 0; +if (IS_ERR (task)) + return PTR_ERR(task); }#endif return 0 ;