summaryrefslogtreecommitdiff
path: root/drivers/devfreq/tegra-devfreq.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-09-25 09:28:58 +0200
committerIngo Molnar <mingo@kernel.org>2015-09-25 09:28:58 +0200
commit9c9ab385bc6c3f0787f742d5e9baf04063d9697a (patch)
treecc6ac425f7580a40d011ad2e8fc7974678843e0b /drivers/devfreq/tegra-devfreq.c
parent93f13a9f96771a064c716364aebc6e283b186eb8 (diff)
parentbcee19f424a0d8c26ecf2607b73c690802658b29 (diff)
downloadlinux-next-9c9ab385bc6c3f0787f742d5e9baf04063d9697a.tar.gz
linux-next-9c9ab385bc6c3f0787f742d5e9baf04063d9697a.zip
Merge branch 'linus' into x86/asm, to refresh the tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/devfreq/tegra-devfreq.c')
-rw-r--r--drivers/devfreq/tegra-devfreq.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/devfreq/tegra-devfreq.c b/drivers/devfreq/tegra-devfreq.c
index 13a1a6e8108c..848b93ee930f 100644
--- a/drivers/devfreq/tegra-devfreq.c
+++ b/drivers/devfreq/tegra-devfreq.c
@@ -541,18 +541,20 @@ static struct devfreq_dev_profile tegra_devfreq_profile = {
static int tegra_governor_get_target(struct devfreq *devfreq,
unsigned long *freq)
{
- struct devfreq_dev_status stat;
+ struct devfreq_dev_status *stat;
struct tegra_devfreq *tegra;
struct tegra_devfreq_device *dev;
unsigned long target_freq = 0;
unsigned int i;
int err;
- err = devfreq->profile->get_dev_status(devfreq->dev.parent, &stat);
+ err = devfreq_update_stats(devfreq);
if (err)
return err;
- tegra = stat.private_data;
+ stat = &devfreq->last_status;
+
+ tegra = stat->private_data;
for (i = 0; i < ARRAY_SIZE(tegra->devices); i++) {
dev = &tegra->devices[i];