Commit ade5fb81 authored by Josh Triplett's avatar Josh Triplett Committed by Linus Torvalds

rcutorture: Remove redundant assignment to cur_ops in for loop

The for loop in rcutorture_init uses the condition
cur_ops = torture_ops[i], cur_ops
but then makes the same assignment to cur_ops inside the loop.  Remove the
redundant assignment inside the loop, and remove now-unnecessary braces.
Signed-off-by: default avatarJosh Triplett <josh@kernel.org>
Cc: "Paul E. McKenney" <paulmck@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c8e5b163
...@@ -502,10 +502,6 @@ static struct rcu_torture_ops sched_ops = { ...@@ -502,10 +502,6 @@ static struct rcu_torture_ops sched_ops = {
.name = "sched" .name = "sched"
}; };
static struct rcu_torture_ops *torture_ops[] =
{ &rcu_ops, &rcu_sync_ops, &rcu_bh_ops, &rcu_bh_sync_ops, &srcu_ops,
&sched_ops, NULL };
/* /*
* RCU torture writer kthread. Repeatedly substitutes a new structure * RCU torture writer kthread. Repeatedly substitutes a new structure
* for that pointed to by rcu_torture_current, freeing the old structure * for that pointed to by rcu_torture_current, freeing the old structure
...@@ -872,16 +868,17 @@ rcu_torture_init(void) ...@@ -872,16 +868,17 @@ rcu_torture_init(void)
int i; int i;
int cpu; int cpu;
int firsterr = 0; int firsterr = 0;
static struct rcu_torture_ops *torture_ops[] =
{ &rcu_ops, &rcu_sync_ops, &rcu_bh_ops, &rcu_bh_sync_ops,
&srcu_ops, &sched_ops, };
/* Process args and tell the world that the torturer is on the job. */ /* Process args and tell the world that the torturer is on the job. */
for (i = 0; i < ARRAY_SIZE(torture_ops); i++) {
for (i = 0; cur_ops = torture_ops[i], cur_ops; i++) {
cur_ops = torture_ops[i]; cur_ops = torture_ops[i];
if (strcmp(torture_type, cur_ops->name) == 0) { if (strcmp(torture_type, cur_ops->name) == 0)
break; break;
}
} }
if (cur_ops == NULL) { if (i == ARRAY_SIZE(torture_ops)) {
printk(KERN_ALERT "rcutorture: invalid torture type: \"%s\"\n", printk(KERN_ALERT "rcutorture: invalid torture type: \"%s\"\n",
torture_type); torture_type);
return (-EINVAL); return (-EINVAL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment