diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-07-10 08:11:35 -0400 |
---|---|---|
committer | Dave Airlie <airlied@gmail.com> | 2013-07-23 05:20:18 -0400 |
commit | 492d774db34fd601b3db17218cf0ae262b51b5cf (patch) | |
tree | 8dd0a2af4be109e5d3fbb6153b9d9928f774e30a | |
parent | e13af9a8340685cfe25d0c9f708da7121e0f51dd (diff) |
drm: remove drm_modctx ioctl and use drm_noop instead
It doesn't do anything, so kill the code.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@gmail.com>
-rw-r--r-- | drivers/gpu/drm/drm_context.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_drv.c | 2 | ||||
-rw-r--r-- | include/drm/drmP.h | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c index 725968d38976..6f9731ff6a5b 100644 --- a/drivers/gpu/drm/drm_context.c +++ b/drivers/gpu/drm/drm_context.c | |||
@@ -342,12 +342,6 @@ int drm_addctx(struct drm_device *dev, void *data, | |||
342 | return 0; | 342 | return 0; |
343 | } | 343 | } |
344 | 344 | ||
345 | int drm_modctx(struct drm_device *dev, void *data, struct drm_file *file_priv) | ||
346 | { | ||
347 | /* This does nothing */ | ||
348 | return 0; | ||
349 | } | ||
350 | |||
351 | /** | 345 | /** |
352 | * Get context. | 346 | * Get context. |
353 | * | 347 | * |
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 99fcd7c32ea2..d668011dafd4 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c | |||
@@ -87,7 +87,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = { | |||
87 | 87 | ||
88 | DRM_IOCTL_DEF(DRM_IOCTL_ADD_CTX, drm_addctx, DRM_AUTH|DRM_ROOT_ONLY), | 88 | DRM_IOCTL_DEF(DRM_IOCTL_ADD_CTX, drm_addctx, DRM_AUTH|DRM_ROOT_ONLY), |
89 | DRM_IOCTL_DEF(DRM_IOCTL_RM_CTX, drm_rmctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), | 89 | DRM_IOCTL_DEF(DRM_IOCTL_RM_CTX, drm_rmctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), |
90 | DRM_IOCTL_DEF(DRM_IOCTL_MOD_CTX, drm_modctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), | 90 | DRM_IOCTL_DEF(DRM_IOCTL_MOD_CTX, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), |
91 | DRM_IOCTL_DEF(DRM_IOCTL_GET_CTX, drm_getctx, DRM_AUTH), | 91 | DRM_IOCTL_DEF(DRM_IOCTL_GET_CTX, drm_getctx, DRM_AUTH), |
92 | DRM_IOCTL_DEF(DRM_IOCTL_SWITCH_CTX, drm_switchctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), | 92 | DRM_IOCTL_DEF(DRM_IOCTL_SWITCH_CTX, drm_switchctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), |
93 | DRM_IOCTL_DEF(DRM_IOCTL_NEW_CTX, drm_newctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), | 93 | DRM_IOCTL_DEF(DRM_IOCTL_NEW_CTX, drm_newctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), |
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 12083dc862a9..523e5f2e3218 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -1335,8 +1335,6 @@ extern int drm_resctx(struct drm_device *dev, void *data, | |||
1335 | struct drm_file *file_priv); | 1335 | struct drm_file *file_priv); |
1336 | extern int drm_addctx(struct drm_device *dev, void *data, | 1336 | extern int drm_addctx(struct drm_device *dev, void *data, |
1337 | struct drm_file *file_priv); | 1337 | struct drm_file *file_priv); |
1338 | extern int drm_modctx(struct drm_device *dev, void *data, | ||
1339 | struct drm_file *file_priv); | ||
1340 | extern int drm_getctx(struct drm_device *dev, void *data, | 1338 | extern int drm_getctx(struct drm_device *dev, void *data, |
1341 | struct drm_file *file_priv); | 1339 | struct drm_file *file_priv); |
1342 | extern int drm_switchctx(struct drm_device *dev, void *data, | 1340 | extern int drm_switchctx(struct drm_device *dev, void *data, |