lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] kthread: drivers/base/firmware_class.c

Browse Source 
Replace kernel_thread() call in drivers/base/firmware_class.c with
kthread_create() since kernel_thread() is deprecated in drivers.

Signed-off-by: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Cedric Le Goater <clg@fr.ibm.com>
Cc: Serge E. Hallyn <serue@us.ibm.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: Manuel Estrada Sainz <ranty@debian.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Sukadev Bhattiprolu
2006-09-29 01:59:31 -07:00
committed by Linus Torvalds
parent a49a4af759
commit 563d075702
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/base/firmware_class.c
View File

@@ -16,6 +16,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/kthread.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include "base.h" #include "base.h"
@@ -511,7 +512,6 @@ request_firmware_work_func(void *arg)
WARN_ON(1); WARN_ON(1);
return 0; return 0;
} }
daemonize("%s/%s", "firmware", fw_work->name);
ret = _request_firmware(&fw, fw_work->name, fw_work->device, ret = _request_firmware(&fw, fw_work->name, fw_work->device,
fw_work->uevent); fw_work->uevent);
if (ret < 0) if (ret < 0)
@@ -546,9 +546,9 @@ request_firmware_nowait(
const char *name, struct device *device, void *context, const char *name, struct device *device, void *context,
void (*cont)(const struct firmware *fw, void *context)) void (*cont)(const struct firmware *fw, void *context))
{ {
struct task_struct *task;
struct firmware_work *fw_work = kmalloc(sizeof (struct firmware_work), struct firmware_work *fw_work = kmalloc(sizeof (struct firmware_work),
GFP_ATOMIC); GFP_ATOMIC);
int ret;
if (!fw_work) if (!fw_work)
return -ENOMEM; return -ENOMEM;
@@ -566,14 +566,14 @@ request_firmware_nowait(
.uevent = uevent, .uevent = uevent,
}; };
ret = kernel_thread(request_firmware_work_func, fw_work, task = kthread_run(request_firmware_work_func, fw_work,
CLONE_FS | CLONE_FILES); "firmware/%s", name);
if (ret < 0) { if (IS_ERR(task)) {
fw_work->cont(NULL, fw_work->context); fw_work->cont(NULL, fw_work->context);
module_put(fw_work->module); module_put(fw_work->module);
kfree(fw_work); kfree(fw_work);
return ret; return PTR_ERR(task);
} }
return 0; return 0;
} }