HID: wacom: wacom_wac_collection() is local to wacom_wac.c

[linux.git] / kernel / torture.c

diff --git a/kernel/torture.c b/kernel/torture.c
index 3bcbd4fbfe180953735800394fa2cc544ac6181a..37b94012a3f8a76510e395be6fc721c98c7b7ce2 100644 (file)
--- a/kernel/torture.c
+++ b/kernel/torture.c
@@ -61,7 +61,6 @@ static bool verbose;
 #define FULLSTOP_RMMOD    2    /* Normal rmmod of torture. */
 static int fullstop = FULLSTOP_RMMOD;
 static DEFINE_MUTEX(fullstop_mutex);
-static int *torture_runnable;
 
 #ifdef CONFIG_HOTPLUG_CPU
 
@@ -577,7 +576,7 @@ void stutter_wait(const char *title)
 
        cond_resched_rcu_qs();
        spt = READ_ONCE(stutter_pause_test);
-       while (spt || (torture_runnable && !READ_ONCE(*torture_runnable))) {
+       for (; spt; spt = READ_ONCE(stutter_pause_test)) {
                if (spt == 1) {
                        schedule_timeout_interruptible(1);
                } else if (spt == 2) {
@@ -587,7 +586,6 @@ void stutter_wait(const char *title)
                        schedule_timeout_interruptible(round_jiffies_relative(HZ));
                }
                torture_shutdown_absorb(title);
-               spt = READ_ONCE(stutter_pause_test);
        }
 }
 EXPORT_SYMBOL_GPL(stutter_wait);
@@ -649,7 +647,7 @@ static void torture_stutter_cleanup(void)
  * The runnable parameter points to a flag that controls whether or not
  * the test is currently runnable.  If there is no such flag, pass in NULL.
  */
-bool torture_init_begin(char *ttype, bool v, int *runnable)
+bool torture_init_begin(char *ttype, bool v)
 {
        mutex_lock(&fullstop_mutex);
        if (torture_type != NULL) {
@@ -661,7 +659,6 @@ bool torture_init_begin(char *ttype, bool v, int *runnable)
        }
        torture_type = ttype;
        verbose = v;
-       torture_runnable = runnable;
        fullstop = FULLSTOP_DONTSTOP;
        return true;
 }