Commit 492d774d authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: remove drm_modctx ioctl and use drm_noop instead 



It doesn't do anything, so kill the code.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@gmail.com>
parent e13af9a8

drivers/gpu/drm/drm_context.c

+0 −6
Original line number Diff line number Diff line
@@ -342,12 +342,6 @@ int drm_addctx(struct drm_device *dev, void *data, 
	return 0;

}



int drm_modctx(struct drm_device *dev, void *data, struct drm_file *file_priv)

{

	/* This does nothing */

	return 0;

}



/**

 * Get context.

 *

drivers/gpu/drm/drm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = { 


	DRM_IOCTL_DEF(DRM_IOCTL_ADD_CTX, drm_addctx, DRM_AUTH|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_RM_CTX, drm_rmctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_MOD_CTX, drm_modctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_MOD_CTX, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_GET_CTX, drm_getctx, DRM_AUTH),

	DRM_IOCTL_DEF(DRM_IOCTL_SWITCH_CTX, drm_switchctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_NEW_CTX, drm_newctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

include/drm/drmP.h

+0 −2
Original line number Diff line number Diff line
@@ -1335,8 +1335,6 @@ extern int drm_resctx(struct drm_device *dev, void *data, 
		      struct drm_file *file_priv);

extern int drm_addctx(struct drm_device *dev, void *data,

		      struct drm_file *file_priv);

extern int drm_modctx(struct drm_device *dev, void *data,

		      struct drm_file *file_priv);

extern int drm_getctx(struct drm_device *dev, void *data,

		      struct drm_file *file_priv);

extern int drm_switchctx(struct drm_device *dev, void *data,