Commit 383a9da3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB serial drivers: changed startup() to attach() due to usbserial api change.

parent ececd9bc
...@@ -129,7 +129,7 @@ static struct usb_serial_device_type belkin_device = { ...@@ -129,7 +129,7 @@ static struct usb_serial_device_type belkin_device = {
ioctl: belkin_sa_ioctl, ioctl: belkin_sa_ioctl,
set_termios: belkin_sa_set_termios, set_termios: belkin_sa_set_termios,
break_ctl: belkin_sa_break_ctl, break_ctl: belkin_sa_break_ctl,
startup: belkin_sa_startup, attach: belkin_sa_startup,
shutdown: belkin_sa_shutdown, shutdown: belkin_sa_shutdown,
}; };
......
...@@ -81,7 +81,7 @@ static struct usb_serial_device_type cyberjack_device = { ...@@ -81,7 +81,7 @@ static struct usb_serial_device_type cyberjack_device = {
num_bulk_in: 1, num_bulk_in: 1,
num_bulk_out: 1, num_bulk_out: 1,
num_ports: 1, num_ports: 1,
startup: cyberjack_startup, attach: cyberjack_startup,
shutdown: cyberjack_shutdown, shutdown: cyberjack_shutdown,
open: cyberjack_open, open: cyberjack_open,
close: cyberjack_close, close: cyberjack_close,
......
...@@ -517,7 +517,7 @@ static struct usb_serial_device_type digi_acceleport_2_device = { ...@@ -517,7 +517,7 @@ static struct usb_serial_device_type digi_acceleport_2_device = {
ioctl: digi_ioctl, ioctl: digi_ioctl,
set_termios: digi_set_termios, set_termios: digi_set_termios,
break_ctl: digi_break_ctl, break_ctl: digi_break_ctl,
startup: digi_startup, attach: digi_startup,
shutdown: digi_shutdown, shutdown: digi_shutdown,
}; };
...@@ -541,7 +541,7 @@ static struct usb_serial_device_type digi_acceleport_4_device = { ...@@ -541,7 +541,7 @@ static struct usb_serial_device_type digi_acceleport_4_device = {
ioctl: digi_ioctl, ioctl: digi_ioctl,
set_termios: digi_set_termios, set_termios: digi_set_termios,
break_ctl: digi_break_ctl, break_ctl: digi_break_ctl,
startup: digi_startup, attach: digi_startup,
shutdown: digi_shutdown, shutdown: digi_shutdown,
}; };
......
...@@ -122,7 +122,7 @@ static struct usb_serial_device_type empeg_device = { ...@@ -122,7 +122,7 @@ static struct usb_serial_device_type empeg_device = {
close: empeg_close, close: empeg_close,
throttle: empeg_throttle, throttle: empeg_throttle,
unthrottle: empeg_unthrottle, unthrottle: empeg_unthrottle,
startup: empeg_startup, attach: empeg_startup,
shutdown: empeg_shutdown, shutdown: empeg_shutdown,
ioctl: empeg_ioctl, ioctl: empeg_ioctl,
set_termios: empeg_set_termios, set_termios: empeg_set_termios,
......
...@@ -189,7 +189,7 @@ static struct usb_serial_device_type ftdi_sio_device = { ...@@ -189,7 +189,7 @@ static struct usb_serial_device_type ftdi_sio_device = {
ioctl: ftdi_sio_ioctl, ioctl: ftdi_sio_ioctl,
set_termios: ftdi_sio_set_termios, set_termios: ftdi_sio_set_termios,
break_ctl: ftdi_sio_break_ctl, break_ctl: ftdi_sio_break_ctl,
startup: ftdi_sio_startup, attach: ftdi_sio_startup,
shutdown: ftdi_sio_shutdown, shutdown: ftdi_sio_shutdown,
}; };
...@@ -210,7 +210,7 @@ static struct usb_serial_device_type ftdi_8U232AM_device = { ...@@ -210,7 +210,7 @@ static struct usb_serial_device_type ftdi_8U232AM_device = {
ioctl: ftdi_sio_ioctl, ioctl: ftdi_sio_ioctl,
set_termios: ftdi_sio_set_termios, set_termios: ftdi_sio_set_termios,
break_ctl: ftdi_sio_break_ctl, break_ctl: ftdi_sio_break_ctl,
startup: ftdi_8U232AM_startup, attach: ftdi_8U232AM_startup,
shutdown: ftdi_sio_shutdown, shutdown: ftdi_sio_shutdown,
}; };
......
...@@ -109,7 +109,7 @@ static struct usb_serial_device_type edgeport_1port_device = { ...@@ -109,7 +109,7 @@ static struct usb_serial_device_type edgeport_1port_device = {
close: edge_close, close: edge_close,
throttle: edge_throttle, throttle: edge_throttle,
unthrottle: edge_unthrottle, unthrottle: edge_unthrottle,
startup: 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,
...@@ -131,7 +131,7 @@ static struct usb_serial_device_type edgeport_2port_device = { ...@@ -131,7 +131,7 @@ static struct usb_serial_device_type edgeport_2port_device = {
close: edge_close, close: edge_close,
throttle: edge_throttle, throttle: edge_throttle,
unthrottle: edge_unthrottle, unthrottle: edge_unthrottle,
startup: 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,
...@@ -153,7 +153,7 @@ static struct usb_serial_device_type edgeport_4port_device = { ...@@ -153,7 +153,7 @@ static struct usb_serial_device_type edgeport_4port_device = {
close: edge_close, close: edge_close,
throttle: edge_throttle, throttle: edge_throttle,
unthrottle: edge_unthrottle, unthrottle: edge_unthrottle,
startup: 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,
...@@ -175,7 +175,7 @@ static struct usb_serial_device_type edgeport_8port_device = { ...@@ -175,7 +175,7 @@ static struct usb_serial_device_type edgeport_8port_device = {
close: edge_close, close: edge_close,
throttle: edge_throttle, throttle: edge_throttle,
unthrottle: edge_unthrottle, unthrottle: edge_unthrottle,
startup: 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,
......
...@@ -99,7 +99,7 @@ struct usb_serial_device_type ipaq_device = { ...@@ -99,7 +99,7 @@ struct usb_serial_device_type ipaq_device = {
num_ports: 1, num_ports: 1,
open: ipaq_open, open: ipaq_open,
close: ipaq_close, close: ipaq_close,
startup: ipaq_startup, attach: ipaq_startup,
shutdown: ipaq_shutdown, shutdown: ipaq_shutdown,
write: ipaq_write, write: ipaq_write,
write_room: ipaq_write_room, write_room: ipaq_write_room,
......
...@@ -139,7 +139,7 @@ struct usb_serial_device_type ir_device = { ...@@ -139,7 +139,7 @@ struct usb_serial_device_type ir_device = {
num_bulk_out: 1, num_bulk_out: 1,
num_ports: 1, num_ports: 1,
set_termios: ir_set_termios, set_termios: ir_set_termios,
startup: ir_startup, attach: ir_startup,
open: ir_open, open: ir_open,
close: ir_close, close: ir_close,
write: ir_write, write: ir_write,
......
...@@ -479,7 +479,7 @@ static struct usb_serial_device_type keyspan_pre_device = { ...@@ -479,7 +479,7 @@ static struct usb_serial_device_type keyspan_pre_device = {
num_bulk_in: NUM_DONT_CARE, num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE, num_bulk_out: NUM_DONT_CARE,
num_ports: 1, num_ports: 1,
startup: keyspan_fake_startup, attach: keyspan_fake_startup,
}; };
static struct usb_serial_device_type keyspan_1port_device = { static struct usb_serial_device_type keyspan_1port_device = {
...@@ -500,7 +500,7 @@ static struct usb_serial_device_type keyspan_1port_device = { ...@@ -500,7 +500,7 @@ static struct usb_serial_device_type keyspan_1port_device = {
ioctl: keyspan_ioctl, ioctl: keyspan_ioctl,
set_termios: keyspan_set_termios, set_termios: keyspan_set_termios,
break_ctl: keyspan_break_ctl, break_ctl: keyspan_break_ctl,
startup: keyspan_startup, attach: keyspan_startup,
shutdown: keyspan_shutdown, shutdown: keyspan_shutdown,
}; };
...@@ -521,7 +521,7 @@ static struct usb_serial_device_type keyspan_2port_device = { ...@@ -521,7 +521,7 @@ static struct usb_serial_device_type keyspan_2port_device = {
unthrottle: keyspan_rx_unthrottle, unthrottle: keyspan_rx_unthrottle,
ioctl: keyspan_ioctl, ioctl: keyspan_ioctl,
set_termios: keyspan_set_termios, set_termios: keyspan_set_termios,
startup: keyspan_startup, attach: keyspan_startup,
shutdown: keyspan_shutdown, shutdown: keyspan_shutdown,
}; };
...@@ -543,7 +543,7 @@ static struct usb_serial_device_type keyspan_4port_device = { ...@@ -543,7 +543,7 @@ static struct usb_serial_device_type keyspan_4port_device = {
ioctl: keyspan_ioctl, ioctl: keyspan_ioctl,
set_termios: keyspan_set_termios, set_termios: keyspan_set_termios,
break_ctl: keyspan_break_ctl, break_ctl: keyspan_break_ctl,
startup: keyspan_startup, attach: keyspan_startup,
shutdown: keyspan_shutdown, shutdown: keyspan_shutdown,
}; };
......
...@@ -811,7 +811,7 @@ static struct usb_serial_device_type keyspan_pda_fake_device = { ...@@ -811,7 +811,7 @@ static struct usb_serial_device_type keyspan_pda_fake_device = {
num_bulk_in: NUM_DONT_CARE, num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE, num_bulk_out: NUM_DONT_CARE,
num_ports: 1, num_ports: 1,
startup: keyspan_pda_fake_startup, attach: keyspan_pda_fake_startup,
}; };
#endif #endif
...@@ -824,7 +824,7 @@ static struct usb_serial_device_type xircom_pgs_fake_device = { ...@@ -824,7 +824,7 @@ static struct usb_serial_device_type xircom_pgs_fake_device = {
num_bulk_in: NUM_DONT_CARE, num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE, num_bulk_out: NUM_DONT_CARE,
num_ports: 1, num_ports: 1,
startup: keyspan_pda_fake_startup, attach: keyspan_pda_fake_startup,
}; };
#endif #endif
...@@ -848,7 +848,7 @@ static struct usb_serial_device_type keyspan_pda_device = { ...@@ -848,7 +848,7 @@ static struct usb_serial_device_type keyspan_pda_device = {
ioctl: keyspan_pda_ioctl, ioctl: keyspan_pda_ioctl,
set_termios: keyspan_pda_set_termios, set_termios: keyspan_pda_set_termios,
break_ctl: keyspan_pda_break_ctl, break_ctl: keyspan_pda_break_ctl,
startup: keyspan_pda_startup, attach: keyspan_pda_startup,
shutdown: keyspan_pda_shutdown, shutdown: keyspan_pda_shutdown,
}; };
......
...@@ -136,7 +136,7 @@ static struct usb_serial_device_type kl5kusb105d_device = { ...@@ -136,7 +136,7 @@ static struct usb_serial_device_type kl5kusb105d_device = {
ioctl: klsi_105_ioctl, ioctl: klsi_105_ioctl,
set_termios: klsi_105_set_termios, set_termios: klsi_105_set_termios,
/*break_ctl: klsi_105_break_ctl,*/ /*break_ctl: klsi_105_break_ctl,*/
startup: klsi_105_startup, attach: klsi_105_startup,
shutdown: klsi_105_shutdown, shutdown: klsi_105_shutdown,
throttle: klsi_105_throttle, throttle: klsi_105_throttle,
unthrottle: klsi_105_unthrottle, unthrottle: klsi_105_unthrottle,
......
...@@ -158,7 +158,7 @@ static struct usb_serial_device_type mct_u232_device = { ...@@ -158,7 +158,7 @@ static struct usb_serial_device_type mct_u232_device = {
ioctl: mct_u232_ioctl, ioctl: mct_u232_ioctl,
set_termios: mct_u232_set_termios, set_termios: mct_u232_set_termios,
break_ctl: mct_u232_break_ctl, break_ctl: mct_u232_break_ctl,
startup: mct_u232_startup, attach: mct_u232_startup,
shutdown: mct_u232_shutdown, shutdown: mct_u232_shutdown,
}; };
......
...@@ -134,7 +134,7 @@ static struct usb_serial_device_type pl2303_device = { ...@@ -134,7 +134,7 @@ static struct usb_serial_device_type pl2303_device = {
read_bulk_callback: pl2303_read_bulk_callback, read_bulk_callback: pl2303_read_bulk_callback,
read_int_callback: pl2303_read_int_callback, read_int_callback: pl2303_read_int_callback,
write_bulk_callback: pl2303_write_bulk_callback, write_bulk_callback: pl2303_write_bulk_callback,
startup: pl2303_startup, attach: pl2303_startup,
shutdown: pl2303_shutdown, shutdown: pl2303_shutdown,
}; };
......
...@@ -409,7 +409,7 @@ static struct usb_serial_device_type safe_device = { ...@@ -409,7 +409,7 @@ static struct usb_serial_device_type safe_device = {
write: safe_write, write: safe_write,
write_room: safe_write_room, write_room: safe_write_room,
read_bulk_callback: safe_read_bulk_callback, read_bulk_callback: safe_read_bulk_callback,
startup: safe_startup, attach: safe_startup,
}; };
static int __init safe_init (void) static int __init safe_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