Updates from Rusty Russell to:

1) Remove redundant header inclusion
2) Silence bitop on non-long argument warnings (change int to long)
3) Move to ISO C (gcc 2.6) initializers (accepted by older gccs also) All
    of these are syntax changes that should not impact functionality.

diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index af6858d..81bd789 100644 (file)
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -115,15 +115,15 @@
 #ifndef DRIVER_FOPS
 #define DRIVER_FOPS                            \
 static struct file_operations  DRM(fops) = {   \
-       owner:   THIS_MODULE,                   \
-       open:    DRM(open),                     \
-       flush:   DRM(flush),                    \
-       release: DRM(release),                  \
-       ioctl:   DRM(ioctl),                    \
-       mmap:    DRM(mmap),                     \
-       read:    DRM(read),                     \
-       fasync:  DRM(fasync),                   \
-       poll:    DRM(poll),                     \
+       .owner   = THIS_MODULE,                 \
+       .open    = DRM(open),                   \
+       .flush   = DRM(flush),                  \
+       .release = DRM(release),                \
+       .ioctl   = DRM(ioctl),                  \
+       .mmap    = DRM(mmap),                   \
+       .read    = DRM(read),                   \
+       .fasync  = DRM(fasync),                 \
+       .poll    = DRM(poll),                   \
 }
 #endif
 

diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c
index b1e7892..3c9c69e 100644 (file)
--- a/linux-core/drm_stub.c
+++ b/linux-core/drm_stub.c
@@ -66,8 +66,8 @@ static int DRM(stub_open)(struct inode *inode, struct file *filp)
 }
 
 static struct file_operations DRM(stub_fops) = {
-       owner:   THIS_MODULE,
-       open:    DRM(stub_open)
+       .owner = THIS_MODULE,
+       .open  = DRM(stub_open)
 };
 
 static int DRM(stub_getminor)(const char *name, struct file_operations *fops,

diff --git a/linux-core/drm_vm.c b/linux-core/drm_vm.c
index c07c9af..49ce309 100644 (file)
--- a/linux-core/drm_vm.c
+++ b/linux-core/drm_vm.c
@@ -33,27 +33,27 @@
 #include "drmP.h"
 
 struct vm_operations_struct   DRM(vm_ops) = {
-       nopage:  DRM(vm_nopage),
-       open:    DRM(vm_open),
-       close:   DRM(vm_close),
+       .nopage = DRM(vm_nopage),
+       .open   = DRM(vm_open),
+       .close  = DRM(vm_close),
 };
 
 struct vm_operations_struct   DRM(vm_shm_ops) = {
-       nopage:  DRM(vm_shm_nopage),
-       open:    DRM(vm_open),
-       close:   DRM(vm_shm_close),
+       .nopage = DRM(vm_shm_nopage),
+       .open   = DRM(vm_open),
+       .close  = DRM(vm_shm_close),
 };
 
 struct vm_operations_struct   DRM(vm_dma_ops) = {
-       nopage:  DRM(vm_dma_nopage),
-       open:    DRM(vm_open),
-       close:   DRM(vm_close),
+       .nopage = DRM(vm_dma_nopage),
+       .open   = DRM(vm_open),
+       .close  = DRM(vm_close),
 };
 
 struct vm_operations_struct   DRM(vm_sg_ops) = {
-       nopage:  DRM(vm_sg_nopage),
-       open:    DRM(vm_open),
-       close:   DRM(vm_close),
+       .nopage = DRM(vm_sg_nopage),
+       .open   = DRM(vm_open),
+       .close  = DRM(vm_close),
 };
 
 struct page *DRM(vm_nopage)(struct vm_area_struct *vma,

diff --git a/linux-core/i810_dma.c b/linux-core/i810_dma.c
index a2899b5..a0ab143 100644 (file)
--- a/linux-core/i810_dma.c
+++ b/linux-core/i810_dma.c
@@ -129,14 +129,14 @@ static int i810_freelist_put(drm_device_t *dev, drm_buf_t *buf)
 }
 
 static struct file_operations i810_buffer_fops = {
-       open:    DRM(open),
-       flush:   DRM(flush),
-       release: DRM(release),
-       ioctl:   DRM(ioctl),
-       mmap:    i810_mmap_buffers,
-       read:    DRM(read),
-       fasync:  DRM(fasync),
-       poll:    DRM(poll),
+       .open    = DRM(open),
+       .flush   = DRM(flush),
+       .release = DRM(release),
+       .ioctl   = DRM(ioctl),
+       .mmap    = i810_mmap_buffers,
+       .read    = DRM(read),
+       .fasync  = DRM(fasync),
+       .poll    = DRM(poll),
 };
 
 int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)

