aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/r128
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-12-11 05:34:42 -0500
committerDave Airlie <airlied@redhat.com>2013-12-17 20:33:46 -0500
commite9f0d76f3bcd4dda7136baaaaf45bda3b13ff40f (patch)
tree557d43df25c4d6b40fee763d99c8844c7bd9c960 /drivers/gpu/drm/r128
parentbfd8303af0c46bd094289ee4e65f1e4bcc4fb7d3 (diff)
drm: Kill DRM_IRQ_ARGS
I've killed them a long time ago in drm/i915, let's get rid of this remnant of shared drm core days for good. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/r128')
-rw-r--r--drivers/gpu/drm/r128/r128_drv.h2
-rw-r--r--drivers/gpu/drm/r128/r128_irq.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
index 56eb5e3f5439..4318bfa845cb 100644
--- a/drivers/gpu/drm/r128/r128_drv.h
+++ b/drivers/gpu/drm/r128/r128_drv.h
@@ -154,7 +154,7 @@ extern int r128_do_cleanup_cce(struct drm_device *dev);
154extern int r128_enable_vblank(struct drm_device *dev, int crtc); 154extern int r128_enable_vblank(struct drm_device *dev, int crtc);
155extern void r128_disable_vblank(struct drm_device *dev, int crtc); 155extern void r128_disable_vblank(struct drm_device *dev, int crtc);
156extern u32 r128_get_vblank_counter(struct drm_device *dev, int crtc); 156extern u32 r128_get_vblank_counter(struct drm_device *dev, int crtc);
157extern irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS); 157extern irqreturn_t r128_driver_irq_handler(int irq, void *arg);
158extern void r128_driver_irq_preinstall(struct drm_device *dev); 158extern void r128_driver_irq_preinstall(struct drm_device *dev);
159extern int r128_driver_irq_postinstall(struct drm_device *dev); 159extern int r128_driver_irq_postinstall(struct drm_device *dev);
160extern void r128_driver_irq_uninstall(struct drm_device *dev); 160extern void r128_driver_irq_uninstall(struct drm_device *dev);
diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
index 2ea4f09d2691..c2ae496babb7 100644
--- a/drivers/gpu/drm/r128/r128_irq.c
+++ b/drivers/gpu/drm/r128/r128_irq.c
@@ -44,7 +44,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
44 return atomic_read(&dev_priv->vbl_received); 44 return atomic_read(&dev_priv->vbl_received);
45} 45}
46 46
47irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS) 47irqreturn_t r128_driver_irq_handler(int irq, void *arg)
48{ 48{
49 struct drm_device *dev = (struct drm_device *) arg; 49 struct drm_device *dev = (struct drm_device *) arg;
50 drm_r128_private_t *dev_priv = (drm_r128_private_t *) dev->dev_private; 50 drm_r128_private_t *dev_priv = (drm_r128_private_t *) dev->dev_private;