diff options
Diffstat (limited to 'drivers/char/drm/drm_os_linux.h')
-rw-r--r-- | drivers/char/drm/drm_os_linux.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/char/drm/drm_os_linux.h b/drivers/char/drm/drm_os_linux.h index 0b8d3433386d..114e54e0f61b 100644 --- a/drivers/char/drm/drm_os_linux.h +++ b/drivers/char/drm/drm_os_linux.h | |||
@@ -6,11 +6,6 @@ | |||
6 | #include <linux/interrupt.h> /* For task queue support */ | 6 | #include <linux/interrupt.h> /* For task queue support */ |
7 | #include <linux/delay.h> | 7 | #include <linux/delay.h> |
8 | 8 | ||
9 | /** File pointer type */ | ||
10 | #define DRMFILE struct file * | ||
11 | /** Ioctl arguments */ | ||
12 | #define DRM_IOCTL_ARGS struct inode *inode, struct file *filp, unsigned int cmd, unsigned long data | ||
13 | #define DRM_ERR(d) -(d) | ||
14 | /** Current process ID */ | 9 | /** Current process ID */ |
15 | #define DRM_CURRENTPID current->pid | 10 | #define DRM_CURRENTPID current->pid |
16 | #define DRM_SUSER(p) capable(CAP_SYS_ADMIN) | 11 | #define DRM_SUSER(p) capable(CAP_SYS_ADMIN) |
@@ -33,9 +28,6 @@ | |||
33 | #define DRM_WRITEMEMORYBARRIER() wmb() | 28 | #define DRM_WRITEMEMORYBARRIER() wmb() |
34 | /** Read/write memory barrier */ | 29 | /** Read/write memory barrier */ |
35 | #define DRM_MEMORYBARRIER() mb() | 30 | #define DRM_MEMORYBARRIER() mb() |
36 | /** DRM device local declaration */ | ||
37 | #define DRM_DEVICE struct drm_file *priv = filp->private_data; \ | ||
38 | struct drm_device *dev = priv->head->dev | ||
39 | 31 | ||
40 | /** IRQ handler arguments and return type and values */ | 32 | /** IRQ handler arguments and return type and values */ |
41 | #define DRM_IRQ_ARGS int irq, void *arg | 33 | #define DRM_IRQ_ARGS int irq, void *arg |
@@ -94,8 +86,6 @@ static __inline__ int mtrr_del(int reg, unsigned long base, unsigned long size) | |||
94 | #define DRM_GET_USER_UNCHECKED(val, uaddr) \ | 86 | #define DRM_GET_USER_UNCHECKED(val, uaddr) \ |
95 | __get_user(val, uaddr) | 87 | __get_user(val, uaddr) |
96 | 88 | ||
97 | #define DRM_GET_PRIV_WITH_RETURN(_priv, _filp) _priv = _filp->private_data | ||
98 | |||
99 | #define DRM_HZ HZ | 89 | #define DRM_HZ HZ |
100 | 90 | ||
101 | #define DRM_WAIT_ON( ret, queue, timeout, condition ) \ | 91 | #define DRM_WAIT_ON( ret, queue, timeout, condition ) \ |