Commit 5b6797cb authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds

[PATCH] Designated initializers for drivers_bluetooth

The old form of designated initializers are obsolete: we need to
replace them with the ISO C forms before 2.6.  Gcc has always supported
both forms anyway.
parent 70851335
...@@ -253,13 +253,13 @@ static int h4_recv(struct n_hci *n_hci, void *data, int count) ...@@ -253,13 +253,13 @@ static int h4_recv(struct n_hci *n_hci, void *data, int count)
} }
static struct hci_uart_proto h4p = { static struct hci_uart_proto h4p = {
id: HCI_UART_H4, .id = HCI_UART_H4,
open: h4_open, .open = h4_open,
close: h4_close, .close = h4_close,
send: h4_send, .send = h4_send,
recv: h4_recv, .recv = h4_recv,
preq: h4_preq, .preq = h4_preq,
flush: h4_flush, .flush = h4_flush,
}; };
int h4_init(void) int h4_init(void)
......
...@@ -828,10 +828,10 @@ static void hci_usb_disconnect(struct usb_interface *intf) ...@@ -828,10 +828,10 @@ static void hci_usb_disconnect(struct usb_interface *intf)
} }
static struct usb_driver hci_usb_driver = { static struct usb_driver hci_usb_driver = {
name: "hci_usb", .name = "hci_usb",
probe: hci_usb_probe, .probe = hci_usb_probe,
disconnect: hci_usb_disconnect, .disconnect = hci_usb_disconnect,
id_table: usb_bluetooth_ids, .id_table = usb_bluetooth_ids,
}; };
int hci_usb_init(void) int hci_usb_init(void)
......
...@@ -311,15 +311,15 @@ static int hci_vhci_chr_close(struct inode *inode, struct file *file) ...@@ -311,15 +311,15 @@ static int hci_vhci_chr_close(struct inode *inode, struct file *file)
} }
static struct file_operations hci_vhci_fops = { static struct file_operations hci_vhci_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
llseek: hci_vhci_chr_lseek, .llseek = hci_vhci_chr_lseek,
read: hci_vhci_chr_read, .read = hci_vhci_chr_read,
write: hci_vhci_chr_write, .write = hci_vhci_chr_write,
poll: hci_vhci_chr_poll, .poll = hci_vhci_chr_poll,
ioctl: hci_vhci_chr_ioctl, .ioctl = hci_vhci_chr_ioctl,
open: hci_vhci_chr_open, .open = hci_vhci_chr_open,
release:hci_vhci_chr_close, .release = hci_vhci_chr_close,
fasync: hci_vhci_chr_fasync .fasync = hci_vhci_chr_fasync
}; };
static struct miscdevice hci_vhci_miscdev= static struct miscdevice hci_vhci_miscdev=
......
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