Remove _args from gem ioctl argument structure tags.

diff --git a/linux-core/drm_gem.c b/linux-core/drm_gem.c
index 09c0fe8..7326d6b 100644 (file)
--- a/linux-core/drm_gem.c
+++ b/linux-core/drm_gem.c
@@ -157,7 +157,7 @@ int
 drm_gem_alloc_ioctl(struct drm_device *dev, void *data,
                    struct drm_file *file_priv)
 {
 drm_gem_alloc_ioctl(struct drm_device *dev, void *data,
                    struct drm_file *file_priv)
 {

-       struct drm_gem_alloc_args *args = data;
+       struct drm_gem_alloc *args = data;

        struct drm_gem_object *obj;
        int handle, ret;
 
        struct drm_gem_object *obj;
        int handle, ret;
 


@@ -202,7 +202,7 @@ int
 drm_gem_unreference_ioctl(struct drm_device *dev, void *data,
                          struct drm_file *file_priv)
 {
 drm_gem_unreference_ioctl(struct drm_device *dev, void *data,
                          struct drm_file *file_priv)
 {

-       struct drm_gem_unreference_args *args = data;
+       struct drm_gem_unreference *args = data;

        int ret;
 
        ret = drm_gem_handle_delete(dev, file_priv, args->handle);
        int ret;
 
        ret = drm_gem_handle_delete(dev, file_priv, args->handle);


@@ -219,7 +219,7 @@ int
 drm_gem_pread_ioctl(struct drm_device *dev, void *data,
                    struct drm_file *file_priv)
 {
 drm_gem_pread_ioctl(struct drm_device *dev, void *data,
                    struct drm_file *file_priv)
 {

-       struct drm_gem_pread_args *args = data;
+       struct drm_gem_pread *args = data;

        struct drm_gem_object *obj;
        ssize_t read;
        loff_t offset;
        struct drm_gem_object *obj;
        ssize_t read;
        loff_t offset;


@@ -256,7 +256,7 @@ int
 drm_gem_mmap_ioctl(struct drm_device *dev, void *data,
                   struct drm_file *file_priv)
 {
 drm_gem_mmap_ioctl(struct drm_device *dev, void *data,
                   struct drm_file *file_priv)
 {

-       struct drm_gem_mmap_args *args = data;
+       struct drm_gem_mmap *args = data;

        struct drm_gem_object *obj;
        loff_t offset;
 
        struct drm_gem_object *obj;
        loff_t offset;
 


@@ -286,7 +286,7 @@ int
 drm_gem_pwrite_ioctl(struct drm_device *dev, void *data,
                     struct drm_file *file_priv)
 {
 drm_gem_pwrite_ioctl(struct drm_device *dev, void *data,
                     struct drm_file *file_priv)
 {

-       struct drm_gem_pwrite_args *args = data;
+       struct drm_gem_pwrite *args = data;

        struct drm_gem_object *obj;
        ssize_t written;
        loff_t offset;
        struct drm_gem_object *obj;
        ssize_t written;
        loff_t offset;

diff --git a/linux-core/i915_gem.c b/linux-core/i915_gem.c
index fc9e53c..09c94c3 100644 (file)
--- a/linux-core/i915_gem.c
+++ b/linux-core/i915_gem.c
@@ -329,8 +329,8 @@ err:
 }
 
 int
 }
 
 int

-i915_gem_pin(struct drm_device *dev, void *data,
-                   struct drm_file *file_priv)
+i915_gem_pin_ioctl(struct drm_device *dev, void *data,
+                  struct drm_file *file_priv)

 {
        struct drm_i915_gem_pin *args = data;
        struct drm_gem_object *obj;
 {
        struct drm_i915_gem_pin *args = data;
        struct drm_gem_object *obj;


@@ -353,8 +353,8 @@ i915_gem_pin(struct drm_device *dev, void *data,
 }
 
 int
 }
 
 int

-i915_gem_unpin(struct drm_device *dev, void *data,
-                   struct drm_file *file_priv)
+i915_gem_unpin_ioctl(struct drm_device *dev, void *data,
+                    struct drm_file *file_priv)

 {
        struct drm_i915_gem_pin *args = data;
        struct drm_gem_object *obj;
 {
        struct drm_i915_gem_pin *args = data;
        struct drm_gem_object *obj;

diff --git a/shared-core/drm.h b/shared-core/drm.h
index d79fa5f..6d62af6 100644 (file)
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -961,7 +961,7 @@ struct drm_mm_info_arg {
 };
 
 
 };
 
 

-struct drm_gem_alloc_args {
+struct drm_gem_alloc {

        /**
         * Requested size for the object.
         *
        /**
         * Requested size for the object.
         *


@@ -972,12 +972,12 @@ struct drm_gem_alloc_args {
        uint32_t handle;
 };
 
        uint32_t handle;
 };
 

-struct drm_gem_unreference_args {
+struct drm_gem_unreference {

        /** Handle of the object to be unreferenced. */
        uint32_t handle;
 };
 
        /** Handle of the object to be unreferenced. */
        uint32_t handle;
 };
 

-struct drm_gem_link_args {
+struct drm_gem_link {

        /** Handle for the object being given a name. */
        uint32_t handle;
        /** Requested file name to export the object under. */
        /** Handle for the object being given a name. */
        uint32_t handle;
        /** Requested file name to export the object under. */


@@ -986,7 +986,7 @@ struct drm_gem_link_args {
        mode_t mode;
 };
 
        mode_t mode;
 };
 

-struct drm_gem_pread_args {
+struct drm_gem_pread {

        /** Handle for the object being read. */
        uint32_t handle;
        /** Offset into the object to read from */
        /** Handle for the object being read. */
        uint32_t handle;
        /** Offset into the object to read from */


@@ -997,7 +997,7 @@ struct drm_gem_pread_args {
        void *data;
 };
 
        void *data;
 };
 

-struct drm_gem_pwrite_args {
+struct drm_gem_pwrite {

        /** Handle for the object being written to. */
        uint32_t handle;
        /** Offset into the object to write to */
        /** Handle for the object being written to. */
        uint32_t handle;
        /** Offset into the object to write to */


@@ -1008,7 +1008,7 @@ struct drm_gem_pwrite_args {
        void *data;
 };
 
        void *data;
 };
 

-struct drm_gem_mmap_args {
+struct drm_gem_mmap {

        /** Handle for the object being mapped. */
        uint32_t handle;
        /** Offset in the object to map. */
        /** Handle for the object being mapped. */
        uint32_t handle;
        /** Offset in the object to map. */


@@ -1042,12 +1042,12 @@ struct drm_gem_mmap_args {
 #define DRM_IOCTL_GET_CLIENT            DRM_IOWR(0x05, struct drm_client)
 #define DRM_IOCTL_GET_STATS             DRM_IOR( 0x06, struct drm_stats)
 #define DRM_IOCTL_SET_VERSION          DRM_IOWR(0x07, struct drm_set_version)
 #define DRM_IOCTL_GET_CLIENT            DRM_IOWR(0x05, struct drm_client)
 #define DRM_IOCTL_GET_STATS             DRM_IOR( 0x06, struct drm_stats)
 #define DRM_IOCTL_SET_VERSION          DRM_IOWR(0x07, struct drm_set_version)

-#define DRM_IOCTL_MODESET_CTL           DRM_IOW(0x08, struct drm_modeset_ctl)
-#define DRM_IOCTL_GEM_ALLOC            DRM_IOWR(0x09, struct drm_gem_alloc_args)
-#define DRM_IOCTL_GEM_UNREFERENCE      DRM_IOW(0x0a, struct drm_gem_unreference_args)
-#define DRM_IOCTL_GEM_PREAD            DRM_IOW(0x0b, struct drm_gem_pread_args)
-#define DRM_IOCTL_GEM_PWRITE           DRM_IOW(0x0c, struct drm_gem_pwrite_args)
-#define DRM_IOCTL_GEM_MMAP             DRM_IOWR(0x0d, struct drm_gem_mmap_args)
+#define DRM_IOCTL_MODESET_CTL           DRM_IOW(0x08,  struct drm_modeset_ctl)
+#define DRM_IOCTL_GEM_ALLOC            DRM_IOWR(0x09, struct drm_gem_alloc)
+#define DRM_IOCTL_GEM_UNREFERENCE      DRM_IOW(0x0a,  struct drm_gem_unreference)
+#define DRM_IOCTL_GEM_PREAD            DRM_IOW(0x0b,  struct drm_gem_pread)
+#define DRM_IOCTL_GEM_PWRITE           DRM_IOW(0x0c,  struct drm_gem_pwrite)
+#define DRM_IOCTL_GEM_MMAP             DRM_IOWR(0x0d, struct drm_gem_mmap)

 
 #define DRM_IOCTL_SET_UNIQUE           DRM_IOW( 0x10, struct drm_unique)
 #define DRM_IOCTL_AUTH_MAGIC           DRM_IOW( 0x11, struct drm_auth)
 
 #define DRM_IOCTL_SET_UNIQUE           DRM_IOW( 0x10, struct drm_unique)
 #define DRM_IOCTL_AUTH_MAGIC           DRM_IOW( 0x11, struct drm_auth)