Skip to content

Commit

Permalink
[SPARC]: Use kthread infrastructure in envctrl
Browse files Browse the repository at this point in the history
envctrl currently uses very odd ways to stop a thread, using various
things that should be exposed to drivers at all.

This patch (which is untested as I don't have sparc hardware) switches
it to use the proper kthread infrastructure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Christoph Hellwig authored and David S. Miller committed Aug 9, 2005
1 parent 00dd1e4 commit 218b29e
Showing 1 changed file with 10 additions and 31 deletions.
41 changes: 10 additions & 31 deletions drivers/sbus/char/envctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <linux/config.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/kthread.h>
#include <linux/errno.h>
#include <linux/delay.h>
#include <linux/ioport.h>
Expand Down Expand Up @@ -1010,16 +1011,13 @@ static int kenvctrld(void *__unused)

poll_interval = 5000; /* TODO env_mon_interval */

daemonize("kenvctrld");
allow_signal(SIGKILL);

kenvctrld_task = current;

printk(KERN_INFO "envctrl: %s starting...\n", current->comm);
for (;;) {
if(msleep_interruptible(poll_interval))
break;
msleep_interruptible(poll_interval);

if (kthread_should_stop())
break;

for (whichcpu = 0; whichcpu < ENVCTRL_MAX_CPU; ++whichcpu) {
if (0 < envctrl_read_cpu_info(whichcpu, cputemp,
ENVCTRL_CPUTEMP_MON,
Expand Down Expand Up @@ -1118,9 +1116,11 @@ static int __init envctrl_init(void)
i2c_childlist[i].addr, (0 == i) ? ("\n") : (" "));
}

err = kernel_thread(kenvctrld, NULL, CLONE_FS | CLONE_FILES);
if (err < 0)
kenvctrld_task = kthread_run(kenvctrld, NULL, "kenvctrld");
if (IS_ERR(kenvctrld_task)) {
err = ERR_PTR(kenvctrld_task);
goto out_deregister;
}

return 0;

Expand All @@ -1142,28 +1142,7 @@ static void __exit envctrl_cleanup(void)
{
int i;

if (NULL != kenvctrld_task) {
force_sig(SIGKILL, kenvctrld_task);
for (;;) {
struct task_struct *p;
int found = 0;

read_lock(&tasklist_lock);
for_each_process(p) {
if (p == kenvctrld_task) {
found = 1;
break;
}
}
read_unlock(&tasklist_lock);

if (!found)
break;

msleep(1000);
}
kenvctrld_task = NULL;
}
kthread_stop(kenvctrld_task);

iounmap(i2c);
misc_deregister(&envctrl_dev);
Expand Down

0 comments on commit 218b29e

Please sign in to comment.