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 /linux/gamma_dma.c | |
parent | c26ffeafca30332520660d2bef1106b56d0ef5e1 (diff) |
IRQ code cleanup suggested by Linus Torvalds
i830 build fix
Diffstat (limited to 'linux/gamma_dma.c')
-rw-r--r-- | linux/gamma_dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/gamma_dma.c b/linux/gamma_dma.c index 85a9c084..3fc6c9f8 100644 --- a/linux/gamma_dma.c +++ b/linux/gamma_dma.c @@ -105,7 +105,7 @@ static inline int gamma_dma_is_ready(drm_device_t *dev) return(!GAMMA_READ(GAMMA_DMACOUNT)); } -DRM_IRQ_RET gamma_dma_service( DRM_IRQ_ARGS ) +irqreturn_t gamma_dma_service( DRM_IRQ_ARGS ) { drm_device_t *dev = (drm_device_t *)arg; drm_device_dma_t *dma = dev->dma; @@ -121,7 +121,7 @@ DRM_IRQ_RET gamma_dma_service( DRM_IRQ_ARGS ) GAMMA_WRITE(GAMMA_GINTFLAGS, 0x2001); if (gamma_dma_is_ready(dev)) { /* Free previous buffer */ - if (test_and_set_bit(0, &dev->dma_flag)) return DRM_IRQ_HANDLED; + if (test_and_set_bit(0, &dev->dma_flag)) return IRQ_HANDLED; if (dma->this_buffer) { gamma_free_buffer(dev, dma->this_buffer); dma->this_buffer = NULL; @@ -136,7 +136,7 @@ DRM_IRQ_RET gamma_dma_service( DRM_IRQ_ARGS ) schedule_work(&dev->work); #endif } - return DRM_IRQ_HANDLED; + return IRQ_HANDLED; } /* Only called by gamma_dma_schedule. */ |