further vertical blank interrupt cleanups: remove unused variable,

    non-ambiguous variable names, don't express subtraction in
    unnecessarily complicated ways

diff --git a/linux-core/drm_dma.c b/linux-core/drm_dma.c
index 9dd46d2..46393a5 100644 (file)
--- a/linux-core/drm_dma.c
+++ b/linux-core/drm_dma.c
@@ -509,9 +509,6 @@ int DRM(dma_get_buffers)(drm_device_t *dev, drm_dma_t *dma)
 int DRM(irq_install)( drm_device_t *dev, int irq )
 {
        int ret;
-#if __HAVE_VBL_IRQ
-       unsigned long flags;
-#endif
 
        if ( !irq )
                return -EINVAL;
@@ -638,7 +635,7 @@ int DRM(wait_vblank)( DRM_IOCTL_ARGS )
        flags = vblwait.request.type & _DRM_VBLANK_FLAGS_MASK;
        
        if ( flags & _DRM_VBLANK_SIGNAL ) {
-               unsigned long flags;
+               unsigned long irqflags;
                drm_vbl_sig_t *vbl_sig = DRM_MALLOC( sizeof( drm_vbl_sig_t ) );
 
                if ( !vbl_sig )
@@ -653,11 +650,11 @@ int DRM(wait_vblank)( DRM_IOCTL_ARGS )
                vblwait.reply.sequence = atomic_read( &dev->vbl_received );
 
                /* Hook signal entry into list */
-               spin_lock_irqsave( &dev->vbl_lock, flags );
+               spin_lock_irqsave( &dev->vbl_lock, irqflags );
 
                list_add_tail( (struct list_head *) vbl_sig, &dev->vbl_sigs.head );
 
-               spin_unlock_irqrestore( &dev->vbl_lock, flags );
+               spin_unlock_irqrestore( &dev->vbl_lock, irqflags );
        } else {
                ret = DRM(vblank_wait)( dev, &vblwait.request.sequence );
 
@@ -685,7 +682,7 @@ void DRM(vbl_send_signals)( drm_device_t *dev )
 
                vbl_sig = (drm_vbl_sig_t *) entry;
 
-               if ( ( vbl_seq + ~vbl_sig->sequence + 1 ) <= (1<<23) ) {
+               if ( ( vbl_seq - vbl_sig->sequence ) <= (1<<23) ) {
 
                        vbl_sig->info.si_code = atomic_read( &dev->vbl_received );
                        send_sig_info( vbl_sig->info.si_signo, &vbl_sig->info, vbl_sig->task );

diff --git a/linux/drm_dma.h b/linux/drm_dma.h
index 9dd46d2..46393a5 100644 (file)
--- a/linux/drm_dma.h
+++ b/linux/drm_dma.h
@@ -509,9 +509,6 @@ int DRM(dma_get_buffers)(drm_device_t *dev, drm_dma_t *dma)
 int DRM(irq_install)( drm_device_t *dev, int irq )
 {
        int ret;
-#if __HAVE_VBL_IRQ
-       unsigned long flags;
-#endif
 
        if ( !irq )
                return -EINVAL;
@@ -638,7 +635,7 @@ int DRM(wait_vblank)( DRM_IOCTL_ARGS )
        flags = vblwait.request.type & _DRM_VBLANK_FLAGS_MASK;
        
        if ( flags & _DRM_VBLANK_SIGNAL ) {
-               unsigned long flags;
+               unsigned long irqflags;
                drm_vbl_sig_t *vbl_sig = DRM_MALLOC( sizeof( drm_vbl_sig_t ) );
 
                if ( !vbl_sig )
@@ -653,11 +650,11 @@ int DRM(wait_vblank)( DRM_IOCTL_ARGS )
                vblwait.reply.sequence = atomic_read( &dev->vbl_received );
 
                /* Hook signal entry into list */
-               spin_lock_irqsave( &dev->vbl_lock, flags );
+               spin_lock_irqsave( &dev->vbl_lock, irqflags );
 
                list_add_tail( (struct list_head *) vbl_sig, &dev->vbl_sigs.head );
 
-               spin_unlock_irqrestore( &dev->vbl_lock, flags );
+               spin_unlock_irqrestore( &dev->vbl_lock, irqflags );
        } else {
                ret = DRM(vblank_wait)( dev, &vblwait.request.sequence );
 
@@ -685,7 +682,7 @@ void DRM(vbl_send_signals)( drm_device_t *dev )
 
                vbl_sig = (drm_vbl_sig_t *) entry;
 
-               if ( ( vbl_seq + ~vbl_sig->sequence + 1 ) <= (1<<23) ) {
+               if ( ( vbl_seq - vbl_sig->sequence ) <= (1<<23) ) {
 
                        vbl_sig->info.si_code = atomic_read( &dev->vbl_received );
                        send_sig_info( vbl_sig->info.si_signo, &vbl_sig->info, vbl_sig->task );

diff --git a/shared-core/mga_irq.c b/shared-core/mga_irq.c
index 6623605..28e9a26 100644 (file)
--- a/shared-core/mga_irq.c
+++ b/shared-core/mga_irq.c
@@ -65,7 +65,7 @@ int mga_vblank_wait(drm_device_t *dev, unsigned int *sequence)
         */
        DRM_WAIT_ON( ret, dev->vbl_queue, 3*DRM_HZ, 
                     ( ( ( cur_vblank = atomic_read(&dev->vbl_received ) )
-                        + ~*sequence + 1 ) <= (1<<23) ) );
+                        - *sequence ) <= (1<<23) ) );
 
        *sequence = cur_vblank;
 

diff --git a/shared-core/r128_irq.c b/shared-core/r128_irq.c
index 8dfee07..bfc3040 100644 (file)
--- a/shared-core/r128_irq.c
+++ b/shared-core/r128_irq.c
@@ -65,7 +65,7 @@ int DRM(vblank_wait)(drm_device_t *dev, unsigned int *sequence)
         */
        DRM_WAIT_ON( ret, dev->vbl_queue, 3*DRM_HZ, 
                     ( ( ( cur_vblank = atomic_read(&dev->vbl_received ) )
-                        + ~*sequence + 1 ) <= (1<<23) ) );
+                        - *sequence ) <= (1<<23) ) );
 
        *sequence = cur_vblank;
 

diff --git a/shared-core/radeon_irq.c b/shared-core/radeon_irq.c
index e2182ff..c5cd61c 100644 (file)
--- a/shared-core/radeon_irq.c
+++ b/shared-core/radeon_irq.c
@@ -159,7 +159,7 @@ int DRM(vblank_wait)(drm_device_t *dev, unsigned int *sequence)
         */
        DRM_WAIT_ON( ret, dev->vbl_queue, 3*DRM_HZ, 
                     ( ( ( cur_vblank = atomic_read(&dev->vbl_received ) )
-                        + ~*sequence + 1 ) <= (1<<23) ) );
+                        - *sequence ) <= (1<<23) ) );
 
        *sequence = cur_vblank;
 

