Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/shmem: drop DEFINE_DRM_GEM_SHMEM_FOPS

DEFINE_DRM_GEM_SHMEM_FOPS is identical
to DEFINE_DRM_GEM_FOPS now, drop it.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20191016115203.20095-6-kraxel@redhat.com

+5 -31
+1 -1
drivers/gpu/drm/cirrus/cirrus.c
··· 510 510 511 511 /* ------------------------------------------------------------------ */ 512 512 513 - DEFINE_DRM_GEM_SHMEM_FOPS(cirrus_fops); 513 + DEFINE_DRM_GEM_FOPS(cirrus_fops); 514 514 515 515 static struct drm_driver cirrus_driver = { 516 516 .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
+1 -1
drivers/gpu/drm/panfrost/panfrost_drv.c
··· 470 470 PANFROST_IOCTL(MADVISE, madvise, DRM_RENDER_ALLOW), 471 471 }; 472 472 473 - DEFINE_DRM_GEM_SHMEM_FOPS(panfrost_drm_driver_fops); 473 + DEFINE_DRM_GEM_FOPS(panfrost_drm_driver_fops); 474 474 475 475 /* 476 476 * Panfrost driver version:
+1 -1
drivers/gpu/drm/tiny/gm12u320.c
··· 649 649 kfree(gm12u320); 650 650 } 651 651 652 - DEFINE_DRM_GEM_SHMEM_FOPS(gm12u320_fops); 652 + DEFINE_DRM_GEM_FOPS(gm12u320_fops); 653 653 654 654 static struct drm_driver gm12u320_drm_driver = { 655 655 .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
+1 -1
drivers/gpu/drm/v3d/v3d_drv.c
··· 172 172 kfree(v3d_priv); 173 173 } 174 174 175 - DEFINE_DRM_GEM_SHMEM_FOPS(v3d_drm_fops); 175 + DEFINE_DRM_GEM_FOPS(v3d_drm_fops); 176 176 177 177 /* DRM_AUTH is required on SUBMIT_CL for now, while we don't have GMP 178 178 * protection between clients. Note that render nodes would be be
+1 -1
drivers/gpu/drm/virtio/virtgpu_drv.c
··· 184 184 MODULE_AUTHOR("Gerd Hoffmann <kraxel@redhat.com>"); 185 185 MODULE_AUTHOR("Alon Levy"); 186 186 187 - DEFINE_DRM_GEM_SHMEM_FOPS(virtio_gpu_driver_fops); 187 + DEFINE_DRM_GEM_FOPS(virtio_gpu_driver_fops); 188 188 189 189 static struct drm_driver driver = { 190 190 .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_RENDER | DRIVER_ATOMIC,
-26
include/drm/drm_gem_shmem_helper.h
··· 88 88 #define to_drm_gem_shmem_obj(obj) \ 89 89 container_of(obj, struct drm_gem_shmem_object, base) 90 90 91 - /** 92 - * DEFINE_DRM_GEM_SHMEM_FOPS() - Macro to generate file operations for shmem drivers 93 - * @name: name for the generated structure 94 - * 95 - * This macro autogenerates a suitable &struct file_operations for shmem based 96 - * drivers, which can be assigned to &drm_driver.fops. Note that this structure 97 - * cannot be shared between drivers, because it contains a reference to the 98 - * current module using THIS_MODULE. 99 - * 100 - * Note that the declaration is already marked as static - if you need a 101 - * non-static version of this you're probably doing it wrong and will break the 102 - * THIS_MODULE reference by accident. 103 - */ 104 - #define DEFINE_DRM_GEM_SHMEM_FOPS(name) \ 105 - static const struct file_operations name = {\ 106 - .owner = THIS_MODULE,\ 107 - .open = drm_open,\ 108 - .release = drm_release,\ 109 - .unlocked_ioctl = drm_ioctl,\ 110 - .compat_ioctl = drm_compat_ioctl,\ 111 - .poll = drm_poll,\ 112 - .read = drm_read,\ 113 - .llseek = noop_llseek,\ 114 - .mmap = drm_gem_mmap, \ 115 - } 116 - 117 91 struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t size); 118 92 void drm_gem_shmem_free_object(struct drm_gem_object *obj); 119 93