diff --git a/linux-core/i830_dma.c b/linux-core/i830_dma.c
index b9c89aa..34a9c2e 100644 (file)
--- a/linux-core/i830_dma.c
+++ b/linux-core/i830_dma.c
@@ -153,14 +153,14 @@ static int i830_freelist_put(drm_device_t *dev, drm_buf_t *buf)
 }
 
 static struct file_operations i830_buffer_fops = {
-       open:    DRM(open),
-       flush:   DRM(flush),
-       release: DRM(release),
-       ioctl:   DRM(ioctl),
-       mmap:    i830_mmap_buffers,
-       read:    DRM(read),
-       fasync:  DRM(fasync),
-       poll:    DRM(poll),
+       .open    = DRM(open),
+       .flush   = DRM(flush),
+       .release = DRM(release),
+       .ioctl   = DRM(ioctl),
+       .mmap    = i830_mmap_buffers,
+       .read    = DRM(read),
+       .fasync  = DRM(fasync),
+       .poll    = DRM(poll),
 };
 
 int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma)

diff --git a/linux/drm_drv.h b/linux/drm_drv.h
index af6858d..81bd789 100644 (file)
--- a/linux/drm_drv.h
+++ b/linux/drm_drv.h
@@ -115,15 +115,15 @@
 #ifndef DRIVER_FOPS
 #define DRIVER_FOPS                            \
 static struct file_operations  DRM(fops) = {   \
-       owner:   THIS_MODULE,                   \
-       open:    DRM(open),                     \
-       flush:   DRM(flush),                    \
-       release: DRM(release),                  \
-       ioctl:   DRM(ioctl),                    \
-       mmap:    DRM(mmap),                     \
-       read:    DRM(read),                     \
-       fasync:  DRM(fasync),                   \
-       poll:    DRM(poll),                     \
+       .owner   = THIS_MODULE,                 \
+       .open    = DRM(open),                   \
+       .flush   = DRM(flush),                  \
+       .release = DRM(release),                \
+       .ioctl   = DRM(ioctl),                  \
+       .mmap    = DRM(mmap),                   \
+       .read    = DRM(read),                   \
+       .fasync  = DRM(fasync),                 \
+       .poll    = DRM(poll),                   \
 }
 #endif
 

diff --git a/linux/drm_stub.h b/linux/drm_stub.h
index b1e7892..3c9c69e 100644 (file)
--- a/linux/drm_stub.h
+++ b/linux/drm_stub.h
@@ -66,8 +66,8 @@ static int DRM(stub_open)(struct inode *inode, struct file *filp)
 }
 
 static struct file_operations DRM(stub_fops) = {
-       owner:   THIS_MODULE,
-       open:    DRM(stub_open)
+       .owner = THIS_MODULE,
+       .open  = DRM(stub_open)
 };
 
 static int DRM(stub_getminor)(const char *name, struct file_operations *fops,

diff --git a/linux/drm_vm.h b/linux/drm_vm.h
index c07c9af..49ce309 100644 (file)
--- a/linux/drm_vm.h
+++ b/linux/drm_vm.h
@@ -33,27 +33,27 @@
 #include "drmP.h"
 
 struct vm_operations_struct   DRM(vm_ops) = {
-       nopage:  DRM(vm_nopage),
-       open:    DRM(vm_open),
-       close:   DRM(vm_close),
+       .nopage = DRM(vm_nopage),
+       .open   = DRM(vm_open),
+       .close  = DRM(vm_close),
 };
 
 struct vm_operations_struct   DRM(vm_shm_ops) = {
-       nopage:  DRM(vm_shm_nopage),
-       open:    DRM(vm_open),
-       close:   DRM(vm_shm_close),
+       .nopage = DRM(vm_shm_nopage),
+       .open   = DRM(vm_open),
+       .close  = DRM(vm_shm_close),
 };
 
 struct vm_operations_struct   DRM(vm_dma_ops) = {
-       nopage:  DRM(vm_dma_nopage),
-       open:    DRM(vm_open),
-       close:   DRM(vm_close),
+       .nopage = DRM(vm_dma_nopage),
+       .open   = DRM(vm_open),
+       .close  = DRM(vm_close),
 };
 
 struct vm_operations_struct   DRM(vm_sg_ops) = {
-       nopage:  DRM(vm_sg_nopage),
-       open:    DRM(vm_open),
-       close:   DRM(vm_close),
+       .nopage = DRM(vm_sg_nopage),
+       .open   = DRM(vm_open),
+       .close  = DRM(vm_close),
 };
 
 struct page *DRM(vm_nopage)(struct vm_area_struct *vma,

diff --git a/linux/i810_dma.c b/linux/i810_dma.c
index a2899b5..a0ab143 100644 (file)
--- a/linux/i810_dma.c
+++ b/linux/i810_dma.c
@@ -129,14 +129,14 @@ static int i810_freelist_put(drm_device_t *dev, drm_buf_t *buf)
 }
 
 static struct file_operations i810_buffer_fops = {
-       open:    DRM(open),
-       flush:   DRM(flush),
-       release: DRM(release),
-       ioctl:   DRM(ioctl),
-       mmap:    i810_mmap_buffers,
-       read:    DRM(read),
-       fasync:  DRM(fasync),
-       poll:    DRM(poll),
+       .open    = DRM(open),
+       .flush   = DRM(flush),
+       .release = DRM(release),
+       .ioctl   = DRM(ioctl),
+       .mmap    = i810_mmap_buffers,
+       .read    = DRM(read),
+       .fasync  = DRM(fasync),
+       .poll    = DRM(poll),
 };
 
 int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)

