diff options
| author | Michel Daenzer <michel@daenzer.net> | 2003-07-29 10:11:48 +0000 |
|---|---|---|
| committer | Michel Daenzer <michel@daenzer.net> | 2003-07-29 10:11:48 +0000 |
| commit | 4b60cae90e0f689f68167c2e3419df7574cae1ab (patch) | |
| tree | c6e0714b4e51fc2ea9732ce5e5d57915ff350276 /shared-core | |
| parent | c26ffeafca30332520660d2bef1106b56d0ef5e1 (diff) | |
IRQ code cleanup suggested by Linus Torvalds
i830 build fix
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/mga_irq.c | 6 | ||||
| -rw-r--r-- | shared-core/r128_irq.c | 6 | ||||
| -rw-r--r-- | shared-core/radeon_irq.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/shared-core/mga_irq.c b/shared-core/mga_irq.c index c53a4bc2..ccced64f 100644 --- a/shared-core/mga_irq.c +++ b/shared-core/mga_irq.c @@ -36,7 +36,7 @@ #include "mga_drm.h" #include "mga_drv.h" -DRM_IRQ_RET mga_dma_service( DRM_IRQ_ARGS ) +irqreturn_t mga_dma_service( DRM_IRQ_ARGS ) { drm_device_t *dev = (drm_device_t *) arg; drm_mga_private_t *dev_priv = @@ -51,9 +51,9 @@ DRM_IRQ_RET mga_dma_service( DRM_IRQ_ARGS ) atomic_inc(&dev->vbl_received); DRM_WAKEUP(&dev->vbl_queue); DRM(vbl_send_signals)( dev ); - return DRM_IRQ_HANDLED; + return IRQ_HANDLED; } - return DRM_IRQ_NONE; + return IRQ_NONE; } int mga_vblank_wait(drm_device_t *dev, unsigned int *sequence) diff --git a/shared-core/r128_irq.c b/shared-core/r128_irq.c index 5fe5b46b..c060e187 100644 --- a/shared-core/r128_irq.c +++ b/shared-core/r128_irq.c @@ -36,7 +36,7 @@ #include "r128_drm.h" #include "r128_drv.h" -DRM_IRQ_RET r128_dma_service( DRM_IRQ_ARGS ) +irqreturn_t r128_dma_service( DRM_IRQ_ARGS ) { drm_device_t *dev = (drm_device_t *) arg; drm_r128_private_t *dev_priv = @@ -51,9 +51,9 @@ DRM_IRQ_RET r128_dma_service( DRM_IRQ_ARGS ) atomic_inc(&dev->vbl_received); DRM_WAKEUP(&dev->vbl_queue); DRM(vbl_send_signals)( dev ); - return DRM_IRQ_HANDLED; + return IRQ_HANDLED; } - return DRM_IRQ_NONE; + return IRQ_NONE; } int DRM(vblank_wait)(drm_device_t *dev, unsigned int *sequence) 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) |