${XORGNAME}_driver_irq_handler() is a stupid name for an interrupt

handler anyway. replace it with ${OpenBSD_driver_name}_intr like most of
the rest of the tree. No functional change.

5 files changed, 15 insertions, 15 deletions

diff --git a/sys/dev/pci/drm/i915_irq.c b/sys/dev/pci/drm/i915_irq.c
index 335524acbd6..ddae0f78138 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"
 
-int	i915_driver_irq_handler(void *);
+int	inteldrm_intr(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);
@@ -196,7 +196,7 @@ i915_get_vblank_counter(struct drm_device *dev, int plane)
 }
 
 int
-i915_driver_irq_handler(void *arg)
+inteldrm_intr(void *arg)
 {
 	struct drm_device *dev = (struct drm_device *)arg;
 	drm_i915_private_t *dev_priv = (drm_i915_private_t *)dev->dev_private;
@@ -405,7 +405,7 @@ i915_driver_irq_install(struct drm_device *dev)
 	(void)I915_READ(IER);
 
 	dev_priv->irqh = pci_intr_establish(dev_priv->pc, dev_priv->ih, IPL_BIO,
-	    i915_driver_irq_handler, dev, dev_priv->dev.dv_xname);
+	    inteldrm_intr, dev, dev_priv->dev.dv_xname);
 	if (dev_priv->irqh == NULL)
 		return (ENOENT);
 
diff --git a/sys/dev/pci/drm/mach64_irq.c b/sys/dev/pci/drm/mach64_irq.c
index d705cab7cef..a2b9aa20b5f 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"
 
-int	mach64_driver_irq_handler(void *);
+int	machdrm_intr(void *);
 
 int
-mach64_driver_irq_handler(void *arg)
+machdrm_intr(void *arg)
 {
 	struct drm_device	*dev = arg;
 	drm_mach64_private_t	*dev_priv = dev->dev_private;
@@ -152,7 +152,7 @@ mach64_driver_irq_install(struct drm_device * dev)
 	mach64_disable_vblank_local(dev, 0);
 
 	dev_priv->irqh = pci_intr_establish(dev_priv->pc, dev_priv->ih, IPL_BIO,
-	    mach64_driver_irq_handler, dev, dev_priv->dev.dv_xname);
+	    machdrm_intr, dev, dev_priv->dev.dv_xname);
 	if (dev_priv->irqh == NULL)
 		return (ENOENT);
 	return (0);
diff --git a/sys/dev/pci/drm/mga_irq.c b/sys/dev/pci/drm/mga_irq.c
index 8ca4057a694..97efae586e7 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"
 
-int	mga_driver_irq_handler(void *);
+int	mgadrm_intr(void *);
 
 u_int32_t
 mga_get_vblank_counter(struct drm_device *dev, int crtc)
@@ -52,7 +52,7 @@ mga_get_vblank_counter(struct drm_device *dev, int crtc)
 
 
 int
-mga_driver_irq_handler(void *arg)
+mgadrm_intr(void *arg)
 {
 	struct drm_device	*dev =  arg;
 	drm_mga_private_t	*dev_priv = dev->dev_private;
@@ -156,7 +156,7 @@ mga_driver_irq_install(struct drm_device * dev)
 	MGA_WRITE(MGA_ICLEAR, ~0);
 
 	dev_priv->irqh = pci_intr_establish(dev_priv->pc, dev_priv->ih, IPL_BIO,
-	    mga_driver_irq_handler, dev, dev_priv->dev.dv_xname);
+	    mgadrm_intr, dev, dev_priv->dev.dv_xname);
 	if (dev_priv->irqh == NULL)
 		return (ENOENT);
 
diff --git a/sys/dev/pci/drm/r128_irq.c b/sys/dev/pci/drm/r128_irq.c
index caabd631ee1..855b8206993 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"
 
-int	r128_driver_irq_handler(void *);
+int	ragedrm_intr(void *);
 
 u_int32_t
 r128_get_vblank_counter(struct drm_device *dev, int crtc)
@@ -49,7 +49,7 @@ r128_get_vblank_counter(struct drm_device *dev, int crtc)
 }
 
 int
-r128_driver_irq_handler(void *arg)
+ragedrm_intr(void *arg)
 {
 	struct drm_device	*dev = (struct drm_device *) arg;
 	drm_r128_private_t	*dev_priv = dev->dev_private;
@@ -108,7 +108,7 @@ r128_driver_irq_install(struct drm_device * dev)
 	R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
 
 	dev_priv->irqh = pci_intr_establish(dev_priv->pc, dev_priv->ih, IPL_BIO,
-	    r128_driver_irq_handler, dev, dev_priv->dev.dv_xname);
+	    ragedrm_intr, dev, dev_priv->dev.dv_xname);
 	if (dev_priv->irqh == NULL)
 		return (ENOENT);
 	return (0);
diff --git a/sys/dev/pci/drm/radeon_irq.c b/sys/dev/pci/drm/radeon_irq.c
index 84b0038cd87..544a3f3d32e 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"
 
-int		radeon_driver_irq_handler(void *);
+int		radeondrm_intr(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 *);
@@ -190,7 +190,7 @@ radeon_acknowledge_irqs(drm_radeon_private_t *dev_priv, u32 *r500_disp_int)
  */
 
 int
-radeon_driver_irq_handler(void *arg)
+radeondrm_intr(void *arg)
 {
 	struct drm_device	*dev = arg;
 	drm_radeon_private_t	*dev_priv = dev->dev_private;
@@ -341,7 +341,7 @@ radeon_driver_irq_install(struct drm_device * dev)
 	radeon_acknowledge_irqs(dev_priv, &dummy);
 
 	dev_priv->irqh = pci_intr_establish(dev_priv->pc, dev_priv->ih, IPL_BIO,
-	    radeon_driver_irq_handler, dev, dev_priv->dev.dv_xname);
+	    radeondrm_intr, dev, dev_priv->dev.dv_xname);
 	if (dev_priv->irqh == NULL)
 		return (ENOENT);