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

Commit b0ced9d2 authored by Tushar Behera's avatar Tushar Behera Committed by Russell King
Browse files

ARM: 7874/2: bL_switcher: Remove cpu_hotplug_driver_{lock,unlock}() 



Commit 6dedcca6 ("hotplug, powerpc, x86: Remove
cpu_hotplug_driver_lock())" removes the the definition of
cpu_hotplug_driver_{lock,unlock} APIs, thereby causing a build error.

Replace these calls with {lock,unlock}_device_hotplug().

Signed-off-by: default avatarTushar Behera <tushar.behera@linaro.org>
Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2098990e

arch/arm/common/bL_switcher.c

+5 −5
Original line number Diff line number Diff line
@@ -577,9 +577,9 @@ static int bL_switcher_enable(void) 
	int cpu, ret;



	mutex_lock(&bL_switcher_activation_lock);

	cpu_hotplug_driver_lock();

	lock_device_hotplug();

	if (bL_switcher_active) {

		cpu_hotplug_driver_unlock();

		unlock_device_hotplug();

		mutex_unlock(&bL_switcher_activation_lock);

		return 0;

	}
@@ -615,7 +615,7 @@ static int bL_switcher_enable(void) 
	bL_activation_notify(BL_NOTIFY_POST_DISABLE);



out:

	cpu_hotplug_driver_unlock();

	unlock_device_hotplug();

	mutex_unlock(&bL_switcher_activation_lock);

	return ret;

}
@@ -629,7 +629,7 @@ static void bL_switcher_disable(void) 
	struct task_struct *task;



	mutex_lock(&bL_switcher_activation_lock);

	cpu_hotplug_driver_lock();

	lock_device_hotplug();



	if (!bL_switcher_active)

		goto out;
@@ -685,7 +685,7 @@ static void bL_switcher_disable(void) 
	bL_activation_notify(BL_NOTIFY_POST_DISABLE);



out:

	cpu_hotplug_driver_unlock();

	unlock_device_hotplug();

	mutex_unlock(&bL_switcher_activation_lock);

}