From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754894AbbGPMDD (ORCPT ); Thu, 16 Jul 2015 08:03:03 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:36912 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750769AbbGPMDA (ORCPT ); Thu, 16 Jul 2015 08:03:00 -0400 X-AuditID: cbfee68e-f79c56d000006efb-2e-55a79d71317e From: Chanwoo Choi To: edubezval@gmail.com, rui.zhang@intel.com, myungjoo.ham@samsung.com, kyungmin.park@samsung.com Cc: ulf.hansson@linaro.org, khilman@linaro.org, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, inki.dae@samsung.com, l.majewski@samsung.com, cw00.choi@samsung.com, kgene.kim@samsung.com, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [RFC PATCH 1/2] PM: devfreq: Add the prototype of update_devfreq() to export Date: Thu, 16 Jul 2015 21:02:52 +0900 Message-id: <1437048173-23744-2-git-send-email-cw00.choi@samsung.com> X-Mailer: git-send-email 1.8.5.5 In-reply-to: <1437048173-23744-1-git-send-email-cw00.choi@samsung.com> References: <1437048173-23744-1-git-send-email-cw00.choi@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDIsWRmVeSWpSXmKPExsWyRsSkWLdw7vJQg5kPRCyuf3nOajH/yDkg ceUaq8W5VysZLSbdn8Bi0bvgKpvF18MrGC3ONr1ht3jzcDOjxeVdc9gsPvceYbRYev0ik8Xt xhVsFhOmr2WxaN17hN3iycM+Novja8MdBD3WzFvD6LFz1l12j5XLv7B5LN7zkslj06pONo87 1/awefRtWcXo8XmTXABHFJdNSmpOZllqkb5dAlfGk5VJBXOkKz7eeMTewLhJrIuRk0NCwESi +dA9NghbTOLCvfVANheHkMBSRokvy+4wwRQt7vnMApGYzijR92ATM4TzhVFi8ZyTYO1sAloS +1/cALNFBJIlNsy4zwpSxCxwmEni1pY1jCAJYYFwib4lf9hBbBYBVYnFJ6+C2bwCrhLPpn5i h1inILFs+UxWEJtTwE2i9dIOsLgQUM3xZxPYQYZKCPxklzjw8j0TxCABiW+TDwHdxwGUkJXY dIAZYo6kxMEVN1gmMAovYGRYxSiaWpBcUJyUXmSkV5yYW1yal66XnJ+7iREYaaf/PevbwXjz gPUhRgEORiUe3g0/loUKsSaWFVfmHmI0BdowkVlKNDkfGM95JfGGxmZGFqYmpsZG5pZmSuK8 CVI/g4UE0hNLUrNTUwtSi+KLSnNSiw8xMnFwSjUwCr1/JRokk3CfJ1FTdWX0Bjb3LfbGgb/C Z04tiHRf4mSSvjg+JEnh2ruzD014r/PyNkRmq96fcKCXjze659DeS+byCvP5fzpX/dnyfoXQ 1HWOM9+XbZ//3DPp+6diC/E/ey15Hh1aL+AUzeP5r/m9wLp/r+9MzxHUuXRtXuZ80UqpHS9Y z8mvVWIpzkg01GIuKk4EACmDY2yvAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGIsWRmVeSWpSXmKPExsVy+t9jQd3CuctDDWYc5bO4/uU5q8X8I+eA xJVrrBbnXq1ktJh0fwKLRe+Cq2wWXw+vYLQ42/SG3eLNw82MFpd3zWGz+Nx7hNFi6fWLTBa3 G1ewWUyYvpbFonXvEXaLJw/72CyOrw13EPRYM28No8fOWXfZPVYu/8LmsXjPSyaPTas62Tzu XNvD5tG3ZRWjx+dNcgEcUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJ uam2Si4+AbpumTlAfygplCXmlAKFAhKLi5X07TBNCA1x07WAaYzQ9Q0JgusxMkADCWsYM56s TCqYI13x8cYj9gbGTWJdjJwcEgImEot7PrNA2GISF+6tZ+ti5OIQEpjOKNH3YBMzhPOFUWLx nJNsIFVsAloS+1/cALNFBJIlNsy4zwpSxCxwmEni1pY1jCAJYYFwib4lf9hBbBYBVYnFJ6+C 2bwCrhLPpn5ih1inILFs+UxWEJtTwE2i9dIOsLgQUM3xZxPYJzDyLmBkWMUomlqQXFCclJ5r pFecmFtcmpeul5yfu4kRHMfPpHcwrmqwOMQowMGoxMPL8XtZqBBrYllxZe4hRgkOZiURXvH2 5aFCvCmJlVWpRfnxRaU5qcWHGE2BrprILCWanA9MMXkl8YbGJmZGlkbmhhZGxuZK4rwn831C hQTSE0tSs1NTC1KLYPqYODilGhiVDtjrzq07bqw290ox+6KIe7NkFzFNjjjbta3/+Y3235H2 VVr3Nwo9mnjL/mlm08ET3D4yh7d1Pz66qWrj/q0rEyQLgo3WvIgXXZ4b8HXd3fUF0fbnemTP 1e/o3GQf8zC+ckmhLtM78RSxxO09d996fNDMkdKZ0Kx8N3Sn1wNBw+RZS7wcI1cosRRnJBpq MRcVJwIAejnn+fkCAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Kyungmin Park Signed-off-by: Chanwoo Choi --- drivers/devfreq/devfreq.c | 22 +++++++++++----------- include/linux/devfreq.h | 7 +++++++ 2 files changed, 18 insertions(+), 11 deletions(-) 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__ */ -- 1.8.5.5