aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-07-10 08:11:40 -0400
committerDave Airlie <airlied@gmail.com>2013-07-23 05:20:23 -0400
commit5379dc042257cbf0fa2c54b4fa29d7077da35a25 (patch)
tree7cc9c31803e47438e562cacd455c91ea7f9f7378
parentc7e00b6d6a08772fac43b0fcea7fb48e6a1fe390 (diff)
drm/radoen: kill radeon_dma_ioctl_kms
No need to create a dummy ioctl function to return -EINVAL, since that's what the core already does in the absence of the dma_ioctl callback. So we can safely remove this. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@gmail.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_drv.c3
-rw-r--r--drivers/gpu/drm/radeon/radeon_kms.c10
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 29876b1be8ec..c8eb2aa2879f 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -101,8 +101,6 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev);
101int radeon_driver_irq_postinstall_kms(struct drm_device *dev); 101int radeon_driver_irq_postinstall_kms(struct drm_device *dev);
102void radeon_driver_irq_uninstall_kms(struct drm_device *dev); 102void radeon_driver_irq_uninstall_kms(struct drm_device *dev);
103irqreturn_t radeon_driver_irq_handler_kms(DRM_IRQ_ARGS); 103irqreturn_t radeon_driver_irq_handler_kms(DRM_IRQ_ARGS);
104int radeon_dma_ioctl_kms(struct drm_device *dev, void *data,
105 struct drm_file *file_priv);
106int radeon_gem_object_init(struct drm_gem_object *obj); 104int radeon_gem_object_init(struct drm_gem_object *obj);
107void radeon_gem_object_free(struct drm_gem_object *obj); 105void radeon_gem_object_free(struct drm_gem_object *obj);
108int radeon_gem_object_open(struct drm_gem_object *obj, 106int radeon_gem_object_open(struct drm_gem_object *obj,
@@ -421,7 +419,6 @@ static struct drm_driver kms_driver = {
421 .gem_free_object = radeon_gem_object_free, 419 .gem_free_object = radeon_gem_object_free,
422 .gem_open_object = radeon_gem_object_open, 420 .gem_open_object = radeon_gem_object_open,
423 .gem_close_object = radeon_gem_object_close, 421 .gem_close_object = radeon_gem_object_close,
424 .dma_ioctl = radeon_dma_ioctl_kms,
425 .dumb_create = radeon_mode_dumb_create, 422 .dumb_create = radeon_mode_dumb_create,
426 .dumb_map_offset = radeon_mode_dumb_mmap, 423 .dumb_map_offset = radeon_mode_dumb_mmap,
427 .dumb_destroy = radeon_mode_dumb_destroy, 424 .dumb_destroy = radeon_mode_dumb_destroy,
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 49ff3d1a6102..07b023655bb4 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -683,16 +683,6 @@ int radeon_get_vblank_timestamp_kms(struct drm_device *dev, int crtc,
683 drmcrtc); 683 drmcrtc);
684} 684}
685 685
686/*
687 * IOCTL.
688 */
689int radeon_dma_ioctl_kms(struct drm_device *dev, void *data,
690 struct drm_file *file_priv)
691{
692 /* Not valid in KMS. */
693 return -EINVAL;
694}
695
696#define KMS_INVALID_IOCTL(name) \ 686#define KMS_INVALID_IOCTL(name) \
697int name(struct drm_device *dev, void *data, struct drm_file *file_priv)\ 687int name(struct drm_device *dev, void *data, struct drm_file *file_priv)\
698{ \ 688{ \