diff options
| author | Jon Mayo <jmayo@nvidia.com> | 2014-03-04 16:27:01 -0800 |
|---|---|---|
| committer | Jon Mayo <jmayo@nvidia.com> | 2014-03-07 13:04:01 -0800 |
| commit | 8773984005dfae7d1dcba1907698cf38ca73618e (patch) | |
| tree | a6362d1db981575cc02dd42345df17466d61428d /include/video | |
| parent | b6b698ef273e233d564a7785af3aea4c0e53036f (diff) | |
Revert "drivers: tegra: dc: support compat ioctls"
This reverts commit 0ca988fecb9b58567f2019d9dc0530200e3f764f.
Bug 1466416
Change-Id: I8393151c04a032834d7658d2f4181c0fedccb13a
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-on: http://git-master/r/378128
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/tegra_dc_ext.h | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/include/video/tegra_dc_ext.h b/include/video/tegra_dc_ext.h index 3b4def47ad71..5b2eebde9915 100644 --- a/include/video/tegra_dc_ext.h +++ b/include/video/tegra_dc_ext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013, NVIDIA CORPORATION. All rights reserved. + * Copyright (C) 2011-2013, NVIDIA Corporation. All rights reserved. * * Author: Robert Morell <rmorell@nvidia.com> * Some code based on fbdev extensions written by: @@ -21,7 +21,6 @@ #include <linux/types.h> #include <linux/ioctl.h> -#include <linux/compat.h> #if defined(__KERNEL__) # include <linux/time.h> #else @@ -94,15 +93,6 @@ #define TEGRA_DC_EXT_FLIP_FLAG_SCAN_COLUMN (1 << 6) #define TEGRA_DC_EXT_FLIP_FLAG_INTERLACE (1 << 7) -#ifdef CONFIG_COMPAT -struct tegra_timespec { - __s32 tv_sec; /* seconds */ - __s32 tv_nsec; /* nanoseconds */ -}; -#else -#define tegra_timespec timespec -#endif - struct tegra_dc_ext_flip_windowattr { __s32 index; __u32 buff_id; @@ -127,7 +117,7 @@ struct tegra_dc_ext_flip_windowattr { __u32 out_h; __u32 z; __u32 swap_interval; - struct tegra_timespec timestamp; + struct timespec timestamp; union { struct { __u32 pre_syncpt_id; @@ -159,11 +149,7 @@ struct tegra_dc_ext_flip { }; struct tegra_dc_ext_flip_2 { -#ifdef CONFIG_COMPAT - __u32 win; -#else struct tegra_dc_ext_flip_windowattr *win; -#endif __u8 win_num; __u8 reserved1; /* unused - must be 0 */ __u16 reserved2; /* unused - must be 0 */ @@ -338,15 +324,9 @@ struct tegra_dc_ext_lut { __u32 flags; /* Flag bitmask, see TEGRA_DC_EXT_LUT_FLAGS_* */ __u32 start; /* start index to update lut from */ __u32 len; /* number of valid lut entries */ -#ifdef CONFIG_COMPAT - __u32 r; /* array of 16-bit red values, 0 to reset */ - __u32 g; /* array of 16-bit green values, 0 to reset */ - __u32 b; /* array of 16-bit blue values, 0 to reset */ -#else __u16 *r; /* array of 16-bit red values, 0 to reset */ __u16 *g; /* array of 16-bit green values, 0 to reset */ __u16 *b; /* array of 16-bit blue values, 0 to reset */ -#endif }; /* tegra_dc_ext_lut.flags - override global fb device lookup table. @@ -363,11 +343,7 @@ struct tegra_dc_ext_status { struct tegra_dc_ext_feature { __u32 length; -#ifdef CONFIG_COMPAT - __u32 entries; -#else __u32 *entries; -#endif }; #define TEGRA_DC_EXT_SET_NVMAP_FD \ @@ -477,20 +453,12 @@ struct tegra_dc_ext_control_output_properties { struct tegra_dc_ext_control_output_edid { __u32 handle; __u32 size; -#ifdef CONFIG_COMPAT - __u32 data; -#else void *data; -#endif }; struct tegra_dc_ext_event { __u32 type; -#ifdef CONFIG_COMPAT - __u32 data_size; -#else ssize_t data_size; -#endif char data[0]; }; |