diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-07 07:03:38 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-07-07 07:03:38 -0400 |
commit | c94f70298529d99ac6e1ee7709f61eab00adeb39 (patch) | |
tree | 8e61aadcec3bd299a838cd640bf104eedee61ec3 /drivers/char/drm/i810_dma.c | |
parent | b9523249de59c49e7c2cc83dfa73fb011a489a45 (diff) |
drm: misc cleanup
This patch contains the following cleanups:
- make needlessly global functions static
- remove the following unused global functions:
- drm_fops.c: drm_read
- i915_dma.c: i915_do_cleanup_pageflip
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/i810_dma.c')
-rw-r--r-- | drivers/char/drm/i810_dma.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c index 24857cc6c23b..18e0b7622893 100644 --- a/drivers/char/drm/i810_dma.c +++ b/drivers/char/drm/i810_dma.c | |||
@@ -90,16 +90,7 @@ static int i810_freelist_put(drm_device_t *dev, drm_buf_t *buf) | |||
90 | return 0; | 90 | return 0; |
91 | } | 91 | } |
92 | 92 | ||
93 | static struct file_operations i810_buffer_fops = { | 93 | static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma) |
94 | .open = drm_open, | ||
95 | .flush = drm_flush, | ||
96 | .release = drm_release, | ||
97 | .ioctl = drm_ioctl, | ||
98 | .mmap = i810_mmap_buffers, | ||
99 | .fasync = drm_fasync, | ||
100 | }; | ||
101 | |||
102 | int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma) | ||
103 | { | 94 | { |
104 | drm_file_t *priv = filp->private_data; | 95 | drm_file_t *priv = filp->private_data; |
105 | drm_device_t *dev; | 96 | drm_device_t *dev; |
@@ -126,6 +117,15 @@ int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma) | |||
126 | return 0; | 117 | return 0; |
127 | } | 118 | } |
128 | 119 | ||
120 | static struct file_operations i810_buffer_fops = { | ||
121 | .open = drm_open, | ||
122 | .flush = drm_flush, | ||
123 | .release = drm_release, | ||
124 | .ioctl = drm_ioctl, | ||
125 | .mmap = i810_mmap_buffers, | ||
126 | .fasync = drm_fasync, | ||
127 | }; | ||
128 | |||
129 | static int i810_map_buffer(drm_buf_t *buf, struct file *filp) | 129 | static int i810_map_buffer(drm_buf_t *buf, struct file *filp) |
130 | { | 130 | { |
131 | drm_file_t *priv = filp->private_data; | 131 | drm_file_t *priv = filp->private_data; |
@@ -1003,8 +1003,8 @@ void i810_reclaim_buffers(drm_device_t *dev, struct file *filp) | |||
1003 | } | 1003 | } |
1004 | } | 1004 | } |
1005 | 1005 | ||
1006 | int i810_flush_ioctl(struct inode *inode, struct file *filp, | 1006 | static int i810_flush_ioctl(struct inode *inode, struct file *filp, |
1007 | unsigned int cmd, unsigned long arg) | 1007 | unsigned int cmd, unsigned long arg) |
1008 | { | 1008 | { |
1009 | drm_file_t *priv = filp->private_data; | 1009 | drm_file_t *priv = filp->private_data; |
1010 | drm_device_t *dev = priv->head->dev; | 1010 | drm_device_t *dev = priv->head->dev; |