Commit 96fe8821 authored by Art Haas's avatar Art Haas Committed by Greg Kroah-Hartman

[PATCH] C99 initializers for drivers/usb/serial

Here are patches for switching two files over to use C99 initializers.
The patches are against 2.5.50.
parent 908535cf
...@@ -98,91 +98,91 @@ static struct usb_device_id id_table_combined [] = { ...@@ -98,91 +98,91 @@ static struct usb_device_id id_table_combined [] = {
MODULE_DEVICE_TABLE (usb, id_table_combined); MODULE_DEVICE_TABLE (usb, id_table_combined);
static struct usb_serial_device_type edgeport_1port_device = { static struct usb_serial_device_type edgeport_1port_device = {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "Edgeport 1 port adapter", .name = "Edgeport 1 port adapter",
id_table: edgeport_1port_id_table, .id_table = edgeport_1port_id_table,
num_interrupt_in: 1, .num_interrupt_in = 1,
num_bulk_in: 1, .num_bulk_in = 1,
num_bulk_out: 1, .num_bulk_out = 1,
num_ports: 1, .num_ports = 1,
open: edge_open, .open = edge_open,
close: edge_close, .close = edge_close,
throttle: edge_throttle, .throttle = edge_throttle,
unthrottle: edge_unthrottle, .unthrottle = edge_unthrottle,
attach: edge_startup, .attach = edge_startup,
shutdown: edge_shutdown, .shutdown = edge_shutdown,
ioctl: edge_ioctl, .ioctl = edge_ioctl,
set_termios: edge_set_termios, .set_termios = edge_set_termios,
write: edge_write, .write = edge_write,
write_room: edge_write_room, .write_room = edge_write_room,
chars_in_buffer: edge_chars_in_buffer, .chars_in_buffer = edge_chars_in_buffer,
break_ctl: edge_break, .break_ctl = edge_break,
}; };
static struct usb_serial_device_type edgeport_2port_device = { static struct usb_serial_device_type edgeport_2port_device = {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "Edgeport 2 port adapter", .name = "Edgeport 2 port adapter",
id_table: edgeport_2port_id_table, .id_table = edgeport_2port_id_table,
num_interrupt_in: 1, .num_interrupt_in = 1,
num_bulk_in: 1, .num_bulk_in = 1,
num_bulk_out: 1, .num_bulk_out = 1,
num_ports: 2, .num_ports = 2,
open: edge_open, .open = edge_open,
close: edge_close, .close = edge_close,
throttle: edge_throttle, .throttle = edge_throttle,
unthrottle: edge_unthrottle, .unthrottle = edge_unthrottle,
attach: edge_startup, .attach = edge_startup,
shutdown: edge_shutdown, .shutdown = edge_shutdown,
ioctl: edge_ioctl, .ioctl = edge_ioctl,
set_termios: edge_set_termios, .set_termios = edge_set_termios,
write: edge_write, .write = edge_write,
write_room: edge_write_room, .write_room = edge_write_room,
chars_in_buffer: edge_chars_in_buffer, .chars_in_buffer = edge_chars_in_buffer,
break_ctl: edge_break, .break_ctl = edge_break,
}; };
static struct usb_serial_device_type edgeport_4port_device = { static struct usb_serial_device_type edgeport_4port_device = {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "Edgeport 4 port adapter", .name = "Edgeport 4 port adapter",
id_table: edgeport_4port_id_table, .id_table = edgeport_4port_id_table,
num_interrupt_in: 1, .num_interrupt_in = 1,
num_bulk_in: 1, .num_bulk_in = 1,
num_bulk_out: 1, .num_bulk_out = 1,
num_ports: 4, .num_ports = 4,
open: edge_open, .open = edge_open,
close: edge_close, .close = edge_close,
throttle: edge_throttle, .throttle = edge_throttle,
unthrottle: edge_unthrottle, .unthrottle = edge_unthrottle,
attach: edge_startup, .attach = edge_startup,
shutdown: edge_shutdown, .shutdown = edge_shutdown,
ioctl: edge_ioctl, .ioctl = edge_ioctl,
set_termios: edge_set_termios, .set_termios = edge_set_termios,
write: edge_write, .write = edge_write,
write_room: edge_write_room, .write_room = edge_write_room,
chars_in_buffer: edge_chars_in_buffer, .chars_in_buffer = edge_chars_in_buffer,
break_ctl: edge_break, .break_ctl = edge_break,
}; };
static struct usb_serial_device_type edgeport_8port_device = { static struct usb_serial_device_type edgeport_8port_device = {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "Edgeport 8 port adapter", .name = "Edgeport 8 port adapter",
id_table: edgeport_8port_id_table, .id_table = edgeport_8port_id_table,
num_interrupt_in: 1, .num_interrupt_in = 1,
num_bulk_in: 1, .num_bulk_in = 1,
num_bulk_out: 1, .num_bulk_out = 1,
num_ports: 8, .num_ports = 8,
open: edge_open, .open = edge_open,
close: edge_close, .close = edge_close,
throttle: edge_throttle, .throttle = edge_throttle,
unthrottle: edge_unthrottle, .unthrottle = edge_unthrottle,
attach: edge_startup, .attach = edge_startup,
shutdown: edge_shutdown, .shutdown = edge_shutdown,
ioctl: edge_ioctl, .ioctl = edge_ioctl,
set_termios: edge_set_termios, .set_termios = edge_set_termios,
write: edge_write, .write = edge_write,
write_room: edge_write_room, .write_room = edge_write_room,
chars_in_buffer: edge_chars_in_buffer, .chars_in_buffer = edge_chars_in_buffer,
break_ctl: edge_break, .break_ctl = edge_break,
}; };
#endif #endif
......
This diff is collapsed.
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