drm: Drop ioctl->cmd_drv

ioctl->cmd_drv is pointless and we can just as well stick the full ioctl
definition into ioctl->cmd.

Cc: Jakob Bornecrantz <jakob@vmware.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index a6d773a61c2d2527dd6a8262435f4e8e6b3339cb..fc0cf4a840119bfba7e96a443d823e93f2f197dd 100644 (file)
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -525,7 +525,7 @@ static int drm_ioctl_permit(u32 flags, struct drm_file *file_priv)
 }
 
 #define DRM_IOCTL_DEF(ioctl, _func, _flags) \
 }
 
 #define DRM_IOCTL_DEF(ioctl, _func, _flags) \

-       [DRM_IOCTL_NR(ioctl)] = {.cmd = ioctl, .func = _func, .flags = _flags, .cmd_drv = 0, .name = #ioctl}
+       [DRM_IOCTL_NR(ioctl)] = {.cmd = ioctl, .func = _func, .flags = _flags, .name = #ioctl}

 
 /** Ioctl table */
 static const struct drm_ioctl_desc drm_ioctls[] = {
 
 /** Ioctl table */
 static const struct drm_ioctl_desc drm_ioctls[] = {


@@ -677,11 +677,11 @@ long drm_ioctl(struct file *filp,
            (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls)) {
                u32 drv_size;
                ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE];
            (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls)) {
                u32 drv_size;
                ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE];

-               drv_size = _IOC_SIZE(ioctl->cmd_drv);
+               drv_size = _IOC_SIZE(ioctl->cmd);

                usize = asize = _IOC_SIZE(cmd);
                if (drv_size > asize)
                        asize = drv_size;
                usize = asize = _IOC_SIZE(cmd);
                if (drv_size > asize)
                        asize = drv_size;

-               cmd = ioctl->cmd_drv;
+               cmd = ioctl->cmd;

        }
        else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE)) {
                u32 drv_size;
        }
        else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE)) {
                u32 drv_size;

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 6c6b655defcf4eac679913e70896810208dfd6ce..761b2a767ce02a1fb82275f6b199bb9638802487 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -134,7 +134,7 @@
  */
 
 #define VMW_IOCTL_DEF(ioctl, func, flags) \
  */
 
 #define VMW_IOCTL_DEF(ioctl, func, flags) \

-  [DRM_IOCTL_NR(DRM_IOCTL_##ioctl) - DRM_COMMAND_BASE] = {DRM_##ioctl, flags, func, DRM_IOCTL_##ioctl}
+  [DRM_IOCTL_NR(DRM_IOCTL_##ioctl) - DRM_COMMAND_BASE] = {DRM_IOCTL_##ioctl, flags, func}

 
 /**
  * Ioctl definitions.
 
 /**
  * Ioctl definitions.


@@ -1041,7 +1041,7 @@ static long vmw_generic_ioctl(struct file *filp, unsigned int cmd,
                const struct drm_ioctl_desc *ioctl =
                        &vmw_ioctls[nr - DRM_COMMAND_BASE];
 
                const struct drm_ioctl_desc *ioctl =
                        &vmw_ioctls[nr - DRM_COMMAND_BASE];
 

-               if (unlikely(ioctl->cmd_drv != cmd)) {
+               if (unlikely(ioctl->cmd != cmd)) {

                        DRM_ERROR("Invalid command format, ioctl %d\n",
                                  nr - DRM_COMMAND_BASE);
                        return -EINVAL;
                        DRM_ERROR("Invalid command format, ioctl %d\n",
                                  nr - DRM_COMMAND_BASE);
                        return -EINVAL;

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 6195ee9b4c2aa8e07ac3ca1a8caa20fa66df075f..0d501ed207759cdadb2679b75122f35c5dcb1874 100644 (file)
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -253,7 +253,6 @@ struct drm_ioctl_desc {
        unsigned int cmd;
        int flags;
        drm_ioctl_t *func;
        unsigned int cmd;
        int flags;
        drm_ioctl_t *func;

-       unsigned int cmd_drv;

        const char *name;
 };
 
        const char *name;
 };
 


@@ -263,7 +262,7 @@ struct drm_ioctl_desc {
  */
 
 #define DRM_IOCTL_DEF_DRV(ioctl, _func, _flags)                        \
  */
 
 #define DRM_IOCTL_DEF_DRV(ioctl, _func, _flags)                        \

-       [DRM_IOCTL_NR(DRM_IOCTL_##ioctl) - DRM_COMMAND_BASE] = {.cmd = DRM_##ioctl, .func = _func, .flags = _flags, .cmd_drv = DRM_IOCTL_##ioctl, .name = #ioctl}
+       [DRM_IOCTL_NR(DRM_IOCTL_##ioctl) - DRM_COMMAND_BASE] = {.cmd = DRM_IOCTL_##ioctl, .func = _func, .flags = _flags, .name = #ioctl}

 
 /* Event queued up for userspace to read */
 struct drm_pending_event {
 
 /* Event queued up for userspace to read */
 struct drm_pending_event {