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-core/i830_irq.c | |
| parent | c26ffeafca30332520660d2bef1106b56d0ef5e1 (diff) | |
IRQ code cleanup suggested by Linus Torvalds
i830 build fix
Diffstat (limited to 'linux-core/i830_irq.c')
| -rw-r--r-- | linux-core/i830_irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux-core/i830_irq.c b/linux-core/i830_irq.c index 301afc8a..d2aabf33 100644 --- a/linux-core/i830_irq.c +++ b/linux-core/i830_irq.c @@ -36,9 +36,9 @@ #include <linux/delay.h> -DRM_IRQ_RET DRM(dma_service)( DRM_IRQ_ARGS ) +irqreturn_t DRM(dma_service)( DRM_IRQ_ARGS ) { - drm_device_t *dev = (drm_device_t *)device; + drm_device_t *dev = (drm_device_t *)arg; drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private; u16 temp; @@ -46,14 +46,14 @@ DRM_IRQ_RET DRM(dma_service)( DRM_IRQ_ARGS ) DRM_DEBUG("%x\n", temp); if ( !( temp & 2 ) ) - return DRM_IRQ_NONE; + return IRQ_NONE; I830_WRITE16(I830REG_INT_IDENTITY_R, temp); atomic_inc(&dev_priv->irq_received); wake_up_interruptible(&dev_priv->irq_queue); - return DRM_IRQ_HANDLED; + return IRQ_HANDLED; } |