summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorRik Faith <faith@alephnull.com>2002-08-06 18:00:57 +0000
committerRik Faith <faith@alephnull.com>2002-08-06 18:00:57 +0000
commit977b420d5dc66db3d4335132861a1eff3747b49a (patch)
treed4ee3c06fccda33c2be176a152714bc72c2160ab /linux-core
parent881a9b214d033a1e153f61996645bdaa37eb87d8 (diff)
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.
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_drv.c18
-rw-r--r--linux-core/drm_stub.c4
-rw-r--r--linux-core/drm_vm.c24
-rw-r--r--linux-core/i810_dma.c16
-rw-r--r--linux-core/i830_dma.c16
5 files changed, 39 insertions, 39 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index af6858d7..81bd7894 100644
--- 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 b1e78923..3c9c69eb 100644
--- 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 c07c9aff..49ce309c 100644
--- 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 a2899b5f..a0ab1430 100644
--- 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 b9c89aab..34a9c2e3 100644
--- 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)