nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-23 17:55:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

adsp: updated standard include path & clock_t api

Browse Source 
cputime64_to_clock_t is deprecated on kernel 4.14
as it is an architecture defined type
so changing cputime64 to nsecs.

Bug 200406253

Change-Id: I16bac09da698ca1b15130be69fb7c58c70d3ce94
Signed-off-by: Dara Ramesh <dramesh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1742429
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Ajay Nandakumar M <anandakumarm@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Dara Ramesh
2018-06-07 14:57:17 +05:30
committed by Laxman Dewangan
parent 159d4e9e34
commit beddbe937e
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/platform/tegra/nvadsp/adsp_console_dbfs.c
View File

@@ -3,7 +3,7 @@
* *
* adsp mailbox console driver * adsp mailbox console driver
* *
* Copyright (C) 2014-2016, NVIDIA Corporation. All rights reserved. * Copyright (C) 2014-2018, NVIDIA Corporation. All rights reserved.
* *
* This software is licensed under the terms of the GNU General Public * This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and * License version 2, as published by the Free Software Foundation, and
@@ -30,7 +30,7 @@
#include <linux/tegra_nvadsp.h> #include <linux/tegra_nvadsp.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include "dev.h" #include "dev.h"
#include "adsp_console_ioctl.h" #include "adsp_console_ioctl.h"

9
drivers/platform/tegra/nvadsp/adsp_dfs.c
View File

@@ -3,7 +3,7 @@
* *
* adsp dynamic frequency scaling * adsp dynamic frequency scaling
* *
* Copyright (C) 2014-2017, NVIDIA Corporation. All rights reserved. * Copyright (C) 2014-2018, NVIDIA Corporation. All rights reserved.
* *
* This software is licensed under the terms of the GNU General Public * This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and * License version 2, as published by the Free Software Foundation, and
@@ -21,7 +21,12 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/clk/tegra.h> #include <linux/clk/tegra.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/version.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
#include <asm/cputime.h> #include <asm/cputime.h>
#else
#include <linux/sched/cputime.h>
#endif
#include <linux/slab.h> #include <linux/slab.h>
#include "dev.h" #include "dev.h"
@@ -607,7 +612,7 @@ static void dump_stats_table(struct seq_file *s, struct adsp_freq_stats *fstats)
for (i = 0; i < fstats->state_num; i++) { for (i = 0; i < fstats->state_num; i++) {
seq_printf(s, "%lu %llu\n", seq_printf(s, "%lu %llu\n",
(long unsigned int)(adsp_cpu_freq_table[i] / 1000), (long unsigned int)(adsp_cpu_freq_table[i] / 1000),
cputime64_to_clock_t(fstats->time_in_state[i])); nsec_to_clock_t(fstats->time_in_state[i]));
} }
mutex_unlock(&policy_mutex); mutex_unlock(&policy_mutex);
} }