[v2,1/2] PM: devfreq: Add the prototype of update_devfreq() to export

Commit Message

Chanwoo Choi July 20, 2015, 1:13 a.m. UTC

This patch add simply the protoptye of update_devfreq() to devfreq.h header
file to export it. The some device driver (e.g., thermal cooling device) may
use the update_devfreq() to update the range of supported frequency of devfreq
device.

Cc: MyungJoo Ham <[e-mail]>
Cc: Kyungmin Park <[e-mail]>
Signed-off-by: Chanwoo Choi <[e-mail]>
---
 drivers/devfreq/devfreq.c | 22 +++++++++++-----------
 include/linux/devfreq.h   |  7 +++++++
 2 files changed, 18 insertions(+), 11 deletions(-)

Patch

diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index ca1b362d77e2..2aa5e4e9df36 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -163,18 +163,17 @@  int update_devfreq(struct devfreq *devfreq)
 	int err = 0;
 	u32 flags = 0;
 
-	if (!mutex_is_locked(&devfreq->lock)) {
-		WARN(true, "devfreq->lock must be locked by the caller.\n");
-		return -EINVAL;
-	}
-
 	if (!devfreq->governor)
 		return -EINVAL;
 
+	mutex_lock(&devfreq->lock);
+
 	/* Reevaluate the proper frequency */
 	err = devfreq->governor->get_target_freq(devfreq, &freq);
-	if (err)
+	if (err) {
+		mutex_unlock(&devfreq->lock);
 		return err;
+	}
 
 	/*
 	 * Adjust the freuqency with user freq and QoS.
@@ -194,8 +193,10 @@  int update_devfreq(struct devfreq *devfreq)
 	}
 
 	err = devfreq->profile->target(devfreq->dev.parent, &freq, flags);
-	if (err)
+	if (err) {
+		mutex_unlock(&devfreq->lock);
 		return err;
+	}
 
 	if (devfreq->profile->freq_table)
 		if (devfreq_update_status(devfreq, freq))
@@ -203,6 +204,9 @@  int update_devfreq(struct devfreq *devfreq)
 				"Couldn't update frequency transition information.\n");
 
 	devfreq->previous_freq = freq;
+
+	mutex_unlock(&devfreq->lock);
+
 	return err;
 }
 EXPORT_SYMBOL(update_devfreq);
@@ -218,14 +222,12 @@  static void devfreq_monitor(struct work_struct *work)
 	struct devfreq *devfreq = container_of(work,
 					struct devfreq, work.work);
 
-	mutex_lock(&devfreq->lock);
 	err = update_devfreq(devfreq);
 	if (err)
 		dev_err(&devfreq->dev, "dvfs failed with (%d) error\n", err);
 
 	queue_delayed_work(devfreq_wq, &devfreq->work,
 				msecs_to_jiffies(devfreq->profile->polling_ms));
-	mutex_unlock(&devfreq->lock);
 }
 
 /**
@@ -382,9 +384,7 @@  static int devfreq_notifier_call(struct notifier_block *nb, unsigned long type,
 	struct devfreq *devfreq = container_of(nb, struct devfreq, nb);
 	int ret;
 
-	mutex_lock(&devfreq->lock);
 	ret = update_devfreq(devfreq);
-	mutex_unlock(&devfreq->lock);
 
 	return ret;
 }
diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
index ce447f0f1bad..07da551f2709 100644
--- a/include/linux/devfreq.h
+++ b/include/linux/devfreq.h
@@ -204,6 +204,8 @@  extern int devm_devfreq_register_opp_notifier(struct device *dev,
 extern void devm_devfreq_unregister_opp_notifier(struct device *dev,
 						struct devfreq *devfreq);
 
+extern int update_devfreq(struct devfreq *devfreq);
+
 #if IS_ENABLED(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND)
 /**
  * struct devfreq_simple_ondemand_data - void *data fed to struct devfreq
@@ -289,6 +291,11 @@  static inline void devm_devfreq_unregister_opp_notifier(struct device *dev,
 							struct devfreq *devfreq)
 {
 }
+
+static inline int update_devfreq(struct devfreq *devfreq)
+{
+	return 0;
+}
 #endif /* CONFIG_PM_DEVFREQ */
 
 #endif /* __LINUX_DEVFREQ_H__ */