Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baa70943 authored by Rob Clark's avatar Rob Clark Committed by Dave Airlie
Browse files

drm: const'ify ioctls table (v2) 



Because, there is no reason for it not to be const.

v1: original
v2: fix compile break in vmwgfx, and couple related cleanups suggested
    by Ville Syrjälä

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 31e5d7c6

drivers/gpu/drm/exynos/exynos_drm_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static const struct vm_operations_struct exynos_drm_gem_vm_ops = { 
	.close = drm_gem_vm_close,

};



static struct drm_ioctl_desc exynos_ioctls[] = {

static const struct drm_ioctl_desc exynos_ioctls[] = {

	DRM_IOCTL_DEF_DRV(EXYNOS_GEM_CREATE, exynos_drm_gem_create_ioctl,

			DRM_UNLOCKED | DRM_AUTH),

	DRM_IOCTL_DEF_DRV(EXYNOS_GEM_MAP_OFFSET,
@@ -277,6 +277,7 @@ static struct drm_driver exynos_drm_driver = { 
	.gem_prime_export	= exynos_dmabuf_prime_export,

	.gem_prime_import	= exynos_dmabuf_prime_import,

	.ioctls			= exynos_ioctls,

	.num_ioctls		= ARRAY_SIZE(exynos_ioctls),

	.fops			= &exynos_drm_driver_fops,

	.name	= DRIVER_NAME,

	.desc	= DRIVER_DESC,
@@ -288,7 +289,6 @@ static struct drm_driver exynos_drm_driver = { 
static int exynos_drm_platform_probe(struct platform_device *pdev)

{

	pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);

	exynos_drm_driver.num_ioctls = DRM_ARRAY_SIZE(exynos_ioctls);



	return drm_platform_init(&exynos_drm_driver, pdev);

}

drivers/gpu/drm/gma500/psb_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static int psb_gamma_ioctl(struct drm_device *dev, void *data, 
static int psb_dpst_bl_ioctl(struct drm_device *dev, void *data,

			     struct drm_file *file_priv);



static struct drm_ioctl_desc psb_ioctls[] = {

static const struct drm_ioctl_desc psb_ioctls[] = {

	DRM_IOCTL_DEF_DRV(GMA_ADB, psb_adb_ioctl, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(GMA_MODE_OPERATION, psb_mode_operation_ioctl,

		      DRM_AUTH),

drivers/gpu/drm/i810/i810_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -1241,7 +1241,7 @@ int i810_driver_dma_quiescent(struct drm_device *dev) 
	return 0;

}



struct drm_ioctl_desc i810_ioctls[] = {

const struct drm_ioctl_desc i810_ioctls[] = {

	DRM_IOCTL_DEF_DRV(I810_INIT, i810_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(I810_VERTEX, i810_dma_vertex, DRM_AUTH|DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(I810_CLEAR, i810_clear_bufs, DRM_AUTH|DRM_UNLOCKED),

drivers/gpu/drm/i810/i810_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ extern void i810_driver_preclose(struct drm_device *dev, 
extern int i810_driver_device_is_agp(struct drm_device *dev);



extern long i810_ioctl(struct file *file, unsigned int cmd, unsigned long arg);

extern struct drm_ioctl_desc i810_ioctls[];

extern const struct drm_ioctl_desc i810_ioctls[];

extern int i810_max_ioctl;



#define I810_BASE(reg)		((unsigned long) \

drivers/gpu/drm/i915/i915_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -1834,7 +1834,7 @@ void i915_driver_postclose(struct drm_device *dev, struct drm_file *file) 
	kfree(file_priv);

}



struct drm_ioctl_desc i915_ioctls[] = {

const struct drm_ioctl_desc i915_ioctls[] = {

	DRM_IOCTL_DEF_DRV(I915_INIT, i915_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_FLUSH, i915_flush_ioctl, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_FLIP, i915_flip_bufs, DRM_AUTH),