kill the stupid DRM_IRQ_ARGS macros and irqreturn_t typedef, switch to

the unmacroed/typedefed version.

6 files changed, 15 insertions, 17 deletions

diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h
index 23e35da1507..bc69e03f98f 100644
--- a/sys/dev/pci/drm/drmP.h
+++ b/sys/dev/pci/drm/drmP.h
@@ -90,8 +90,6 @@
 /* Deal with netbsd code where only the print statements differ */
 #define printk printf
 
-#define DRM_IRQ_ARGS		void *arg
-typedef int			irqreturn_t;
 #define IRQ_HANDLED		1
 #define IRQ_NONE		0
 
diff --git a/sys/dev/pci/drm/i915_irq.c b/sys/dev/pci/drm/i915_irq.c
index a9bd03b4b86..ca41653f79d 100644
--- a/sys/dev/pci/drm/i915_irq.c
+++ b/sys/dev/pci/drm/i915_irq.c
@@ -31,7 +31,7 @@
 #include "i915_drm.h"
 #include "i915_drv.h"
 
-irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS);
+int	i915_driver_irq_handler(void *);
 void	i915_enable_irq(drm_i915_private_t *, u_int32_t);
 void	i915_disable_irq(drm_i915_private_t *, u_int32_t);
 void	i915_enable_pipestat(drm_i915_private_t *, int, u_int32_t);
@@ -195,8 +195,8 @@ i915_get_vblank_counter(struct drm_device *dev, int plane)
 	return ((high1 << 8) | low);
 }
 
-irqreturn_t
-i915_driver_irq_handler(DRM_IRQ_ARGS)
+int
+i915_driver_irq_handler(void *arg)
 {
 	struct drm_device *dev = (struct drm_device *)arg;
 	drm_i915_private_t *dev_priv = (drm_i915_private_t *)dev->dev_private;
diff --git a/sys/dev/pci/drm/mach64_irq.c b/sys/dev/pci/drm/mach64_irq.c
index 1759b2e8aef..909b9dbe78f 100644
--- a/sys/dev/pci/drm/mach64_irq.c
+++ b/sys/dev/pci/drm/mach64_irq.c
@@ -40,10 +40,10 @@
 #include "mach64_drm.h"
 #include "mach64_drv.h"
 
-irqreturn_t mach64_driver_irq_handler(DRM_IRQ_ARGS);
+int	mach64_driver_irq_handler(void *);
 
-irqreturn_t
-mach64_driver_irq_handler(DRM_IRQ_ARGS)
+int
+mach64_driver_irq_handler(void *arg)
 {
 	struct drm_device	*dev = arg;
 	drm_mach64_private_t	*dev_priv = dev->dev_private;
diff --git a/sys/dev/pci/drm/mga_irq.c b/sys/dev/pci/drm/mga_irq.c
index c0526e3c54a..cb9e35fc57a 100644
--- a/sys/dev/pci/drm/mga_irq.c
+++ b/sys/dev/pci/drm/mga_irq.c
@@ -36,7 +36,7 @@
 #include "mga_drm.h"
 #include "mga_drv.h"
 
-irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS);
+int	mga_driver_irq_handler(void *);
 
 u_int32_t
 mga_get_vblank_counter(struct drm_device *dev, int crtc)
@@ -51,8 +51,8 @@ mga_get_vblank_counter(struct drm_device *dev, int crtc)
 }
 
 
-irqreturn_t
-mga_driver_irq_handler(DRM_IRQ_ARGS)
+int
+mga_driver_irq_handler(void *arg)
 {
 	struct drm_device	*dev =  arg;
 	drm_mga_private_t	*dev_priv = dev->dev_private;
diff --git a/sys/dev/pci/drm/r128_irq.c b/sys/dev/pci/drm/r128_irq.c
index c7126524dec..f72e887df3a 100644
--- a/sys/dev/pci/drm/r128_irq.c
+++ b/sys/dev/pci/drm/r128_irq.c
@@ -35,7 +35,7 @@
 #include "r128_drm.h"
 #include "r128_drv.h"
 
-irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS);
+int	r128_driver_irq_handler(void *);
 
 u_int32_t
 r128_get_vblank_counter(struct drm_device *dev, int crtc)
@@ -48,8 +48,8 @@ r128_get_vblank_counter(struct drm_device *dev, int crtc)
 	return (atomic_read(&dev_priv->vbl_received));
 }
 
-irqreturn_t
-r128_driver_irq_handler(DRM_IRQ_ARGS)
+int
+r128_driver_irq_handler(void *arg)
 {
 	struct drm_device	*dev = (struct drm_device *) arg;
 	drm_r128_private_t	*dev_priv = dev->dev_private;
diff --git a/sys/dev/pci/drm/radeon_irq.c b/sys/dev/pci/drm/radeon_irq.c
index 962ef17c707..93214692140 100644
--- a/sys/dev/pci/drm/radeon_irq.c
+++ b/sys/dev/pci/drm/radeon_irq.c
@@ -35,7 +35,7 @@
 #include "radeon_drm.h"
 #include "radeon_drv.h"
 
-irqreturn_t	radeon_driver_irq_handler(DRM_IRQ_ARGS);
+int		radeon_driver_irq_handler(void *);
 void		r500_vbl_irq_set_state(struct drm_device *, u_int32_t, int);
 u_int32_t	radeon_acknowledge_irqs(drm_radeon_private_t *, u_int32_t *);
 int		radeon_emit_irq(struct drm_device *);
@@ -189,8 +189,8 @@ radeon_acknowledge_irqs(drm_radeon_private_t *dev_priv, u32 *r500_disp_int)
  * tied to dma at all, this is just a hangover from dri prehistory.
  */
 
-irqreturn_t
-radeon_driver_irq_handler(DRM_IRQ_ARGS)
+int
+radeon_driver_irq_handler(void *arg)
 {
 	struct drm_device	*dev = arg;
 	drm_radeon_private_t	*dev_priv = dev->dev_private;