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

diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index 66b777559d616bc5cd221135a6299e647ce9e058..1b95a25f286b5354a380dd4fe601494f016a9a58 100644 (file)
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -129,7 +129,7 @@ static struct usb_serial_device_type belkin_device = {
        ioctl:                  belkin_sa_ioctl,
        set_termios:            belkin_sa_set_termios,
        break_ctl:              belkin_sa_break_ctl,
-       startup:                belkin_sa_startup,
+       attach:                 belkin_sa_startup,
        shutdown:               belkin_sa_shutdown,
 };
 

diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index b27abfbde79a5e2a0feabd88edc8cd8a7373ad37..9ca8b075f0071ffc25519f132aaf10d7abae9273 100644 (file)
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -81,7 +81,7 @@ static struct usb_serial_device_type cyberjack_device = {
        num_bulk_in:            1,
        num_bulk_out:           1,
        num_ports:              1,
-       startup:                cyberjack_startup,
+       attach:         cyberjack_startup,
        shutdown:               cyberjack_shutdown,
        open:                   cyberjack_open,
        close:                  cyberjack_close,

diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 9eeb135b10bdd1287ea40b55b229e95cadf99f26..4dd615fda3f7ad6cbdd839e86b69c2a22ed1658a 100644 (file)
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -517,7 +517,7 @@ static struct usb_serial_device_type digi_acceleport_2_device = {
        ioctl:                          digi_ioctl,
        set_termios:                    digi_set_termios,
        break_ctl:                      digi_break_ctl,
-       startup:                        digi_startup,
+       attach:                         digi_startup,
        shutdown:                       digi_shutdown,
 };
 
@@ -541,7 +541,7 @@ static struct usb_serial_device_type digi_acceleport_4_device = {
        ioctl:                          digi_ioctl,
        set_termios:                    digi_set_termios,
        break_ctl:                      digi_break_ctl,
-       startup:                        digi_startup,
+       attach:                         digi_startup,
        shutdown:                       digi_shutdown,
 };
 

diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index 321def93ed4e6b1ce12173acf7a926ff0f119424..ed3098a25392025c8f386705255329b6094e17d0 100644 (file)
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -122,7 +122,7 @@ static struct usb_serial_device_type empeg_device = {
        close:                  empeg_close,
        throttle:               empeg_throttle,
        unthrottle:             empeg_unthrottle,
-       startup:                empeg_startup,
+       attach:                 empeg_startup,
        shutdown:               empeg_shutdown,
        ioctl:                  empeg_ioctl,
        set_termios:            empeg_set_termios,

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 1f626f56c3f8a27a772d87296b60932fa77f17ae..b833b4577406b412154282556a5e0fe40f0b29ec 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -189,7 +189,7 @@ static struct usb_serial_device_type ftdi_sio_device = {
        ioctl:                  ftdi_sio_ioctl,
        set_termios:            ftdi_sio_set_termios,
        break_ctl:              ftdi_sio_break_ctl,
-       startup:                ftdi_sio_startup,
+       attach:                 ftdi_sio_startup,
         shutdown:               ftdi_sio_shutdown,
 };
 
@@ -210,7 +210,7 @@ static struct usb_serial_device_type ftdi_8U232AM_device = {
        ioctl:                  ftdi_sio_ioctl,
        set_termios:            ftdi_sio_set_termios,
        break_ctl:              ftdi_sio_break_ctl,
-       startup:                ftdi_8U232AM_startup,
+       attach:                 ftdi_8U232AM_startup,
         shutdown:               ftdi_sio_shutdown,
 };
 

diff --git a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h
index 92f12b38b1c4df15d5e688249d41550bd377750f..f50de482ed9c808600f3a55226b31fe57567ed82 100644 (file)
--- a/drivers/usb/serial/io_tables.h
+++ b/drivers/usb/serial/io_tables.h
@@ -109,7 +109,7 @@ static struct usb_serial_device_type edgeport_1port_device = {
        close:                  edge_close,
        throttle:               edge_throttle,
        unthrottle:             edge_unthrottle,
-       startup:                edge_startup,
+       attach:                 edge_startup,
        shutdown:               edge_shutdown,
        ioctl:                  edge_ioctl,
        set_termios:            edge_set_termios,
@@ -131,7 +131,7 @@ static struct usb_serial_device_type edgeport_2port_device = {
        close:                  edge_close,
        throttle:               edge_throttle,
        unthrottle:             edge_unthrottle,
-       startup:                edge_startup,
+       attach:                 edge_startup,
        shutdown:               edge_shutdown,
        ioctl:                  edge_ioctl,
        set_termios:            edge_set_termios,
@@ -153,7 +153,7 @@ static struct usb_serial_device_type edgeport_4port_device = {
        close:                  edge_close,
        throttle:               edge_throttle,
        unthrottle:             edge_unthrottle,
-       startup:                edge_startup,
+       attach:                 edge_startup,
        shutdown:               edge_shutdown,
        ioctl:                  edge_ioctl,
        set_termios:            edge_set_termios,
@@ -175,7 +175,7 @@ static struct usb_serial_device_type edgeport_8port_device = {
        close:                  edge_close,
        throttle:               edge_throttle,
        unthrottle:             edge_unthrottle,
-       startup:                edge_startup,
+       attach:                 edge_startup,
        shutdown:               edge_shutdown,
        ioctl:                  edge_ioctl,
        set_termios:            edge_set_termios,

diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index 6eda40f2fff70d2e4a84506fd53f23bc4705a53d..9323ffefb9d27336b44ef2b10eccd391c420a5fe 100644 (file)
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -99,7 +99,7 @@ struct usb_serial_device_type ipaq_device = {
        num_ports:              1,
        open:                   ipaq_open,
        close:                  ipaq_close,
-       startup:                ipaq_startup,
+       attach:                 ipaq_startup,
        shutdown:               ipaq_shutdown,
        write:                  ipaq_write,
        write_room:             ipaq_write_room,

diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index f1229f559ff7efb922a1d14d2c3ddf273d176a2b..e1c2bf7493e577ea56626af74adbd6edc416d523 100644 (file)
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -139,7 +139,7 @@ struct usb_serial_device_type ir_device = {
        num_bulk_out:           1,
        num_ports:              1,
        set_termios:            ir_set_termios,
-       startup:                ir_startup,
+       attach:                 ir_startup,
        open:                   ir_open,
        close:                  ir_close,
        write:                  ir_write,

diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index 76f1d938adcaa9082ab06c4160642f83b82533c0..7547a4b0585c94ff3c30ef5a763e004373cc9741 100644 (file)
--- a/drivers/usb/serial/keyspan.h
+++ b/drivers/usb/serial/keyspan.h
@@ -479,7 +479,7 @@ static struct usb_serial_device_type keyspan_pre_device = {
        num_bulk_in:            NUM_DONT_CARE,
        num_bulk_out:           NUM_DONT_CARE,
        num_ports:              1,
-       startup:                keyspan_fake_startup,
+       attach:                 keyspan_fake_startup,
 };
 
 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,
        set_termios:            keyspan_set_termios,
        break_ctl:              keyspan_break_ctl,
-       startup:                keyspan_startup,
+       attach:                 keyspan_startup,
        shutdown:               keyspan_shutdown,
 };
 
@@ -521,7 +521,7 @@ static struct usb_serial_device_type keyspan_2port_device = {
        unthrottle:             keyspan_rx_unthrottle,
        ioctl:                  keyspan_ioctl,
        set_termios:            keyspan_set_termios,
-       startup:                keyspan_startup,
+       attach:                 keyspan_startup,
        shutdown:               keyspan_shutdown,
 };
 
@@ -543,7 +543,7 @@ static struct usb_serial_device_type keyspan_4port_device = {
        ioctl:                  keyspan_ioctl,
        set_termios:            keyspan_set_termios,
        break_ctl:              keyspan_break_ctl,
-       startup:                keyspan_startup,
+       attach:                 keyspan_startup,
        shutdown:               keyspan_shutdown,
 };
 

diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index ee71618d6d88880222879d6e960a67e8c22be36c..b0dac088b9797d65d09ad8f792778ef3936b4acc 100644 (file)
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -811,7 +811,7 @@ static struct usb_serial_device_type keyspan_pda_fake_device = {
        num_bulk_in:            NUM_DONT_CARE,
        num_bulk_out:           NUM_DONT_CARE,
        num_ports:              1,
-       startup:                keyspan_pda_fake_startup,
+       attach:                 keyspan_pda_fake_startup,
 };
 #endif
 
@@ -824,7 +824,7 @@ static struct usb_serial_device_type xircom_pgs_fake_device = {
        num_bulk_in:            NUM_DONT_CARE,
        num_bulk_out:           NUM_DONT_CARE,
        num_ports:              1,
-       startup:                keyspan_pda_fake_startup,
+       attach:                 keyspan_pda_fake_startup,
 };
 #endif
 
@@ -848,7 +848,7 @@ static struct usb_serial_device_type keyspan_pda_device = {
        ioctl:                  keyspan_pda_ioctl,
        set_termios:            keyspan_pda_set_termios,
        break_ctl:              keyspan_pda_break_ctl,
-       startup:                keyspan_pda_startup,
+       attach:                 keyspan_pda_startup,
        shutdown:               keyspan_pda_shutdown,
 };
 

diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index c2470da026dbd0c7d7d279dec201a9e5ebad5b8a..201a6d0a385de71165a98b923a0eaf8f080123a7 100644 (file)
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -136,7 +136,7 @@ static struct usb_serial_device_type kl5kusb105d_device = {
        ioctl:               klsi_105_ioctl,
        set_termios:         klsi_105_set_termios,
        /*break_ctl:         klsi_105_break_ctl,*/
-       startup:             klsi_105_startup,
+       attach:              klsi_105_startup,
        shutdown:            klsi_105_shutdown,
        throttle:            klsi_105_throttle,
        unthrottle:          klsi_105_unthrottle,

diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index e1fdc9d562959a1bd9f86b5c6a82b77c64466494..1cfae646289688d181233337b341e1231516fd7f 100644 (file)
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -158,7 +158,7 @@ static struct usb_serial_device_type mct_u232_device = {
        ioctl:               mct_u232_ioctl,
        set_termios:         mct_u232_set_termios,
        break_ctl:           mct_u232_break_ctl,
-       startup:             mct_u232_startup,
+       attach:              mct_u232_startup,
        shutdown:            mct_u232_shutdown,
 };
 

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 32135432468ed70149ea8adc75781f8dd47bd5f8..fb3ffd06ad2d37c28e2d7072b7a38beaf3a0e75a 100644 (file)
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -134,7 +134,7 @@ static struct usb_serial_device_type pl2303_device = {
        read_bulk_callback:     pl2303_read_bulk_callback,
        read_int_callback:      pl2303_read_int_callback,
        write_bulk_callback:    pl2303_write_bulk_callback,
-       startup:                pl2303_startup,
+       attach:                 pl2303_startup,
        shutdown:               pl2303_shutdown,
 };
 

diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index 6f0e86a65ae276896d1674a9d17cddf3aa842965..bc1fe0713ab972ac3f18dab3b7941933bca6839f 100644 (file)
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@ -409,7 +409,7 @@ static struct usb_serial_device_type safe_device = {
        write:                  safe_write,
        write_room:             safe_write_room,
        read_bulk_callback:     safe_read_bulk_callback,
-       startup:                safe_startup,
+       attach:                 safe_startup,
 };
 
 static int __init safe_init (void)