Commit fc2898ea authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Tejun Heo
Browse files

workqueue: Remove unused work_on_cpu_safe 



The last use of the work_on_cpu_safe() macro was removed recently by
commit 9cda46ba ("crypto: n2 - remove Niagara2 SPU driver")

Remove it, and the work_on_cpu_safe_key() function it calls.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent f11113d0

include/linux/workqueue.h

+0 −13
Original line number Diff line number Diff line
@@ -847,19 +847,6 @@ long work_on_cpu_key(int cpu, long (*fn)(void *), 
	work_on_cpu_key(_cpu, _fn, _arg, &__key);	\

})



long work_on_cpu_safe_key(int cpu, long (*fn)(void *),

			  void *arg, struct lock_class_key *key);



/*

 * A new key is defined for each caller to make sure the work

 * associated with the function doesn't share its locking class.

 */

#define work_on_cpu_safe(_cpu, _fn, _arg)		\

({							\

	static struct lock_class_key __key;		\

							\

	work_on_cpu_safe_key(_cpu, _fn, _arg, &__key);	\

})

#endif /* CONFIG_SMP */



#ifdef CONFIG_FREEZER

kernel/workqueue.c

+0 −25
Original line number Diff line number Diff line
@@ -6771,31 +6771,6 @@ long work_on_cpu_key(int cpu, long (*fn)(void *), 
	return wfc.ret;

}

EXPORT_SYMBOL_GPL(work_on_cpu_key);



/**

 * work_on_cpu_safe_key - run a function in thread context on a particular cpu

 * @cpu: the cpu to run on

 * @fn:  the function to run

 * @arg: the function argument

 * @key: The lock class key for lock debugging purposes

 *

 * Disables CPU hotplug and calls work_on_cpu(). The caller must not hold

 * any locks which would prevent @fn from completing.

 *

 * Return: The value @fn returns.

 */

long work_on_cpu_safe_key(int cpu, long (*fn)(void *),

			  void *arg, struct lock_class_key *key)

{

	long ret = -ENODEV;



	cpus_read_lock();

	if (cpu_online(cpu))

		ret = work_on_cpu_key(cpu, fn, arg, key);

	cpus_read_unlock();

	return ret;

}

EXPORT_SYMBOL_GPL(work_on_cpu_safe_key);

#endif /* CONFIG_SMP */



#ifdef CONFIG_FREEZER