Commit 6f124a96 authored by Kai Germaschewski's avatar Kai Germaschewski

ISDN: Use C99 initializers

Thanks to Rusty for posting the script...
parent 7e7f7ea3
......@@ -957,14 +957,14 @@ capi_release(struct inode *inode, struct file *file)
static struct file_operations capi_fops =
{
owner: THIS_MODULE,
llseek: no_llseek,
read: capi_read,
write: capi_write,
poll: capi_poll,
ioctl: capi_ioctl,
open: capi_open,
release: capi_release,
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = capi_read,
.write = capi_write,
.poll = capi_poll,
.ioctl = capi_ioctl,
.open = capi_open,
.release = capi_release,
};
#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
......
......@@ -72,16 +72,16 @@ static int capifs_revalidate(struct dentry *, int);
static struct inode *capifs_new_inode(struct super_block *sb);
static struct file_operations capifs_root_operations = {
read: generic_read_dir,
readdir: capifs_root_readdir,
.read = generic_read_dir,
.readdir = capifs_root_readdir,
};
struct inode_operations capifs_root_inode_operations = {
lookup: capifs_root_lookup,
.lookup = capifs_root_lookup,
};
static struct dentry_operations capifs_dentry_operations = {
d_revalidate: capifs_revalidate,
.d_revalidate = capifs_revalidate,
};
/*
......@@ -222,8 +222,8 @@ static void capifs_put_super(struct super_block *sb)
}
static struct super_operations capifs_sops = {
put_super: capifs_put_super,
statfs: simple_statfs,
.put_super = capifs_put_super,
.statfs = simple_statfs,
};
static int capifs_parse_options(char *options, struct capifs_sb_info *sbi)
......@@ -371,10 +371,10 @@ static struct super_block *capifs_get_sb(struct file_system_type *fs_type,
}
static struct file_system_type capifs_fs_type = {
owner: THIS_MODULE,
name: "capifs",
get_sb: capifs_get_sb,
kill_sb: kill_anon_super,
.owner = THIS_MODULE,
.name = "capifs",
.get_sb = capifs_get_sb,
.kill_sb = kill_anon_super,
};
void capifs_new_ncci(char type, unsigned int num, kdev_t device)
......
......@@ -90,17 +90,17 @@ static int contrstats_show(struct seq_file *seq, void *v)
}
struct seq_operations seq_controller_ops = {
start: controller_start,
next: controller_next,
stop: controller_stop,
show: controller_show,
.start = controller_start,
.next = controller_next,
.stop = controller_stop,
.show = controller_show,
};
struct seq_operations seq_contrstats_ops = {
start: controller_start,
next: controller_next,
stop: controller_stop,
show: contrstats_show,
.start = controller_start,
.next = controller_next,
.stop = controller_stop,
.show = contrstats_show,
};
static int seq_controller_open(struct inode *inode, struct file *file)
......@@ -114,17 +114,17 @@ static int seq_contrstats_open(struct inode *inode, struct file *file)
}
static struct file_operations proc_controller_ops = {
open: seq_controller_open,
read: seq_read,
llseek: seq_lseek,
release: seq_release,
.open = seq_controller_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static struct file_operations proc_contrstats_ops = {
open: seq_contrstats_open,
read: seq_read,
llseek: seq_lseek,
release: seq_release,
.open = seq_contrstats_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
// /proc/capi/applications:
......@@ -193,17 +193,17 @@ applstats_show(struct seq_file *seq, void *v)
}
struct seq_operations seq_applications_ops = {
start: applications_start,
next: applications_next,
stop: applications_stop,
show: applications_show,
.start = applications_start,
.next = applications_next,
.stop = applications_stop,
.show = applications_show,
};
struct seq_operations seq_applstats_ops = {
start: applications_start,
next: applications_next,
stop: applications_stop,
show: applstats_show,
.start = applications_start,
.next = applications_next,
.stop = applications_stop,
.show = applstats_show,
};
static int
......@@ -219,17 +219,17 @@ seq_applstats_open(struct inode *inode, struct file *file)
}
static struct file_operations proc_applications_ops = {
open: seq_applications_open,
read: seq_read,
llseek: seq_lseek,
release: seq_release,
.open = seq_applications_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static struct file_operations proc_applstats_ops = {
open: seq_applstats_open,
read: seq_read,
llseek: seq_lseek,
release: seq_release,
.open = seq_applstats_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static void
......
......@@ -261,14 +261,14 @@ isdn_divert_ioctl(struct inode *inode, struct file *file,
#ifdef CONFIG_PROC_FS
static struct file_operations isdn_fops =
{
owner: THIS_MODULE,
llseek: no_llseek,
read: isdn_divert_read,
write: isdn_divert_write,
poll: isdn_divert_poll,
ioctl: isdn_divert_ioctl,
open: isdn_divert_open,
release: isdn_divert_close,
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = isdn_divert_read,
.write = isdn_divert_write,
.poll = isdn_divert_poll,
.ioctl = isdn_divert_ioctl,
.open = isdn_divert_open,
.release = isdn_divert_close,
};
/****************************/
......
......@@ -352,10 +352,10 @@ static void __devexit b1pci_pci_remove(struct pci_dev *pdev)
}
static struct pci_driver b1pci_pci_driver = {
name: "b1pci",
id_table: b1pci_pci_tbl,
probe: b1pci_pci_probe,
remove: __devexit_p(b1pci_pci_remove),
.name = "b1pci",
.id_table = b1pci_pci_tbl,
.probe = b1pci_pci_probe,
.remove = __devexit_p(b1pci_pci_remove),
};
static int __init b1pci_init(void)
......
......@@ -1232,10 +1232,10 @@ static int __devinit c4_probe(struct pci_dev *dev,
}
static struct pci_driver c4_pci_driver = {
name: "c4",
id_table: c4_pci_tbl,
probe: c4_probe,
remove: c4_remove,
.name = "c4",
.id_table = c4_pci_tbl,
.probe = c4_probe,
.remove = c4_remove,
};
static int __init c4_init(void)
......
......@@ -215,10 +215,10 @@ static int __devinit t1pci_probe(struct pci_dev *dev,
}
static struct pci_driver t1pci_pci_driver = {
name: "t1pci",
id_table: t1pci_pci_tbl,
probe: t1pci_probe,
remove: t1pci_remove,
.name = "t1pci",
.id_table = t1pci_pci_tbl,
.probe = t1pci_probe,
.remove = t1pci_remove,
};
static int __init t1pci_init(void)
......
......@@ -944,17 +944,17 @@ static void __devexit fcpnp_remove(struct pci_dev *pdev)
}
static struct pci_driver fcpci_driver = {
name: "fcpci",
probe: fcpci_probe,
remove: __devexit_p(fcpci_remove),
id_table: fcpci_ids,
.name = "fcpci",
.probe = fcpci_probe,
.remove = __devexit_p(fcpci_remove),
.id_table = fcpci_ids,
};
static struct isapnp_driver fcpnp_driver = {
name: "fcpnp",
probe: fcpnp_probe,
remove: __devexit_p(fcpnp_remove),
id_table: fcpnp_ids,
.name = "fcpnp",
.probe = fcpnp_probe,
.remove = __devexit_p(fcpnp_remove),
.id_table = fcpnp_ids,
};
static int __init hisax_fcpcipnp_init(void)
......
......@@ -40,12 +40,12 @@ MODULE_AUTHOR("Kai Germaschewski <kai.germaschewski@gmx.de>/Werner Cornelius <we
MODULE_DESCRIPTION("HFC PCI ISDN driver");
#define ID(ven, dev, name) \
{ vendor: PCI_VENDOR_ID_##ven, \
device: PCI_DEVICE_ID_##dev, \
subvendor: PCI_ANY_ID, \
subdevice: PCI_ANY_ID, \
class: 0, \
class_mask: 0, \
{ .vendor = PCI_VENDOR_ID_##ven, \
.device = PCI_DEVICE_ID_##dev, \
.subvendor = PCI_ANY_ID, \
.subdevice = PCI_ANY_ID, \
.class = 0, \
.class_mask = 0, \
driver_data: (unsigned long) name }
static struct pci_device_id hfcpci_ids[] __devinitdata = {
......@@ -1604,10 +1604,10 @@ static void __devexit hfcpci_remove(struct pci_dev *pdev)
}
static struct pci_driver hfcpci_driver = {
name: "hfcpci",
probe: hfcpci_probe,
remove: hfcpci_remove,
id_table: hfcpci_ids,
.name = "hfcpci",
.probe = hfcpci_probe,
.remove = hfcpci_remove,
.id_table = hfcpci_ids,
};
static int __init hisax_hfcpci_init(void)
......
......@@ -176,10 +176,10 @@ static struct usb_device_id st5481_ids[] = {
MODULE_DEVICE_TABLE (usb, st5481_ids);
static struct usb_driver st5481_usb_driver = {
name: "st5481_usb",
probe: probe_st5481,
disconnect: __devexit_p(disconnect_st5481),
id_table: st5481_ids,
.name = "st5481_usb",
.probe = probe_st5481,
.disconnect = __devexit_p(disconnect_st5481),
.id_table = st5481_ids,
};
static int __init st5481_usb_init(void)
......
......@@ -377,11 +377,11 @@ hysdn_conf_close(struct inode *ino, struct file *filep)
/******************************************************/
static struct file_operations conf_fops =
{
llseek: no_llseek,
read: hysdn_conf_read,
write: hysdn_conf_write,
open: hysdn_conf_open,
release: hysdn_conf_close,
.llseek = no_llseek,
.read = hysdn_conf_read,
.write = hysdn_conf_write,
.open = hysdn_conf_open,
.release = hysdn_conf_close,
};
/*****************************/
......
......@@ -389,12 +389,12 @@ hysdn_log_poll(struct file *file, poll_table * wait)
/**************************************************/
static struct file_operations log_fops =
{
llseek: no_llseek,
read: hysdn_log_read,
write: hysdn_log_write,
poll: hysdn_log_poll,
open: hysdn_log_open,
release: hysdn_log_close,
.llseek = no_llseek,
.read = hysdn_log_read,
.write = hysdn_log_write,
.poll = hysdn_log_poll,
.open = hysdn_log_open,
.release = hysdn_log_close,
};
......
......@@ -1090,14 +1090,14 @@ isdn_status_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
static struct file_operations isdn_status_fops =
{
owner: THIS_MODULE,
llseek: no_llseek,
read: isdn_status_read,
write: isdn_status_write,
poll: isdn_status_poll,
ioctl: isdn_status_ioctl,
open: isdn_status_open,
release: isdn_status_release,
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = isdn_status_read,
.write = isdn_status_write,
.poll = isdn_status_poll,
.ioctl = isdn_status_ioctl,
.open = isdn_status_open,
.release = isdn_status_release,
};
/*
......@@ -1609,14 +1609,14 @@ isdn_ctrl_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
static struct file_operations isdn_ctrl_fops =
{
owner: THIS_MODULE,
llseek: no_llseek,
read: isdn_ctrl_read,
write: isdn_ctrl_write,
poll: isdn_ctrl_poll,
ioctl: isdn_ctrl_ioctl,
open: isdn_ctrl_open,
release: isdn_ctrl_release,
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = isdn_ctrl_read,
.write = isdn_ctrl_write,
.poll = isdn_ctrl_poll,
.ioctl = isdn_ctrl_ioctl,
.open = isdn_ctrl_open,
.release = isdn_ctrl_release,
};
/*
......@@ -1661,8 +1661,8 @@ isdn_open(struct inode * inode, struct file * file)
static struct file_operations isdn_fops =
{
owner: THIS_MODULE,
open: isdn_open,
.owner = THIS_MODULE,
.open = isdn_open,
};
char *
......
......@@ -852,14 +852,14 @@ isdn_ppp_write(struct file *file, const char *buf, size_t count, loff_t *off)
struct file_operations isdn_ppp_fops =
{
owner: THIS_MODULE,
llseek: no_llseek,
read: isdn_ppp_read,
write: isdn_ppp_write,
poll: isdn_ppp_poll,
ioctl: isdn_ppp_ioctl,
open: isdn_ppp_open,
release: isdn_ppp_release,
.owner = THIS_MODULE,
.llseek = no_llseek,
.read = isdn_ppp_read,
.write = isdn_ppp_write,
.poll = isdn_ppp_poll,
.ioctl = isdn_ppp_ioctl,
.open = isdn_ppp_open,
.release = isdn_ppp_release,
};
/*
......
......@@ -251,10 +251,10 @@ static struct pci_device_id tpam_pci_tbl[] __devinitdata = {
MODULE_DEVICE_TABLE(pci, tpam_pci_tbl);
static struct pci_driver tpam_driver = {
name: "tpam",
id_table: tpam_pci_tbl,
probe: tpam_probe,
remove: __devexit_p(tpam_remove),
.name = "tpam",
.id_table = tpam_pci_tbl,
.probe = tpam_probe,
.remove = __devexit_p(tpam_remove),
};
static int __init tpam_init(void) {
......
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