Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 563d0757 authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by Linus Torvalds
Browse files

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



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

Signed-off-by: default avatarSukadev 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: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a49a4af7

drivers/base/firmware_class.c

+6 −6
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/interrupt.h>

#include <linux/bitops.h>

#include <linux/mutex.h>

#include <linux/kthread.h>



#include <linux/firmware.h>

#include "base.h"
@@ -511,7 +512,6 @@ request_firmware_work_func(void *arg) 
		WARN_ON(1);

		return 0;

	}

	daemonize("%s/%s", "firmware", fw_work->name);

	ret = _request_firmware(&fw, fw_work->name, fw_work->device,

		fw_work->uevent);

	if (ret < 0)
@@ -546,9 +546,9 @@ request_firmware_nowait( 
	const char *name, struct device *device, void *context,

	void (*cont)(const struct firmware *fw, void *context))

{

	struct task_struct *task;

	struct firmware_work *fw_work = kmalloc(sizeof (struct firmware_work),

						GFP_ATOMIC);

	int ret;



	if (!fw_work)

		return -ENOMEM;
@@ -566,14 +566,14 @@ request_firmware_nowait( 
		.uevent = uevent,

	};



	ret = kernel_thread(request_firmware_work_func, fw_work,

			    CLONE_FS | CLONE_FILES);

	task = kthread_run(request_firmware_work_func, fw_work,

			    "firmware/%s", name);



	if (ret < 0) {

	if (IS_ERR(task)) {

		fw_work->cont(NULL, fw_work->context);

		module_put(fw_work->module);

		kfree(fw_work);

		return ret;

		return PTR_ERR(task);

	}

	return 0;

}