subject:"\[Intel\-gfx\] \[PATCH 1\/3\] drm\: Remove DRM_ARRAY_SIZE\(\) for ARRAY

[Intel-gfx] [PATCH 1/3] drm: Remove DRM_ARRAY_SIZE() for ARRAY_SIZE()

2014-06-09 Thread Damien Lespiau

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: Damien Lespiau damien.lesp...@intel.com
---
 drivers/gpu/drm/armada/armada_drv.c | 2 +-
 drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +-
 drivers/gpu/drm/gma500/psb_drv.c| 2 +-
 drivers/gpu/drm/i810/i810_dma.c | 2 +-
 drivers/gpu/drm/i915/i915_dma.c | 2 +-
 drivers/gpu/drm/i915/i915_ioc32.c   | 2 +-
 drivers/gpu/drm/mga/mga_ioc32.c | 2 +-
 drivers/gpu/drm/mga/mga_state.c | 2 +-
 drivers/gpu/drm/nouveau/nouveau_ioc32.c | 2 +-
 drivers/gpu/drm/qxl/qxl_ioctl.c | 2 +-
 drivers/gpu/drm/r128/r128_ioc32.c   | 2 +-
 drivers/gpu/drm/r128/r128_state.c   | 2 +-
 drivers/gpu/drm/radeon/radeon_ioc32.c   | 2 +-
 drivers/gpu/drm/radeon/radeon_kms.c | 2 +-
 drivers/gpu/drm/radeon/radeon_state.c   | 2 +-
 drivers/gpu/drm/savage/savage_bci.c | 2 +-
 drivers/gpu/drm/sis/sis_mm.c| 2 +-
 drivers/gpu/drm/via/via_dma.c   | 2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +-
 include/drm/drmP.h  | 2 --
 20 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/drivers/gpu/drm/armada/armada_drv.c 
b/drivers/gpu/drm/armada/armada_drv.c
index 567cfbd..8ab3cd1 100644
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -402,7 +402,7 @@ static struct platform_driver armada_drm_platform_driver = {
 
 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);
 }
 module_init(armada_drm_init);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c 
