diff options
Diffstat (limited to 'drivers/usb/serial/keyspan.c')
-rw-r--r-- | drivers/usb/serial/keyspan.c | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c index a442352d7b61..bc8dc203e818 100644 --- a/drivers/usb/serial/keyspan.c +++ b/drivers/usb/serial/keyspan.c | |||
@@ -25,73 +25,6 @@ | |||
25 | 25 | ||
26 | Tip 'o the hat to IBM (and previously Linuxcare :) for supporting | 26 | Tip 'o the hat to IBM (and previously Linuxcare :) for supporting |
27 | staff in their work on open source projects. | 27 | staff in their work on open source projects. |
28 | |||
29 | Change History | ||
30 | |||
31 | 2003sep04 LPM (Keyspan) add support for new single port product USA19HS. | ||
32 | Improve setup message handling for all devices. | ||
33 | |||
34 | Wed Feb 19 22:00:00 PST 2003 (Jeffrey S. Laing <keyspan@jsl.com>) | ||
35 | Merged the current (1/31/03) Keyspan code with the current (2.4.21-pre4) | ||
36 | Linux source tree. The Linux tree lacked support for the 49WLC and | ||
37 | others. The Keyspan patches didn't work with the current kernel. | ||
38 | |||
39 | 2003jan30 LPM add support for the 49WLC and MPR | ||
40 | |||
41 | Wed Apr 25 12:00:00 PST 2002 (Keyspan) | ||
42 | Started with Hugh Blemings' code dated Jan 17, 2002. All adapters | ||
43 | now supported (including QI and QW). Modified port open, port | ||
44 | close, and send setup() logic to fix various data and endpoint | ||
45 | synchronization bugs and device LED status bugs. Changed keyspan_ | ||
46 | write_room() to accurately return transmit buffer availability. | ||
47 | Changed forwardingLength from 1 to 16 for all adapters. | ||
48 | |||
49 | Fri Oct 12 16:45:00 EST 2001 | ||
50 | Preliminary USA-19QI and USA-28 support (both test OK for me, YMMV) | ||
51 | |||
52 | Wed Apr 25 12:00:00 PST 2002 (Keyspan) | ||
53 | Started with Hugh Blemings' code dated Jan 17, 2002. All adapters | ||
54 | now supported (including QI and QW). Modified port open, port | ||
55 | close, and send setup() logic to fix various data and endpoint | ||
56 | synchronization bugs and device LED status bugs. Changed keyspan_ | ||
57 | write_room() to accurately return transmit buffer availability. | ||
58 | Changed forwardingLength from 1 to 16 for all adapters. | ||
59 | |||
60 | Fri Oct 12 16:45:00 EST 2001 | ||
61 | Preliminary USA-19QI and USA-28 support (both test OK for me, YMMV) | ||
62 | |||
63 | Mon Oct 8 14:29:00 EST 2001 hugh | ||
64 | Fixed bug that prevented mulitport devices operating correctly | ||
65 | if they weren't the first unit attached. | ||
66 | |||
67 | Sat Oct 6 12:31:21 EST 2001 hugh | ||
68 | Added support for USA-28XA and -28XB, misc cleanups, break support | ||
69 | for usa26 based models thanks to David Gibson. | ||
70 | |||
71 | Thu May 31 11:56:42 PDT 2001 gkh | ||
72 | switched from using spinlock to a semaphore | ||
73 | |||
74 | (04/08/2001) gb | ||
75 | Identify version on module load. | ||
76 | |||
77 | (11/01/2000) Adam J. Richter | ||
78 | usb_device_id table support. | ||
79 | |||
80 | Tue Oct 10 23:15:33 EST 2000 Hugh | ||
81 | Merged Paul's changes with my USA-49W mods. Work in progress | ||
82 | still... | ||
83 | |||
84 | Wed Jul 19 14:00:42 EST 2000 gkh | ||
85 | Added module_init and module_exit functions to handle the fact that | ||
86 | this driver is a loadable module now. | ||
87 | |||
88 | Tue Jul 18 16:14:52 EST 2000 Hugh | ||
89 | Basic character input/output for USA-19 now mostly works, | ||
90 | fixed at 9600 baud for the moment. | ||
91 | |||
92 | Sat Jul 8 11:11:48 EST 2000 Hugh | ||
93 | First public release - nothing works except the firmware upload. | ||
94 | Tested on PPC and x86 architectures, seems to behave... | ||
95 | */ | 28 | */ |
96 | 29 | ||
97 | 30 | ||
@@ -397,7 +330,6 @@ static int keyspan_write(struct tty_struct *tty, | |||
397 | /* send the data out the bulk port */ | 330 | /* send the data out the bulk port */ |
398 | this_urb->transfer_buffer_length = todo + dataOffset; | 331 | this_urb->transfer_buffer_length = todo + dataOffset; |
399 | 332 | ||
400 | this_urb->dev = port->serial->dev; | ||
401 | err = usb_submit_urb(this_urb, GFP_ATOMIC); | 333 | err = usb_submit_urb(this_urb, GFP_ATOMIC); |
402 | if (err != 0) | 334 | if (err != 0) |
403 | dbg("usb_submit_urb(write bulk) failed (%d)", err); | 335 | dbg("usb_submit_urb(write bulk) failed (%d)", err); |
@@ -463,7 +395,6 @@ static void usa26_indat_callback(struct urb *urb) | |||
463 | tty_kref_put(tty); | 395 | tty_kref_put(tty); |
464 | 396 | ||
465 | /* Resubmit urb so we continue receiving */ | 397 | /* Resubmit urb so we continue receiving */ |
466 | urb->dev = port->serial->dev; | ||
467 | err = usb_submit_urb(urb, GFP_ATOMIC); | 398 | err = usb_submit_urb(urb, GFP_ATOMIC); |
468 | if (err != 0) | 399 | if (err != 0) |
469 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); | 400 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); |
@@ -559,7 +490,6 @@ static void usa26_instat_callback(struct urb *urb) | |||
559 | } | 490 | } |
560 | 491 | ||
561 | /* Resubmit urb so we continue receiving */ | 492 | /* Resubmit urb so we continue receiving */ |
562 | urb->dev = serial->dev; | ||
563 | err = usb_submit_urb(urb, GFP_ATOMIC); | 493 | err = usb_submit_urb(urb, GFP_ATOMIC); |
564 | if (err != 0) | 494 | if (err != 0) |
565 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); | 495 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); |
@@ -609,7 +539,6 @@ static void usa28_indat_callback(struct urb *urb) | |||
609 | tty_kref_put(tty); | 539 | tty_kref_put(tty); |
610 | 540 | ||
611 | /* Resubmit urb so we continue receiving */ | 541 | /* Resubmit urb so we continue receiving */ |
612 | urb->dev = port->serial->dev; | ||
613 | err = usb_submit_urb(urb, GFP_ATOMIC); | 542 | err = usb_submit_urb(urb, GFP_ATOMIC); |
614 | if (err != 0) | 543 | if (err != 0) |
615 | dbg("%s - resubmit read urb failed. (%d)", | 544 | dbg("%s - resubmit read urb failed. (%d)", |
@@ -694,7 +623,6 @@ static void usa28_instat_callback(struct urb *urb) | |||
694 | } | 623 | } |
695 | 624 | ||
696 | /* Resubmit urb so we continue receiving */ | 625 | /* Resubmit urb so we continue receiving */ |
697 | urb->dev = serial->dev; | ||
698 | err = usb_submit_urb(urb, GFP_ATOMIC); | 626 | err = usb_submit_urb(urb, GFP_ATOMIC); |
699 | if (err != 0) | 627 | if (err != 0) |
700 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); | 628 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); |
@@ -789,8 +717,6 @@ static void usa49_instat_callback(struct urb *urb) | |||
789 | } | 717 | } |
790 | 718 | ||
791 | /* Resubmit urb so we continue receiving */ | 719 | /* Resubmit urb so we continue receiving */ |
792 | urb->dev = serial->dev; | ||
793 | |||
794 | err = usb_submit_urb(urb, GFP_ATOMIC); | 720 | err = usb_submit_urb(urb, GFP_ATOMIC); |
795 | if (err != 0) | 721 | if (err != 0) |
796 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); | 722 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); |
@@ -848,7 +774,6 @@ static void usa49_indat_callback(struct urb *urb) | |||
848 | tty_kref_put(tty); | 774 | tty_kref_put(tty); |
849 | 775 | ||
850 | /* Resubmit urb so we continue receiving */ | 776 | /* Resubmit urb so we continue receiving */ |
851 | urb->dev = port->serial->dev; | ||
852 | err = usb_submit_urb(urb, GFP_ATOMIC); | 777 | err = usb_submit_urb(urb, GFP_ATOMIC); |
853 | if (err != 0) | 778 | if (err != 0) |
854 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); | 779 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); |
@@ -919,8 +844,6 @@ static void usa49wg_indat_callback(struct urb *urb) | |||
919 | } | 844 | } |
920 | 845 | ||
921 | /* Resubmit urb so we continue receiving */ | 846 | /* Resubmit urb so we continue receiving */ |
922 | urb->dev = serial->dev; | ||
923 | |||
924 | err = usb_submit_urb(urb, GFP_ATOMIC); | 847 | err = usb_submit_urb(urb, GFP_ATOMIC); |
925 | if (err != 0) | 848 | if (err != 0) |
926 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); | 849 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); |
@@ -996,7 +919,6 @@ static void usa90_indat_callback(struct urb *urb) | |||
996 | } | 919 | } |
997 | 920 | ||
998 | /* Resubmit urb so we continue receiving */ | 921 | /* Resubmit urb so we continue receiving */ |
999 | urb->dev = port->serial->dev; | ||
1000 | err = usb_submit_urb(urb, GFP_ATOMIC); | 922 | err = usb_submit_urb(urb, GFP_ATOMIC); |
1001 | if (err != 0) | 923 | if (err != 0) |
1002 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); | 924 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); |
@@ -1047,7 +969,6 @@ static void usa90_instat_callback(struct urb *urb) | |||
1047 | } | 969 | } |
1048 | 970 | ||
1049 | /* Resubmit urb so we continue receiving */ | 971 | /* Resubmit urb so we continue receiving */ |
1050 | urb->dev = serial->dev; | ||
1051 | err = usb_submit_urb(urb, GFP_ATOMIC); | 972 | err = usb_submit_urb(urb, GFP_ATOMIC); |
1052 | if (err != 0) | 973 | if (err != 0) |
1053 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); | 974 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); |
@@ -1123,7 +1044,6 @@ static void usa67_instat_callback(struct urb *urb) | |||
1123 | } | 1044 | } |
1124 | 1045 | ||
1125 | /* Resubmit urb so we continue receiving */ | 1046 | /* Resubmit urb so we continue receiving */ |
1126 | urb->dev = serial->dev; | ||
1127 | err = usb_submit_urb(urb, GFP_ATOMIC); | 1047 | err = usb_submit_urb(urb, GFP_ATOMIC); |
1128 | if (err != 0) | 1048 | if (err != 0) |
1129 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); | 1049 | dbg("%s - resubmit read urb failed. (%d)", __func__, err); |
@@ -1223,7 +1143,6 @@ static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port) | |||
1223 | urb = p_priv->in_urbs[i]; | 1143 | urb = p_priv->in_urbs[i]; |
1224 | if (urb == NULL) | 1144 | if (urb == NULL) |
1225 | continue; | 1145 | continue; |
1226 | urb->dev = serial->dev; | ||
1227 | 1146 | ||
1228 | /* make sure endpoint data toggle is synchronized | 1147 | /* make sure endpoint data toggle is synchronized |
1229 | with the device */ | 1148 | with the device */ |
@@ -1239,7 +1158,6 @@ static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port) | |||
1239 | urb = p_priv->out_urbs[i]; | 1158 | urb = p_priv->out_urbs[i]; |
1240 | if (urb == NULL) | 1159 | if (urb == NULL) |
1241 | continue; | 1160 | continue; |
1242 | urb->dev = serial->dev; | ||
1243 | /* usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe), | 1161 | /* usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe), |
1244 | usb_pipeout(urb->pipe), 0); */ | 1162 | usb_pipeout(urb->pipe), 0); */ |
1245 | } | 1163 | } |
@@ -1956,7 +1874,6 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial, | |||
1956 | /* send the data out the device on control endpoint */ | 1874 | /* send the data out the device on control endpoint */ |
1957 | this_urb->transfer_buffer_length = sizeof(msg); | 1875 | this_urb->transfer_buffer_length = sizeof(msg); |
1958 | 1876 | ||
1959 | this_urb->dev = serial->dev; | ||
1960 | err = usb_submit_urb(this_urb, GFP_ATOMIC); | 1877 | err = usb_submit_urb(this_urb, GFP_ATOMIC); |
1961 | if (err != 0) | 1878 | if (err != 0) |
1962 | dbg("%s - usb_submit_urb(setup) failed (%d)", __func__, err); | 1879 | dbg("%s - usb_submit_urb(setup) failed (%d)", __func__, err); |
@@ -2084,7 +2001,6 @@ static int keyspan_usa28_send_setup(struct usb_serial *serial, | |||
2084 | /* send the data out the device on control endpoint */ | 2001 | /* send the data out the device on control endpoint */ |
2085 | this_urb->transfer_buffer_length = sizeof(msg); | 2002 | this_urb->transfer_buffer_length = sizeof(msg); |
2086 | 2003 | ||
2087 | this_urb->dev = serial->dev; | ||
2088 | err = usb_submit_urb(this_urb, GFP_ATOMIC); | 2004 | err = usb_submit_urb(this_urb, GFP_ATOMIC); |
2089 | if (err != 0) | 2005 | if (err != 0) |
2090 | dbg("%s - usb_submit_urb(setup) failed", __func__); | 2006 | dbg("%s - usb_submit_urb(setup) failed", __func__); |
@@ -2271,8 +2187,6 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial, | |||
2271 | 2187 | ||
2272 | /* send the data out the device on control endpoint */ | 2188 | /* send the data out the device on control endpoint */ |
2273 | this_urb->transfer_buffer_length = sizeof(msg); | 2189 | this_urb->transfer_buffer_length = sizeof(msg); |
2274 | |||
2275 | this_urb->dev = serial->dev; | ||
2276 | } | 2190 | } |
2277 | err = usb_submit_urb(this_urb, GFP_ATOMIC); | 2191 | err = usb_submit_urb(this_urb, GFP_ATOMIC); |
2278 | if (err != 0) | 2192 | if (err != 0) |
@@ -2415,7 +2329,6 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial, | |||
2415 | /* send the data out the device on control endpoint */ | 2329 | /* send the data out the device on control endpoint */ |
2416 | this_urb->transfer_buffer_length = sizeof(msg); | 2330 | this_urb->transfer_buffer_length = sizeof(msg); |
2417 | 2331 | ||
2418 | this_urb->dev = serial->dev; | ||
2419 | err = usb_submit_urb(this_urb, GFP_ATOMIC); | 2332 | err = usb_submit_urb(this_urb, GFP_ATOMIC); |
2420 | if (err != 0) | 2333 | if (err != 0) |
2421 | dbg("%s - usb_submit_urb(setup) failed (%d)", __func__, err); | 2334 | dbg("%s - usb_submit_urb(setup) failed (%d)", __func__, err); |
@@ -2561,7 +2474,6 @@ static int keyspan_usa67_send_setup(struct usb_serial *serial, | |||
2561 | 2474 | ||
2562 | /* send the data out the device on control endpoint */ | 2475 | /* send the data out the device on control endpoint */ |
2563 | this_urb->transfer_buffer_length = sizeof(msg); | 2476 | this_urb->transfer_buffer_length = sizeof(msg); |
2564 | this_urb->dev = serial->dev; | ||
2565 | 2477 | ||
2566 | err = usb_submit_urb(this_urb, GFP_ATOMIC); | 2478 | err = usb_submit_urb(this_urb, GFP_ATOMIC); |
2567 | if (err != 0) | 2479 | if (err != 0) |
@@ -2650,14 +2562,12 @@ static int keyspan_startup(struct usb_serial *serial) | |||
2650 | keyspan_setup_urbs(serial); | 2562 | keyspan_setup_urbs(serial); |
2651 | 2563 | ||
2652 | if (s_priv->instat_urb != NULL) { | 2564 | if (s_priv->instat_urb != NULL) { |
2653 | s_priv->instat_urb->dev = serial->dev; | ||
2654 | err = usb_submit_urb(s_priv->instat_urb, GFP_KERNEL); | 2565 | err = usb_submit_urb(s_priv->instat_urb, GFP_KERNEL); |
2655 | if (err != 0) | 2566 | if (err != 0) |
2656 | dbg("%s - submit instat urb failed %d", __func__, | 2567 | dbg("%s - submit instat urb failed %d", __func__, |
2657 | err); | 2568 | err); |
2658 | } | 2569 | } |
2659 | if (s_priv->indat_urb != NULL) { | 2570 | if (s_priv->indat_urb != NULL) { |
2660 | s_priv->indat_urb->dev = serial->dev; | ||
2661 | err = usb_submit_urb(s_priv->indat_urb, GFP_KERNEL); | 2571 | err = usb_submit_urb(s_priv->indat_urb, GFP_KERNEL); |
2662 | if (err != 0) | 2572 | if (err != 0) |
2663 | dbg("%s - submit indat urb failed %d", __func__, | 2573 | dbg("%s - submit indat urb failed %d", __func__, |