summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Gangwar <anujg@nvidia.com>2019-03-05 01:51:21 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2019-05-06 11:28:40 -0400
commitcfcaa72913c5295962dfd9cd3b20f3736dc3fa8d (patch)
tree6a9031868e6f7c677762d5faf39bdcb62802856a
parent8668379cc2d0dde1f97603f1b3dda4117f41cae5 (diff)
include: uapi: move compat_saf775x_ioctl.h file
Move compat_saf775x_ioctl header file from drivers/misc/saf775x/ to include/uapi/misc/. Change the path for header in dependent c files. Bug 2062672 Change-Id: I959d16b8b56214cf2db83c05f181faf1def2a1e1 Signed-off-by: Anuj Gangwar <anujg@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/2032464 (cherry picked from commit 07d3aa875210c2f833a60afa5fb5c546a33d29d7) Reviewed-on: https://git-master.nvidia.com/r/2109958 GVS: Gerrit_Virtual_Submit Reviewed-by: Bibek Basu <bbasu@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r--drivers/misc/saf775x/compat_saf775x_ioctl.c6
-rw-r--r--drivers/misc/saf775x/saf775x_ioctl.c7
-rw-r--r--include/uapi/misc/compat_saf775x_ioctl.h (renamed from drivers/misc/saf775x/compat_saf775x_ioctl.h)10
3 files changed, 13 insertions, 10 deletions
diff --git a/drivers/misc/saf775x/compat_saf775x_ioctl.c b/drivers/misc/saf775x/compat_saf775x_ioctl.c
index a53f642b8..de89dde99 100644
--- a/drivers/misc/saf775x/compat_saf775x_ioctl.c
+++ b/drivers/misc/saf775x/compat_saf775x_ioctl.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * compat_saf775x_ioctl.c -- SAF775X Soc Audio driver IO control 2 * compat_saf775x_ioctl.c -- SAF775X Soc Audio driver IO control
3 * 3 *
4 * Copyright (c) 2017 NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2017-2019 NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms and conditions of the GNU General Public License, 7 * under the terms and conditions of the GNU General Public License,
@@ -18,7 +18,9 @@
18 18
19 19
20#include "saf775x_ioctl.h" 20#include "saf775x_ioctl.h"
21#include "compat_saf775x_ioctl.h" 21#include <uapi/misc/compat_saf775x_ioctl.h>
22#include <linux/uaccess.h>
23#include <linux/compat.h>
22 24
23static int compat_get_saf775x_cmd( 25static int compat_get_saf775x_cmd(
24 struct compat_saf775x_cmd __user *data32, 26 struct compat_saf775x_cmd __user *data32,
diff --git a/drivers/misc/saf775x/saf775x_ioctl.c b/drivers/misc/saf775x/saf775x_ioctl.c
index 570640c9f..df0f51d7e 100644
--- a/drivers/misc/saf775x/saf775x_ioctl.c
+++ b/drivers/misc/saf775x/saf775x_ioctl.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * saf775x_ioctl.c -- SAF775X Soc Audio driver IO control 2 * saf775x_ioctl.c -- SAF775X Soc Audio driver IO control
3 * 3 *
4 * Copyright (c) 2014-2017 NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2014-2019 NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms and conditions of the GNU General Public License, 7 * under the terms and conditions of the GNU General Public License,
@@ -15,11 +15,14 @@
15 * You should have received a copy of the GNU General Public License 15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>. 16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */ 17 */
18#include <linux/cdev.h>
19#include <linux/i2c.h>
18#include <linux/module.h> 20#include <linux/module.h>
19#include <linux/slab.h> 21#include <linux/slab.h>
20#include <linux/types.h> 22#include <linux/types.h>
23#include <linux/uaccess.h>
24#include <uapi/misc/compat_saf775x_ioctl.h>
21#include "saf775x_ioctl.h" 25#include "saf775x_ioctl.h"
22#include "compat_saf775x_ioctl.h"
23 26
24#define MAX_LEN 24 27#define MAX_LEN 24
25#define CHECK_MAX_AND_ADJUST(__val_len__)\ 28#define CHECK_MAX_AND_ADJUST(__val_len__)\
diff --git a/drivers/misc/saf775x/compat_saf775x_ioctl.h b/include/uapi/misc/compat_saf775x_ioctl.h
index 9ad4e7a23..a5ad8a70d 100644
--- a/drivers/misc/saf775x/compat_saf775x_ioctl.h
+++ b/include/uapi/misc/compat_saf775x_ioctl.h
@@ -1,7 +1,7 @@
1 /* 1 /*
2 * compat_saf775x_ioctl.h -- SAF775X Soc Audio driver IO control 2 * compat_saf775x_ioctl.h -- SAF775X Soc Audio driver IO control
3 * 3 *
4 * Copyright (c) 2017 NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2017-2019 NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms and conditions of the GNU General Public License, 7 * under the terms and conditions of the GNU General Public License,
@@ -16,10 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>. 16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */ 17 */
18 18
19#ifndef __COMPAT_SAF775X_IOCTL_H__ 19#ifndef __UAPI_COMPAT_SAF775X_IOCTL_H__
20#define __COMPAT_SAF775X_IOCTL_H__ 20#define __UAPI_COMPAT_SAF775X_IOCTL_H__
21
22#include <linux/compat.h>
23 21
24struct compat_saf775x_cmd { 22struct compat_saf775x_cmd {
25 compat_uint_t reg; 23 compat_uint_t reg;
@@ -66,4 +64,4 @@ enum {
66 #define compat_saf775x_hwdep_ioctl NULL 64 #define compat_saf775x_hwdep_ioctl NULL
67#endif /* CONFIG_COMPAT */ 65#endif /* CONFIG_COMPAT */
68 66
69#endif /* __COMPAT_SAF775X_IOCTL_H__ */ 67#endif /* __UAPI_COMPAT_SAF775X_IOCTL_H__ */