ARM: 7874/2: bL_switcher: Remove cpu_hotplug_driver_{lock,unlock}()
authorTushar Behera <tushar.behera@linaro.org>
Thu, 31 Oct 2013 05:46:14 +0000 (06:46 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 7 Nov 2013 00:14:14 +0000 (00:14 +0000)
Commit 6dedcca610c6 ("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: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/common/bL_switcher.c

index 63bbc4f..5774b6e 100644 (file)
@@ -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 @@ error:
        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);
 }