---

yaml --- r: 336742 b: refs/heads/master c: ea83f81 h: refs/heads/master v: v3
git-mirror · Nov 14, 2012 · 2eb0d25 · 2eb0d25
1 parent 2de441d
commit 2eb0d25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0779726cc265805d0f7c7dd1d791fa4076b31a9a
+refs/heads/master: ea83f81b489be3be268ed7fabfe8dd94bdc45a29
diff --git a/trunk/drivers/base/power/opp.c b/trunk/drivers/base/power/opp.c
@@ -460,17 +460,6 @@ int opp_add(struct device *dev, unsigned long freq, unsigned long u_volt)
 	return 0;
 }
 
-/**
- * opp_free_rcu() - helper to clear the struct opp when grace period has
- * elapsed without blocking the the caller of opp_set_availability
- */
-static void opp_free_rcu(struct rcu_head *head)
-{
-	struct opp *opp = container_of(head, struct opp, head);
-
-	kfree(opp);
-}
-
 /**
  * opp_set_availability() - helper to set the availability of an opp
  * @dev:		device for which we do this operation
@@ -542,7 +531,7 @@ static int opp_set_availability(struct device *dev, unsigned long freq,
 
 	list_replace_rcu(&opp->node, &new_opp->node);
 	mutex_unlock(&dev_opp_list_lock);
-	call_rcu(&opp->head, opp_free_rcu);
+	kfree_rcu(opp, head);
 
 	/* Notify the change of the OPP availability */
 	if (availability_req)