diff --git a/linux/i830_dma.c b/linux/i830_dma.c
index b9c89aa..34a9c2e 100644 (file)
--- a/linux/i830_dma.c
+++ b/linux/i830_dma.c
@@ -153,14 +153,14 @@ static int i830_freelist_put(drm_device_t *dev, drm_buf_t *buf)
 }
 
 static struct file_operations i830_buffer_fops = {
-       open:    DRM(open),
-       flush:   DRM(flush),
-       release: DRM(release),
-       ioctl:   DRM(ioctl),
-       mmap:    i830_mmap_buffers,
-       read:    DRM(read),
-       fasync:  DRM(fasync),
-       poll:    DRM(poll),
+       .open    = DRM(open),
+       .flush   = DRM(flush),
+       .release = DRM(release),
+       .ioctl   = DRM(ioctl),
+       .mmap    = i830_mmap_buffers,
+       .read    = DRM(read),
+       .fasync  = DRM(fasync),
+       .poll    = DRM(poll),
 };
 
 int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma)

diff --git a/shared-core/mga_drv.h b/shared-core/mga_drv.h
index 51bc706..0845009 100644 (file)
--- a/shared-core/mga_drv.h
+++ b/shared-core/mga_drv.h
@@ -38,7 +38,7 @@ typedef struct drm_mga_primary_buffer {
 
        u32 tail;
        int space;
-       int wrapped;
+       volatile long wrapped;
 
        volatile u32 *status;
 

diff --git a/shared-core/mga_state.c b/shared-core/mga_state.c
index adf67de..734432d 100644 (file)
--- a/shared-core/mga_state.c
+++ b/shared-core/mga_state.c
@@ -37,7 +37,6 @@
 #include "drm.h"
 #include "mga_drm.h"
 #include "mga_drv.h"
-#include "drm.h"
 
 
 /* ================================================================

diff --git a/shared/mga_drv.h b/shared/mga_drv.h
index 51bc706..0845009 100644 (file)
--- a/shared/mga_drv.h
+++ b/shared/mga_drv.h
@@ -38,7 +38,7 @@ typedef struct drm_mga_primary_buffer {
 
        u32 tail;
        int space;
-       int wrapped;
+       volatile long wrapped;
 
        volatile u32 *status;
 

diff --git a/shared/mga_state.c b/shared/mga_state.c
index adf67de..734432d 100644 (file)
--- a/shared/mga_state.c
+++ b/shared/mga_state.c
@@ -37,7 +37,6 @@
 #include "drm.h"
 #include "mga_drm.h"
 #include "mga_drv.h"
-#include "drm.h"
 
 
 /* ================================================================