diff --git a/shared/mga_irq.c b/shared/mga_irq.c
index 6623605..28e9a26 100644 (file)
--- a/shared/mga_irq.c
+++ b/shared/mga_irq.c
@@ -65,7 +65,7 @@ int mga_vblank_wait(drm_device_t *dev, unsigned int *sequence)
         */
        DRM_WAIT_ON( ret, dev->vbl_queue, 3*DRM_HZ, 
                     ( ( ( cur_vblank = atomic_read(&dev->vbl_received ) )
-                        + ~*sequence + 1 ) <= (1<<23) ) );
+                        - *sequence ) <= (1<<23) ) );
 
        *sequence = cur_vblank;
 

diff --git a/shared/r128_irq.c b/shared/r128_irq.c
index 8dfee07..bfc3040 100644 (file)
--- a/shared/r128_irq.c
+++ b/shared/r128_irq.c
@@ -65,7 +65,7 @@ int DRM(vblank_wait)(drm_device_t *dev, unsigned int *sequence)
         */
        DRM_WAIT_ON( ret, dev->vbl_queue, 3*DRM_HZ, 
                     ( ( ( cur_vblank = atomic_read(&dev->vbl_received ) )
-                        + ~*sequence + 1 ) <= (1<<23) ) );
+                        - *sequence ) <= (1<<23) ) );
 
        *sequence = cur_vblank;
 

diff --git a/shared/radeon_irq.c b/shared/radeon_irq.c
index e2182ff..c5cd61c 100644 (file)
--- a/shared/radeon_irq.c
+++ b/shared/radeon_irq.c
@@ -159,7 +159,7 @@ int DRM(vblank_wait)(drm_device_t *dev, unsigned int *sequence)
         */
        DRM_WAIT_ON( ret, dev->vbl_queue, 3*DRM_HZ, 
                     ( ( ( cur_vblank = atomic_read(&dev->vbl_received ) )
-                        + ~*sequence + 1 ) <= (1<<23) ) );
+                        - *sequence ) <= (1<<23) ) );
 
        *sequence = cur_vblank;