[5/8] OMAP2+: hwmod: rename omap_hwmod_mutex to _hwmod_list_mutex

Commit Message

Paul Walmsley Nov. 16, 2010, 10:18 a.m. UTC

None

Patch

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 12a0b9a..0e85278 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -156,7 +156,8 @@ 
 /* omap_hwmod_list contains all registered struct omap_hwmods */
 static LIST_HEAD(omap_hwmod_list);
 
-static DEFINE_MUTEX(omap_hwmod_mutex);
+/* _hwmod_list_mutex protects the list of registered hwmods */
+static DEFINE_MUTEX(_hwmod_list_mutex);
 
 /* mpu_oh: used to add/remove MPU initiator from sleepdep list */
 static struct omap_hwmod *mpu_oh;
@@ -874,7 +875,7 @@  static void _shutdown_sysc(struct omap_hwmod *oh)
  * @name: find an omap_hwmod by name
  *
  * Return a pointer to an omap_hwmod by name, or NULL if not found.
- * Caller must hold omap_hwmod_mutex.
+ * Caller must hold _hwmod_list_mutex.
  */
 static struct omap_hwmod *_lookup(const char *name)
 {
@@ -1502,7 +1503,7 @@  int omap_hwmod_register(struct omap_hwmod *oh)
 	    (oh->_state != _HWMOD_STATE_UNKNOWN))
 		return -EINVAL;
 
-	mutex_lock(&omap_hwmod_mutex);
+	mutex_lock(&_hwmod_list_mutex);
 
 	pr_debug("omap_hwmod: %s: registering\n", oh->name);
 
@@ -1528,7 +1529,7 @@  int omap_hwmod_register(struct omap_hwmod *oh)
 	ret = 0;
 
 ohr_unlock:
-	mutex_unlock(&omap_hwmod_mutex);
+	mutex_unlock(&_hwmod_list_mutex);
 	return ret;
 }
 
@@ -1546,9 +1547,9 @@  struct omap_hwmod *omap_hwmod_lookup(const char *name)
 	if (!name)
 		return NULL;
 
-	mutex_lock(&omap_hwmod_mutex);
+	mutex_lock(&_hwmod_list_mutex);
 	oh = _lookup(name);
-	mutex_unlock(&omap_hwmod_mutex);
+	mutex_unlock(&_hwmod_list_mutex);
 
 	return oh;
 }
@@ -1574,13 +1575,13 @@  int omap_hwmod_for_each(int (*fn)(struct omap_hwmod *oh, void *data),
 	if (!fn)
 		return -EINVAL;
 
-	mutex_lock(&omap_hwmod_mutex);
+	mutex_lock(&_hwmod_list_mutex);
 	list_for_each_entry(temp_oh, &omap_hwmod_list, node) {
 		ret = (*fn)(temp_oh, data);
 		if (ret)
 			break;
 	}
-	mutex_unlock(&omap_hwmod_mutex);
+	mutex_unlock(&_hwmod_list_mutex);
 
 	return ret;
 }
@@ -1663,10 +1664,10 @@  int omap_hwmod_unregister(struct omap_hwmod *oh)
 
 	pr_debug("omap_hwmod: %s: unregistering\n", oh->name);
 
-	mutex_lock(&omap_hwmod_mutex);
+	mutex_lock(&_hwmod_list_mutex);
 	iounmap(oh->_mpu_rt_va);
 	list_del(&oh->node);
-	mutex_unlock(&omap_hwmod_mutex);
+	mutex_unlock(&_hwmod_list_mutex);
 
 	return 0;
 }
@@ -2125,7 +2126,7 @@  int omap_hwmod_read_hardreset(struct omap_hwmod *oh, const char *name)
  * @user: arbitrary context data to pass to the callback function
  *
  * For each omap_hwmod of class @classname, call @fn.  Takes
- * omap_hwmod_mutex to prevent the hwmod list from changing during the
+ * _hwmod_list_mutex to prevent the hwmod list from changing during the
  * iteration.  If the callback function returns something other than
  * zero, the iterator is terminated, and the callback function's return
  * value is passed back to the caller.  Returns 0 upon success, -EINVAL
@@ -2145,7 +2146,7 @@  int omap_hwmod_for_each_by_class(const char *classname,
 	pr_debug("omap_hwmod: %s: looking for modules of class %s\n",
 		 __func__, classname);
 
-	mutex_lock(&omap_hwmod_mutex);
+	mutex_lock(&_hwmod_list_mutex);
 
 	list_for_each_entry(temp_oh, &omap_hwmod_list, node) {
 		if (!strcmp(temp_oh->class->name, classname)) {
@@ -2157,7 +2158,7 @@  int omap_hwmod_for_each_by_class(const char *classname,
 		}
 	}
 
-	mutex_unlock(&omap_hwmod_mutex);
+	mutex_unlock(&_hwmod_list_mutex);
 
 	if (ret)
 		pr_debug("omap_hwmod: %s: iterator terminated early: %d\n",