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

Commit f95aeb17 authored by Damien Lespiau's avatar Damien Lespiau Committed by Dave Airlie
Browse files

drm: Remove DRM_ARRAY_SIZE() for ARRAY_SIZE() 



I cannot see a need to provide a DRM_ version of ARRAY_SIZE(), only used
in a few places. I suspect its usage has been spread by copy & paste
rather than anything else.

Let's just remove it for plain ARRAY_SIZE().

Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 10d9b4ed

drivers/gpu/drm/armada/armada_drv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -402,7 +402,7 @@ static struct platform_driver armada_drm_platform_driver = { 




static int __init armada_drm_init(void)

static int __init armada_drm_init(void)

{

{

	armada_drm_driver.num_ioctls = DRM_ARRAY_SIZE(armada_ioctls);

	armada_drm_driver.num_ioctls = ARRAY_SIZE(armada_ioctls);

	return platform_driver_register(&armada_drm_platform_driver);

	return platform_driver_register(&armada_drm_platform_driver);

}

}

module_init(armada_drm_init);

module_init(armada_drm_init);

drivers/gpu/drm/exynos/exynos_drm_drv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -573,7 +573,7 @@ static int exynos_drm_platform_probe(struct platform_device *pdev) 
	int ret;

	int ret;





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

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

	exynos_drm_driver.num_ioctls = DRM_ARRAY_SIZE(exynos_ioctls);

	exynos_drm_driver.num_ioctls = ARRAY_SIZE(exynos_ioctls);





#ifdef CONFIG_DRM_EXYNOS_FIMD

#ifdef CONFIG_DRM_EXYNOS_FIMD

	ret = platform_driver_register(&fimd_driver);

	ret = platform_driver_register(&fimd_driver);

drivers/gpu/drm/gma500/psb_drv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -477,7 +477,7 @@ static struct drm_driver driver = { 
	.lastclose = psb_driver_lastclose,

	.lastclose = psb_driver_lastclose,

	.preclose = psb_driver_preclose,

	.preclose = psb_driver_preclose,





	.num_ioctls = DRM_ARRAY_SIZE(psb_ioctls),

	.num_ioctls = ARRAY_SIZE(psb_ioctls),

	.device_is_agp = psb_driver_device_is_agp,

	.device_is_agp = psb_driver_device_is_agp,

	.irq_preinstall = psb_irq_preinstall,

	.irq_preinstall = psb_irq_preinstall,

	.irq_postinstall = psb_irq_postinstall,

	.irq_postinstall = psb_irq_postinstall,

drivers/gpu/drm/i810/i810_dma.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1251,7 +1251,7 @@ const struct drm_ioctl_desc i810_ioctls[] = { 
	DRM_IOCTL_DEF_DRV(I810_FLIP, i810_flip_bufs, DRM_AUTH|DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(I810_FLIP, i810_flip_bufs, DRM_AUTH|DRM_UNLOCKED),

};

};





int i810_max_ioctl = DRM_ARRAY_SIZE(i810_ioctls);

int i810_max_ioctl = ARRAY_SIZE(i810_ioctls);





/**

/**

 * Determine if the device really is AGP or not.

 * Determine if the device really is AGP or not.

drivers/gpu/drm/i915/i915_dma.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1986,7 +1986,7 @@ const struct drm_ioctl_desc i915_ioctls[] = { 
	DRM_IOCTL_DEF_DRV(I915_GEM_USERPTR, i915_gem_userptr_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GEM_USERPTR, i915_gem_userptr_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),

};

};





int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);

int i915_max_ioctl = ARRAY_SIZE(i915_ioctls);





/*

/*

 * This is really ugly: Because old userspace abused the linux agp interface to

 * This is really ugly: Because old userspace abused the linux agp interface to