Commit 53333cc1 authored by Art Haas's avatar Art Haas Committed by Linus Torvalds

[PATCH] C99 designated initializers for drivers/usb

Hi.

Here's a set of three patches for switching  ...

drivers/usb/serial/io_ti.c
drivers/usb/net/usbnet.c
drivers/usb/core/hub.c

... to use C99 named initializers. The patches are all against 2.5.42.
parent 7a70f3f9
...@@ -1069,10 +1069,10 @@ static int usb_hub_thread(void *__hub) ...@@ -1069,10 +1069,10 @@ static int usb_hub_thread(void *__hub)
} }
static struct usb_device_id hub_id_table [] = { static struct usb_device_id hub_id_table [] = {
{ match_flags: USB_DEVICE_ID_MATCH_DEV_CLASS, { .match_flags = USB_DEVICE_ID_MATCH_DEV_CLASS,
bDeviceClass: USB_CLASS_HUB}, .bDeviceClass = USB_CLASS_HUB},
{ match_flags: USB_DEVICE_ID_MATCH_INT_CLASS, { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
bInterfaceClass: USB_CLASS_HUB}, .bInterfaceClass = USB_CLASS_HUB},
{ } /* Terminating entry */ { } /* Terminating entry */
}; };
......
...@@ -2092,7 +2092,7 @@ static const struct usb_device_id products [] = { ...@@ -2092,7 +2092,7 @@ static const struct usb_device_id products [] = {
#ifdef CONFIG_USB_EPSON2888 #ifdef CONFIG_USB_EPSON2888
{ {
USB_DEVICE (0x0525, 0x2888), // EPSON USB client USB_DEVICE (0x0525, 0x2888), // EPSON USB client
driver_info: (unsigned long) &epson2888_info, .driver_info = (unsigned long) &epson2888_info,
}, },
#endif #endif
......
...@@ -2617,47 +2617,47 @@ static void edge_shutdown (struct usb_serial *serial) ...@@ -2617,47 +2617,47 @@ static void edge_shutdown (struct usb_serial *serial)
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 TI 1 port adapter", .name = "Edgeport TI 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 TI 2 port adapter", .name = "Edgeport TI 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: 2, .num_bulk_in = 2,
num_bulk_out: 2, .num_bulk_out = 2,
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,
}; };
......
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