nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-24 02:01:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

misc: mods: fix compilation with k5.4

Browse Source 
Clean up configuration in mods_config.h and make mods_config.h identical
to the official copy in Perforce.

Bug 200587200

Change-Id: I035119eb44025f45d8272729ebc5a918dd8da6fe
Signed-off-by: Chris Dragan <kdragan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2302436
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Chris Dragan
2020-02-26 04:17:32 -08:00
committed by Laxman Dewangan
parent b5b2def304
commit a85680cbc5
17 changed files with 104 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/misc/mods/mods_debugfs.c
View File

@@ -2,7 +2,7 @@
/*
* mods_debugfs.c - This file is part of NVIDIA MODS kernel driver.
*
* Copyright (c) 2014-2019, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.
*
* NVIDIA MODS kernel driver is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License,
@@ -33,7 +33,7 @@ static struct dentry *mods_debugfs_dir;
#include "mods_ras.h"
#endif
#if defined(MODS_TEGRA) && defined(MODS_HAS_KFUSE)
#if defined(CONFIG_ARCH_TEGRA) && defined(CONFIG_TEGRA_KFUSE)
#include <soc/tegra/kfuse.h>
#endif
@@ -423,7 +423,7 @@ static const struct file_operations mods_dc_crc_latched_fops = {
};
#endif /* CONFIG_TEGRA_DC */
#if defined(MODS_TEGRA) && defined(MODS_HAS_KFUSE)
#if defined(CONFIG_ARCH_TEGRA) && defined(CONFIG_TEGRA_KFUSE)
static int mods_kfuse_show(struct seq_file *s, void *unused)
{
unsigned int buf[KFUSE_DATA_SZ / 4];
@@ -453,7 +453,7 @@ static const struct file_operations mods_kfuse_fops = {
.llseek = seq_lseek,
.release = single_release,
};
#endif /* MODS_TEGRA */
#endif /* CONFIG_ARCH_TEGRA */
static int mods_debug_get(void *data, u64 *val)
{
@@ -521,7 +521,6 @@ void mods_remove_debugfs(void)
int mods_create_debugfs(struct miscdevice *modsdev)
{
#ifdef MODS_HAS_DEBUGFS
#ifdef CONFIG_ARCH_TEGRA_19x_SOC
struct dentry *ras_debugfs_entry;
#endif
@@ -618,7 +617,7 @@ int mods_create_debugfs(struct miscdevice *modsdev)
goto remove_out;
}
#if defined(MODS_TEGRA) && defined(MODS_HAS_KFUSE)
#if defined(CONFIG_ARCH_TEGRA) && defined(CONFIG_TEGRA_KFUSE)
retval = debugfs_create_file("kfuse_data", 0444,
mods_debugfs_dir, 0, &mods_kfuse_fops);
if (IS_ERR(retval)) {
@@ -764,8 +763,4 @@ remove_out:
dev_err(modsdev->this_device, "could not create debugfs\n");
mods_remove_debugfs();
return err;
#else
return 0;
#endif
}