diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-11-11 03:40:52 -0500 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-11-11 03:40:52 -0500 |
commit | 8f5f39f77f5a6053ae287d4673028e7a69335f5e (patch) | |
tree | 4090314e38601f9e40f69256b356334c6430e2d2 /drivers | |
parent | 7052cff984ba575926bb7d2ae5454cce531a97e1 (diff) |
drm: remove drm_flush
drm_flush is no longer needed remove.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/drm/drmP.h | 1 | ||||
-rw-r--r-- | drivers/char/drm/drm_fops.c | 14 | ||||
-rw-r--r-- | drivers/char/drm/i810_dma.c | 1 | ||||
-rw-r--r-- | drivers/char/drm/i830_dma.c | 1 |
4 files changed, 0 insertions, 17 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 3593f609241a..6c35879bbe3a 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h | |||
@@ -783,7 +783,6 @@ extern int drm_lastclose(drm_device_t *dev); | |||
783 | /* Device support (drm_fops.h) */ | 783 | /* Device support (drm_fops.h) */ |
784 | extern int drm_open(struct inode *inode, struct file *filp); | 784 | extern int drm_open(struct inode *inode, struct file *filp); |
785 | extern int drm_stub_open(struct inode *inode, struct file *filp); | 785 | extern int drm_stub_open(struct inode *inode, struct file *filp); |
786 | extern int drm_flush(struct file *filp); | ||
787 | extern int drm_fasync(int fd, struct file *filp, int on); | 786 | extern int drm_fasync(int fd, struct file *filp, int on); |
788 | extern int drm_release(struct inode *inode, struct file *filp); | 787 | extern int drm_release(struct inode *inode, struct file *filp); |
789 | 788 | ||
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c index 28f01305377f..b73543c694a9 100644 --- a/drivers/char/drm/drm_fops.c +++ b/drivers/char/drm/drm_fops.c | |||
@@ -424,20 +424,6 @@ static int drm_open_helper(struct inode *inode, struct file *filp, | |||
424 | } | 424 | } |
425 | 425 | ||
426 | /** No-op. */ | 426 | /** No-op. */ |
427 | int drm_flush(struct file *filp) | ||
428 | { | ||
429 | drm_file_t *priv = filp->private_data; | ||
430 | drm_device_t *dev = priv->head->dev; | ||
431 | |||
432 | DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n", | ||
433 | current->pid, (long)old_encode_dev(priv->head->device), | ||
434 | dev->open_count); | ||
435 | return 0; | ||
436 | } | ||
437 | |||
438 | EXPORT_SYMBOL(drm_flush); | ||
439 | |||
440 | /** No-op. */ | ||
441 | int drm_fasync(int fd, struct file *filp, int on) | 427 | int drm_fasync(int fd, struct file *filp, int on) |
442 | { | 428 | { |
443 | drm_file_t *priv = filp->private_data; | 429 | drm_file_t *priv = filp->private_data; |
diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c index c3178a89615d..a7df6147091c 100644 --- a/drivers/char/drm/i810_dma.c +++ b/drivers/char/drm/i810_dma.c | |||
@@ -114,7 +114,6 @@ static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma) | |||
114 | 114 | ||
115 | static struct file_operations i810_buffer_fops = { | 115 | static struct file_operations i810_buffer_fops = { |
116 | .open = drm_open, | 116 | .open = drm_open, |
117 | .flush = drm_flush, | ||
118 | .release = drm_release, | 117 | .release = drm_release, |
119 | .ioctl = drm_ioctl, | 118 | .ioctl = drm_ioctl, |
120 | .mmap = i810_mmap_buffers, | 119 | .mmap = i810_mmap_buffers, |
diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c index 01dfdb944e1f..f1e048f10ce8 100644 --- a/drivers/char/drm/i830_dma.c +++ b/drivers/char/drm/i830_dma.c | |||
@@ -116,7 +116,6 @@ static int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma) | |||
116 | 116 | ||
117 | static struct file_operations i830_buffer_fops = { | 117 | static struct file_operations i830_buffer_fops = { |
118 | .open = drm_open, | 118 | .open = drm_open, |
119 | .flush = drm_flush, | ||
120 | .release = drm_release, | 119 | .release = drm_release, |
121 | .ioctl = drm_ioctl, | 120 | .ioctl = drm_ioctl, |
122 | .mmap = i830_mmap_buffers, | 121 | .mmap = i830_mmap_buffers, |