b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index 87461d4..ddb5003 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -569,7 +569,7 @@ static int exynos_drm_platform_probe(struct platform_device 
*pdev)
int ret;
 
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
ret = platform_driver_register(fimd_driver);
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index 59ea45e..6e8fe9e 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -477,7 +477,7 @@ static struct drm_driver driver = {
.lastclose = psb_driver_lastclose,
.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,
.irq_preinstall = psb_irq_preinstall,
.irq_postinstall = psb_irq_postinstall,
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index aeace37..e88bac1 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -1251,7 +1251,7 @@ const struct drm_ioctl_desc i810_ioctls[] = {
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.
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 93c0e1a..7c63b18 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -2025,7 +2025,7 @@ const struct drm_ioctl_desc i915_ioctls[] = {
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
diff --git a/drivers/gpu/drm/i915/i915_ioc32.c 
b/drivers/gpu/drm/i915/i915_ioc32.c
index 3c59584..2e0613e 100644
--- a/drivers/gpu/drm/i915/i915_ioc32.c
+++ b/drivers/gpu/drm/i915/i915_ioc32.c
@@ -208,7 +208,7 @@ long i915_compat_ioctl(struct file *filp, unsigned int cmd, 
unsigned long arg)
if (nr  DRM_COMMAND_BASE)
return drm_compat_ioctl(filp, cmd, arg);
 
-   if (nr  DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls))
+   if (nr  DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
 
if (fn != NULL)
diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
index 86b4bb8..729bfd5 100644
--- a/drivers/gpu/drm/mga/mga_ioc32.c
+++ b/drivers/gpu/drm/mga/mga_ioc32.c
@@ -214,7 +214,7 @@ long mga_compat_ioctl(struct file *filp, unsigned int cmd, 
unsigned long arg)
if (nr  DRM_COMMAND_BASE)

Re: [Intel-gfx] [PATCH 1/3] drm: Remove DRM_ARRAY_SIZE() for ARRAY_SIZE()

2014-06-09 Thread Alex Deucher

On Mon, Jun 9, 2014 at 9:39 AM, Damien Lespiau damien.lesp...@intel.com wrote:
 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: Damien Lespiau damien.lesp...@intel.com

Reviewed-by: Alex Deucher alexander.deuc...@amd.com

 ---
  drivers/gpu/drm/armada/armada_drv.c | 2 +-
  drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +-
  drivers/gpu/drm/gma500/psb_drv.c| 2 +-
  drivers/gpu/drm/i810/i810_dma.c | 2 +-
  drivers/gpu/drm/i915/i915_dma.c | 2 +-
  drivers/gpu/drm/i915/i915_ioc32.c   | 2 +-
  drivers/gpu/drm/mga/mga_ioc32.c | 2 +-
  drivers/gpu/drm/mga/mga_state.c | 2 +-
  drivers/gpu/drm/nouveau/nouveau_ioc32.c | 2 +-
  drivers/gpu/drm/qxl/qxl_ioctl.c | 2 +-
  drivers/gpu/drm/r128/r128_ioc32.c   | 2 +-
  drivers/gpu/drm/r128/r128_state.c   | 2 +-
  drivers/gpu/drm/radeon/radeon_ioc32.c   | 2 +-
  drivers/gpu/drm/radeon/radeon_kms.c | 2 +-
  drivers/gpu/drm/radeon/radeon_state.c   | 2 +-
  drivers/gpu/drm/savage/savage_bci.c | 2 +-
  drivers/gpu/drm/sis/sis_mm.c| 2 +-
  drivers/gpu/drm/via/via_dma.c   | 2 +-
  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +-
  include/drm/drmP.h  | 2 --
  20 files changed, 19 insertions(+), 21 deletions(-)

 diff --git a/drivers/gpu/drm/armada/armada_drv.c 
 b/drivers/gpu/drm/armada/armada_drv.c
 index 567cfbd..8ab3cd1 100644
 --- a/drivers/gpu/drm/armada/armada_drv.c
 +++ b/drivers/gpu/drm/armada/armada_drv.c
 @@ -402,7 +402,7 @@ static struct platform_driver armada_drm_platform_driver 
 = {

  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);
  }
  module_init(armada_drm_init);
 diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c 
 b/drivers/gpu/drm/exynos/exynos_drm_drv.c
 index 87461d4..ddb5003 100644
 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
 +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
 @@ -569,7 +569,7 @@ static int exynos_drm_platform_probe(struct 
 platform_device *pdev)
 int ret;

 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
 ret = platform_driver_register(fimd_driver);
 diff --git a/drivers/gpu/drm/gma500/psb_drv.c 
 b/drivers/gpu/drm/gma500/psb_drv.c
 index 59ea45e..6e8fe9e 100644
 --- a/drivers/gpu/drm/gma500/psb_drv.c
 +++ b/drivers/gpu/drm/gma500/psb_drv.c
 @@ -477,7 +477,7 @@ static struct drm_driver driver = {
 .lastclose = psb_driver_lastclose,
 .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,
 .irq_preinstall = psb_irq_preinstall,
 .irq_postinstall = psb_irq_postinstall,
 diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
 index aeace37..e88bac1 100644
 --- a/drivers/gpu/drm/i810/i810_dma.c
 +++ b/drivers/gpu/drm/i810/i810_dma.c
 @@ -1251,7 +1251,7 @@ const struct drm_ioctl_desc i810_ioctls[] = {
 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.
 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
 index 93c0e1a..7c63b18 100644
 --- a/drivers/gpu/drm/i915/i915_dma.c
 +++ b/drivers/gpu/drm/i915/i915_dma.c
 @@ -2025,7 +2025,7 @@ const struct drm_ioctl_desc i915_ioctls[] = {
 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
 diff --git a/drivers/gpu/drm/i915/i915_ioc32.c 
 b/drivers/gpu/drm/i915/i915_ioc32.c
 index 3c59584..2e0613e 100644
 --- a/drivers/gpu/drm/i915/i915_ioc32.c
 +++ b/drivers/gpu/drm/i915/i915_ioc32.c
 @@ -208,7 +208,7 @@ long i915_compat_ioctl(struct file *filp, unsigned int 
 cmd, unsigned long arg)
 if (nr  DRM_COMMAND_BASE)
 return drm_compat_ioctl(filp, cmd, arg);

 -   if (nr  DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls))
 +   if (nr  DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
 fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];

 if (fn != NULL)
 diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
 index

[Intel-gfx] [PATCH 1/3] drm: Remove DRM_ARRAY_SIZE() for ARRAY_SIZE()

Re: [Intel-gfx] [PATCH 1/3] drm: Remove DRM_ARRAY_SIZE() for ARRAY_SIZE()

2 matches

Site Navigation

Mail list logo

Footer information