Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5379dc04 authored Jul 10, 2013 by Daniel Vetter Committed by Dave Airlie Jul 23, 2013

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>

parent c7e00b6d

drivers/gpu/drm/radeon/radeon_drv.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -101,8 +101,6 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev);
	int radeon_driver_irq_postinstall_kms(struct drm_device *dev);		int radeon_driver_irq_postinstall_kms(struct drm_device *dev);
	void radeon_driver_irq_uninstall_kms(struct drm_device *dev);		void radeon_driver_irq_uninstall_kms(struct drm_device *dev);
	irqreturn_t radeon_driver_irq_handler_kms(DRM_IRQ_ARGS);		irqreturn_t radeon_driver_irq_handler_kms(DRM_IRQ_ARGS);
	int radeon_dma_ioctl_kms(struct drm_device dev, void data,
	struct drm_file *file_priv);
	int radeon_gem_object_init(struct drm_gem_object *obj);		int radeon_gem_object_init(struct drm_gem_object *obj);
	void radeon_gem_object_free(struct drm_gem_object *obj);		void radeon_gem_object_free(struct drm_gem_object *obj);
	int radeon_gem_object_open(struct drm_gem_object *obj,		int radeon_gem_object_open(struct drm_gem_object *obj,
	@@ -421,7 +419,6 @@ static struct drm_driver kms_driver = {
	.gem_free_object = radeon_gem_object_free,		.gem_free_object = radeon_gem_object_free,
	.gem_open_object = radeon_gem_object_open,		.gem_open_object = radeon_gem_object_open,
	.gem_close_object = radeon_gem_object_close,		.gem_close_object = radeon_gem_object_close,
	.dma_ioctl = radeon_dma_ioctl_kms,
	.dumb_create = radeon_mode_dumb_create,		.dumb_create = radeon_mode_dumb_create,
	.dumb_map_offset = radeon_mode_dumb_mmap,		.dumb_map_offset = radeon_mode_dumb_mmap,
	.dumb_destroy = radeon_mode_dumb_destroy,		.dumb_destroy = radeon_mode_dumb_destroy,

drivers/gpu/drm/radeon/radeon_kms.c

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -683,16 +683,6 @@ int radeon_get_vblank_timestamp_kms(struct drm_device *dev, int crtc,
	drmcrtc);		drmcrtc);
	}		}

	/*
	* IOCTL.
	*/
	int radeon_dma_ioctl_kms(struct drm_device dev, void data,
	struct drm_file *file_priv)
	{
	/* Not valid in KMS. */
	return -EINVAL;
	}

	#define KMS_INVALID_IOCTL(name) \		#define KMS_INVALID_IOCTL(name) \
	int name(struct drm_device dev, void data, struct drm_file *file_priv)\		int name(struct drm_device dev, void data, struct drm_file *file_priv)\
	{ \		{ \