Messages in this thread | | | Date | Wed, 14 Jan 2009 13:13:21 -0800 | From | Andrew Morton <> | Subject | Re: [PATCH -tip][RFC] pnpbios: Fix warning if no hotplug |
| |
On Sat, 10 Jan 2009 11:52:19 +0100 Erik Ekman <erik@kryo.se> 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_HOTPLUG around the task variable? > > Signed-off-by: Erik Ekman <erik@kryo.se> > --- > diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c > index 996f648..e706d22 100644 > --- a/drivers/pnp/pnpbios/core.c > +++ b/drivers/pnp/pnpbios/core.c > @@ -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; > }
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
| |