Commit af91bc10 authored by Art Haas's avatar Art Haas Committed by Linus Torvalds

[PATCH] C99 initializers for drivers/char

parent 19415c8d
......@@ -28,16 +28,16 @@
#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), \
get_unmapped_area: ffb_get_unmapped_area, \
.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), \
.get_unmapped_area = ffb_get_unmapped_area, \
}
#define DRIVER_COUNT_CARDS() ffb_count_card_instances()
......
......@@ -96,13 +96,13 @@ static ssize_t zft_write(struct file *fp, const char *buff,
static struct file_operations zft_cdev =
{
owner: THIS_MODULE,
read: zft_read,
write: zft_write,
ioctl: zft_ioctl,
mmap: zft_mmap,
open: zft_open,
release: zft_close,
.owner = THIS_MODULE,
.read = zft_read,
.write = zft_write,
.ioctl = zft_ioctl,
.mmap = zft_mmap,
.open = zft_open,
.release = zft_close,
};
/* Open floppy tape device
......
......@@ -429,12 +429,12 @@ static int register_serial_portandirq(unsigned int port, int irq)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
static struct file_operations mwave_fops = {
owner:THIS_MODULE,
read:mwave_read,
write:mwave_write,
ioctl:mwave_ioctl,
open:mwave_open,
release:mwave_close
.owner = THIS_MODULE,
.read = mwave_read,
.write = mwave_write,
.ioctl = mwave_ioctl,
.open = mwave_open,
.release = mwave_close
};
#else
static struct file_operations mwave_fops = {
......
......@@ -276,8 +276,8 @@ static struct real_driver rio_real_driver = {
*/
static struct file_operations rio_fw_fops = {
owner: THIS_MODULE,
ioctl: rio_fw_ioctl,
.owner = THIS_MODULE,
.ioctl = rio_fw_ioctl,
};
struct miscdevice rio_fw_device = {
......
......@@ -139,7 +139,7 @@ static int softdog_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
static struct watchdog_info ident = {
identity: "Software Watchdog",
.identity = "Software Watchdog",
};
switch (cmd) {
default:
......@@ -158,17 +158,17 @@ static int softdog_ioctl(struct inode *inode, struct file *file,
}
static struct file_operations softdog_fops = {
owner: THIS_MODULE,
write: softdog_write,
ioctl: softdog_ioctl,
open: softdog_open,
release: softdog_release,
.owner = THIS_MODULE,
.write = softdog_write,
.ioctl = softdog_ioctl,
.open = softdog_open,
.release = softdog_release,
};
static struct miscdevice softdog_miscdev = {
minor: WATCHDOG_MINOR,
name: "watchdog",
fops: &softdog_fops,
.minor = WATCHDOG_MINOR,
.name = "watchdog",
.fops = &softdog_fops,
};
static char banner[] __initdata = KERN_INFO "Software Watchdog Timer: 0.06, soft_margin: %d sec, nowayout: %d\n";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment