summaryrefslogtreecommitdiff
path: root/bsd-core
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 /bsd-core
parentc26ffeafca30332520660d2bef1106b56d0ef5e1 (diff)
IRQ code cleanup suggested by Linus Torvalds
i830 build fix
Diffstat (limited to 'bsd-core')
-rw-r--r--bsd-core/drmP.h2
-rw-r--r--bsd-core/drm_dma.c2
-rw-r--r--bsd-core/drm_os_freebsd.h6
-rw-r--r--bsd-core/drm_os_netbsd.h6
4 files changed, 8 insertions, 8 deletions
diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h
index 8b38d232..c417a0ab 100644
--- a/bsd-core/drmP.h
+++ b/bsd-core/drmP.h
@@ -446,7 +446,7 @@ extern void DRM(reclaim_buffers)(drm_device_t *dev, DRMFILE filp);
#if __HAVE_DMA_IRQ
extern int DRM(irq_install)( drm_device_t *dev, int irq );
extern int DRM(irq_uninstall)( drm_device_t *dev );
-extern DRM_IRQ_RET DRM(dma_service)( DRM_IRQ_ARGS );
+extern irqreturn_t DRM(dma_service)( DRM_IRQ_ARGS );
extern void DRM(driver_irq_preinstall)( drm_device_t *dev );
extern void DRM(driver_irq_postinstall)( drm_device_t *dev );
extern void DRM(driver_irq_uninstall)( drm_device_t *dev );
diff --git a/bsd-core/drm_dma.c b/bsd-core/drm_dma.c
index 88ca2e39..accbb7fd 100644
--- a/bsd-core/drm_dma.c
+++ b/bsd-core/drm_dma.c
@@ -217,7 +217,7 @@ int DRM(irq_install)( drm_device_t *dev, int irq )
if ( retcode ) {
#elif defined(__NetBSD__)
dev->irqh = pci_intr_establish(&dev->pa.pa_pc, dev->ih, IPL_TTY,
- (DRM_IRQ_RET (*)(DRM_IRQ_ARGS))DRM(dma_service), dev);
+ (irqreturn_t (*)(DRM_IRQ_ARGS))DRM(dma_service), dev);
if ( !dev->irqh ) {
#endif
DRM_LOCK;
diff --git a/bsd-core/drm_os_freebsd.h b/bsd-core/drm_os_freebsd.h
index f1184008..32616757 100644
--- a/bsd-core/drm_os_freebsd.h
+++ b/bsd-core/drm_os_freebsd.h
@@ -112,9 +112,9 @@
#define DRM_SUSER(p) suser(p)
#define DRM_TASKQUEUE_ARGS void *arg, int pending
#define DRM_IRQ_ARGS void *arg
-#define DRM_IRQ_RET void
-#define DRM_IRQ_NONE
-#define DRM_IRQ_HANDLED
+typedef void irqreturn_t;
+#define IRQ_HANDLED /* nothing */
+#define IRQ_NONE /* nothing */
#define DRM_DEVICE drm_device_t *dev = kdev->si_drv1
#define DRM_MALLOC(size) malloc( size, DRM(M_DRM), M_NOWAIT )
#define DRM_FREE(pt,size) free( pt, DRM(M_DRM) )
diff --git a/bsd-core/drm_os_netbsd.h b/bsd-core/drm_os_netbsd.h
index d58f668a..b02eadd8 100644
--- a/bsd-core/drm_os_netbsd.h
+++ b/bsd-core/drm_os_netbsd.h
@@ -85,9 +85,9 @@ extern struct cfdriver DRM(cd);
#define DRM_SUSER(p) suser(p->p_ucred, &p->p_acflag)
#define DRM_TASKQUEUE_ARGS void *dev, int pending
#define DRM_IRQ_ARGS void *arg
-#define DRM_IRQ_RET int
-#define DRM_NONE /* FIXME */
-#define DRM_HANDLED /* FIXME */
+typedef int irqreturn_t;
+#define IRQ_NONE /* FIXME */
+#define IRQ_HANDLED /* FIXME */
#define DRM_DEVICE drm_device_t *dev = device_lookup(&DRM(cd), minor(kdev))
/* XXX Not sure if this is the 'right' version.. */
#if __NetBSD_Version__ >= 106140000