aboutsummaryrefslogtreecommitdiff
path: root/shared-core/radeon_irq.c
diff options
context:
space:
mode:
authorMichel Daenzer <michel@daenzer.net>2003-07-29 10:11:48 +0000
committerMichel Daenzer <michel@daenzer.net>2003-07-29 10:11:48 +0000
commit4b60cae90e0f689f68167c2e3419df7574cae1ab (patch)
treec6e0714b4e51fc2ea9732ce5e5d57915ff350276 /shared-core/radeon_irq.c
parentc26ffeafca30332520660d2bef1106b56d0ef5e1 (diff)
IRQ code cleanup suggested by Linus Torvalds
i830 build fix
Diffstat (limited to 'shared-core/radeon_irq.c')
-rw-r--r--shared-core/radeon_irq.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/shared-core/radeon_irq.c b/shared-core/radeon_irq.c
index a42c7cf5..1d339f28 100644
--- a/shared-core/radeon_irq.c
+++ b/shared-core/radeon_irq.c
@@ -54,7 +54,7 @@
* tied to dma at all, this is just a hangover from dri prehistory.
*/
-DRM_IRQ_RET DRM(dma_service)( DRM_IRQ_ARGS )
+irqreturn_t DRM(dma_service)( DRM_IRQ_ARGS )
{
drm_device_t *dev = (drm_device_t *) arg;
drm_radeon_private_t *dev_priv =
@@ -67,7 +67,7 @@ DRM_IRQ_RET DRM(dma_service)( DRM_IRQ_ARGS )
stat = RADEON_READ(RADEON_GEN_INT_STATUS)
& (RADEON_SW_INT_TEST | RADEON_CRTC_VBLANK_STAT);
if (!stat)
- return DRM_IRQ_NONE;
+ return IRQ_NONE;
/* SW interrupt */
if (stat & RADEON_SW_INT_TEST) {
@@ -83,7 +83,7 @@ DRM_IRQ_RET DRM(dma_service)( DRM_IRQ_ARGS )
/* Acknowledge interrupts we handle */
RADEON_WRITE(RADEON_GEN_INT_STATUS, stat);
- return DRM_IRQ_HANDLED;
+ return IRQ_HANDLED;
}
static __inline__ void radeon_acknowledge_irqs(drm_radeon_private_t *dev_priv)