oprofile: Remove deprecated use of flush_scheduled_work()

[pandora-kernel.git] / drivers / oprofile / cpu_buffer.c

diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index 219f79e..59f5544 100644 (file)
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -111,17 +111,19 @@ void start_cpu_work(void)
 
 void end_cpu_work(void)
 {
-       int i;
-
        work_enabled = 0;
+}
+
+void flush_cpu_work(void)
+{
+       int i;
 
        for_each_online_cpu(i) {
                struct oprofile_cpu_buffer *b = &per_cpu(op_cpu_buffer, i);
 
-               cancel_delayed_work(&b->work);
+               /* these works are per-cpu, no need for flush_sync */
+               flush_delayed_work(&b->work);
        }
-
-       flush_scheduled_work();
 }
 
 /*