Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5833041f1b130e5823a99d03b14538282e5ad345

Authored by Johan Hovold
Committed by Greg Kroah-Hartman
1 parent 016af7ec49
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

USB: serial: remove unnecessary reinitialisations of urb->dev 

Remove unnecessary reinitialisations of urb->dev before each submission,
which were based on the (no longer valid) assumption that serial->dev
will be set to NULL on close.

Compile-only tested.

Cc: Matthias Bruestle and Harald Welte <support@reiner-sct.com>
Cc: Lonnie Mendez <dignome@gmail.com>
Cc: Peter Berger <pberger@brimson.com>
Cc: Al Borchers <alborchers@steinerpoint.com>
Cc: Support Department <support@connecttech.com>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 20 changed files with 8 additions and 107 deletions Side-by-side Diff

drivers/usb/serial/ch341.c
Diff comments   View file @ 5833041
... ... @@ -335,7 +335,6 @@
335 335 goto out;
336 336  
337 337 dbg("%s - submitting interrupt urb", __func__);
338   - port->interrupt_in_urb->dev = serial->dev;
339 338 r = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
340 339 if (r) {
341 340 dev_err(&port->dev, "%s - failed submitting interrupt urb,"
drivers/usb/serial/cyberjack.c
Diff comments   View file @ 5833041
... ... @@ -138,7 +138,6 @@
138 138  
139 139 for (i = 0; i < serial->num_ports; ++i) {
140 140 int result;
141   - serial->port[i]->interrupt_in_urb->dev = serial->dev;
142 141 result = usb_submit_urb(serial->port[i]->interrupt_in_urb,
143 142 GFP_KERNEL);
144 143 if (result)
... ... @@ -347,7 +346,6 @@
347 346 spin_unlock(&priv->lock);
348 347  
349 348 if (!old_rdtodo) {
350   - port->read_urb->dev = port->serial->dev;
351 349 result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
352 350 if (result)
353 351 dev_err(&port->dev, "%s - failed resubmitting "
... ... @@ -358,7 +356,6 @@
358 356 }
359 357  
360 358 resubmit:
361   - port->interrupt_in_urb->dev = port->serial->dev;
362 359 result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
363 360 if (result)
364 361 dev_err(&port->dev, "usb_submit_urb(read int) failed\n");
... ... @@ -411,7 +408,6 @@
411 408  
412 409 /* Continue to read if we have still urbs to do. */
413 410 if (todo /* || (urb->actual_length==port->bulk_in_endpointAddress)*/) {
414   - port->read_urb->dev = port->serial->dev;
415 411 result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
416 412 if (result)
417 413 dev_err(&port->dev, "%s - failed resubmitting read "
drivers/usb/serial/cypress_m8.c
Diff comments   View file @ 5833041
... ... @@ -1136,8 +1136,6 @@
1136 1136 return;
1137 1137  
1138 1138 if (actually_throttled) {
1139   - port->interrupt_in_urb->dev = port->serial->dev;
1140   -
1141 1139 result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
1142 1140 if (result) {
1143 1141 dev_err(&port->dev, "%s - failed submitting read urb, "
... ... @@ -1326,7 +1324,6 @@
1326 1324 dbg("%s - nonzero write bulk status received: %d",
1327 1325 __func__, status);
1328 1326 port->interrupt_out_urb->transfer_buffer_length = 1;
1329   - port->interrupt_out_urb->dev = port->serial->dev;
1330 1327 result = usb_submit_urb(port->interrupt_out_urb, GFP_ATOMIC);
1331 1328 if (!result)
1332 1329 return;
drivers/usb/serial/digi_acceleport.c
Diff comments   View file @ 5833041
... ... @@ -438,7 +438,6 @@
438 438 len &= ~3;
439 439 memcpy(oob_port->write_urb->transfer_buffer, buf, len);
440 440 oob_port->write_urb->transfer_buffer_length = len;
441   - oob_port->write_urb->dev = port->serial->dev;
442 441 ret = usb_submit_urb(oob_port->write_urb, GFP_ATOMIC);
443 442 if (ret == 0) {
444 443 oob_priv->dp_write_urb_in_use = 1;
... ... @@ -516,7 +515,6 @@
516 515 memcpy(data, buf, len);
517 516 port->write_urb->transfer_buffer_length = len;
518 517 }
519   - port->write_urb->dev = port->serial->dev;
520 518  
521 519 ret = usb_submit_urb(port->write_urb, GFP_ATOMIC);
522 520 if (ret == 0) {
... ... @@ -587,7 +585,6 @@
587 585 data[7] = 0;
588 586  
589 587 oob_port->write_urb->transfer_buffer_length = 8;
590   - oob_port->write_urb->dev = port->serial->dev;
591 588  
592 589 ret = usb_submit_urb(oob_port->write_urb, GFP_ATOMIC);
593 590 if (ret == 0) {
594 591  
... ... @@ -683,10 +680,8 @@
683 680 spin_lock_irqsave(&priv->dp_port_lock, flags);
684 681  
685 682 /* restart read chain */
686   - if (priv->dp_throttle_restart) {
687   - port->read_urb->dev = port->serial->dev;
  683 + if (priv->dp_throttle_restart)
688 684 ret = usb_submit_urb(port->read_urb, GFP_ATOMIC);
689   - }
690 685  
691 686 /* turn throttle off */
692 687 priv->dp_throttled = 0;
... ... @@ -979,7 +974,6 @@
979 974 }
980 975  
981 976 port->write_urb->transfer_buffer_length = data_len+2;
982   - port->write_urb->dev = port->serial->dev;
983 977  
984 978 *data++ = DIGI_CMD_SEND_DATA;
985 979 *data++ = data_len;
... ... @@ -1055,7 +1049,6 @@
1055 1049 = (unsigned char)priv->dp_out_buf_len;
1056 1050 port->write_urb->transfer_buffer_length =
1057 1051 priv->dp_out_buf_len + 2;
1058   - port->write_urb->dev = serial->dev;
1059 1052 memcpy(port->write_urb->transfer_buffer + 2, priv->dp_out_buf,
1060 1053 priv->dp_out_buf_len);
1061 1054 ret = usb_submit_urb(port->write_urb, GFP_ATOMIC);
... ... @@ -1257,7 +1250,6 @@
1257 1250 /* set USB_DISABLE_SPD flag for write bulk urbs */
1258 1251 for (i = 0; i < serial->type->num_ports + 1; i++) {
1259 1252 port = serial->port[i];
1260   - port->write_urb->dev = port->serial->dev;
1261 1253 ret = usb_submit_urb(port->read_urb, GFP_KERNEL);
1262 1254 if (ret != 0) {
1263 1255 dev_err(&port->dev,
... ... @@ -1400,7 +1392,6 @@
1400 1392 }
1401 1393  
1402 1394 /* continue read */
1403   - urb->dev = port->serial->dev;
1404 1395 ret = usb_submit_urb(urb, GFP_ATOMIC);
1405 1396 if (ret != 0 && ret != -EPERM) {
1406 1397 dev_err(&port->dev,
drivers/usb/serial/garmin_gps.c
Diff comments   View file @ 5833041
... ... @@ -901,7 +901,6 @@
901 901 usb_kill_urb(port->interrupt_in_urb);
902 902  
903 903 dbg("%s - adding interrupt input", __func__);
904   - port->interrupt_in_urb->dev = serial->dev;
905 904 status = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
906 905 if (status)
907 906 dev_err(&serial->dev->dev,
... ... @@ -1353,7 +1352,6 @@
1353 1352  
1354 1353 garmin_read_process(garmin_data_p, data, urb->actual_length, 0);
1355 1354  
1356   - port->interrupt_in_urb->dev = port->serial->dev;
1357 1355 retval = usb_submit_urb(urb, GFP_ATOMIC);
1358 1356 if (retval)
1359 1357 dev_err(&urb->dev->dev,
drivers/usb/serial/io_edgeport.c
Diff comments   View file @ 5833041
... ... @@ -610,7 +610,6 @@
610 610  
611 611 /* we have pending bytes on the
612 612 bulk in pipe, send a request */
613   - edge_serial->read_urb->dev = edge_serial->serial->dev;
614 613 result = usb_submit_urb(edge_serial->read_urb, GFP_ATOMIC);
615 614 if (result) {
616 615 dev_err(&edge_serial->serial->dev->dev, "%s - usb_submit_urb(read bulk) failed with result = %d\n", __func__, result);
... ... @@ -711,7 +710,6 @@
711 710 /* check to see if there's any more data for us to read */
712 711 if (edge_serial->rxBytesAvail > 0) {
713 712 dbg("%s - posting a read", __func__);
714   - edge_serial->read_urb->dev = edge_serial->serial->dev;
715 713 retval = usb_submit_urb(edge_serial->read_urb, GFP_ATOMIC);
716 714 if (retval) {
717 715 dev_err(&urb->dev->dev,
... ... @@ -1330,7 +1328,6 @@
1330 1328 edge_port->txCredits -= count;
1331 1329 edge_port->icount.tx += count;
1332 1330  
1333   - urb->dev = edge_serial->serial->dev;
1334 1331 status = usb_submit_urb(urb, GFP_ATOMIC);
1335 1332 if (status) {
1336 1333 /* something went wrong */
drivers/usb/serial/io_ti.c
Diff comments   View file @ 5833041
... ... @@ -1770,12 +1770,11 @@
1770 1770 exit:
1771 1771 /* continue read unless stopped */
1772 1772 spin_lock(&edge_port->ep_lock);
1773   - if (edge_port->ep_read_urb_state == EDGE_READ_URB_RUNNING) {
1774   - urb->dev = edge_port->port->serial->dev;
  1773 + if (edge_port->ep_read_urb_state == EDGE_READ_URB_RUNNING)
1775 1774 retval = usb_submit_urb(urb, GFP_ATOMIC);
1776   - } else if (edge_port->ep_read_urb_state == EDGE_READ_URB_STOPPING) {
  1775 + else if (edge_port->ep_read_urb_state == EDGE_READ_URB_STOPPING)
1777 1776 edge_port->ep_read_urb_state = EDGE_READ_URB_STOPPED;
1778   - }
  1777 +
1779 1778 spin_unlock(&edge_port->ep_lock);
1780 1779 if (retval)
1781 1780 dev_err(&urb->dev->dev,
... ... @@ -1954,7 +1953,6 @@
1954 1953 }
1955 1954 urb->complete = edge_interrupt_callback;
1956 1955 urb->context = edge_serial;
1957   - urb->dev = dev;
1958 1956 status = usb_submit_urb(urb, GFP_KERNEL);
1959 1957 if (status) {
1960 1958 dev_err(&port->dev,
... ... @@ -1982,7 +1980,6 @@
1982 1980 edge_port->ep_read_urb_state = EDGE_READ_URB_RUNNING;
1983 1981 urb->complete = edge_bulk_in_callback;
1984 1982 urb->context = edge_port;
1985   - urb->dev = dev;
1986 1983 status = usb_submit_urb(urb, GFP_KERNEL);
1987 1984 if (status) {
1988 1985 dev_err(&port->dev,
... ... @@ -2262,7 +2259,6 @@
2262 2259 urb = edge_port->port->read_urb;
2263 2260 urb->complete = edge_bulk_in_callback;
2264 2261 urb->context = edge_port;
2265   - urb->dev = edge_port->port->serial->dev;
2266 2262 status = usb_submit_urb(urb, GFP_ATOMIC);
2267 2263 }
2268 2264 edge_port->ep_read_urb_state = EDGE_READ_URB_RUNNING;
drivers/usb/serial/keyspan.c
Diff comments   View file @ 5833041
... ... @@ -330,7 +330,6 @@
330 330 /* send the data out the bulk port */
331 331 this_urb->transfer_buffer_length = todo + dataOffset;
332 332  
333   - this_urb->dev = port->serial->dev;
334 333 err = usb_submit_urb(this_urb, GFP_ATOMIC);
335 334 if (err != 0)
336 335 dbg("usb_submit_urb(write bulk) failed (%d)", err);
... ... @@ -396,7 +395,6 @@
396 395 tty_kref_put(tty);
397 396  
398 397 /* Resubmit urb so we continue receiving */
399   - urb->dev = port->serial->dev;
400 398 err = usb_submit_urb(urb, GFP_ATOMIC);
401 399 if (err != 0)
402 400 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
... ... @@ -492,7 +490,6 @@
492 490 }
493 491  
494 492 /* Resubmit urb so we continue receiving */
495   - urb->dev = serial->dev;
496 493 err = usb_submit_urb(urb, GFP_ATOMIC);
497 494 if (err != 0)
498 495 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
... ... @@ -542,7 +539,6 @@
542 539 tty_kref_put(tty);
543 540  
544 541 /* Resubmit urb so we continue receiving */
545   - urb->dev = port->serial->dev;
546 542 err = usb_submit_urb(urb, GFP_ATOMIC);
547 543 if (err != 0)
548 544 dbg("%s - resubmit read urb failed. (%d)",
... ... @@ -627,7 +623,6 @@
627 623 }
628 624  
629 625 /* Resubmit urb so we continue receiving */
630   - urb->dev = serial->dev;
631 626 err = usb_submit_urb(urb, GFP_ATOMIC);
632 627 if (err != 0)
633 628 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
... ... @@ -722,8 +717,6 @@
722 717 }
723 718  
724 719 /* Resubmit urb so we continue receiving */
725   - urb->dev = serial->dev;
726   -
727 720 err = usb_submit_urb(urb, GFP_ATOMIC);
728 721 if (err != 0)
729 722 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
... ... @@ -781,7 +774,6 @@
781 774 tty_kref_put(tty);
782 775  
783 776 /* Resubmit urb so we continue receiving */
784   - urb->dev = port->serial->dev;
785 777 err = usb_submit_urb(urb, GFP_ATOMIC);
786 778 if (err != 0)
787 779 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
... ... @@ -852,8 +844,6 @@
852 844 }
853 845  
854 846 /* Resubmit urb so we continue receiving */
855   - urb->dev = serial->dev;
856   -
857 847 err = usb_submit_urb(urb, GFP_ATOMIC);
858 848 if (err != 0)
859 849 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
... ... @@ -929,7 +919,6 @@
929 919 }
930 920  
931 921 /* Resubmit urb so we continue receiving */
932   - urb->dev = port->serial->dev;
933 922 err = usb_submit_urb(urb, GFP_ATOMIC);
934 923 if (err != 0)
935 924 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
... ... @@ -980,7 +969,6 @@
980 969 }
981 970  
982 971 /* Resubmit urb so we continue receiving */
983   - urb->dev = serial->dev;
984 972 err = usb_submit_urb(urb, GFP_ATOMIC);
985 973 if (err != 0)
986 974 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
... ... @@ -1056,7 +1044,6 @@
1056 1044 }
1057 1045  
1058 1046 /* Resubmit urb so we continue receiving */
1059   - urb->dev = serial->dev;
1060 1047 err = usb_submit_urb(urb, GFP_ATOMIC);
1061 1048 if (err != 0)
1062 1049 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
... ... @@ -1156,7 +1143,6 @@
1156 1143 urb = p_priv->in_urbs[i];
1157 1144 if (urb == NULL)
1158 1145 continue;
1159   - urb->dev = serial->dev;
1160 1146  
1161 1147 /* make sure endpoint data toggle is synchronized
1162 1148 with the device */
... ... @@ -1172,7 +1158,6 @@
1172 1158 urb = p_priv->out_urbs[i];
1173 1159 if (urb == NULL)
1174 1160 continue;
1175   - urb->dev = serial->dev;
1176 1161 /* usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe),
1177 1162 usb_pipeout(urb->pipe), 0); */
1178 1163 }
... ... @@ -1889,7 +1874,6 @@
1889 1874 /* send the data out the device on control endpoint */
1890 1875 this_urb->transfer_buffer_length = sizeof(msg);
1891 1876  
1892   - this_urb->dev = serial->dev;
1893 1877 err = usb_submit_urb(this_urb, GFP_ATOMIC);
1894 1878 if (err != 0)
1895 1879 dbg("%s - usb_submit_urb(setup) failed (%d)", __func__, err);
... ... @@ -2017,7 +2001,6 @@
2017 2001 /* send the data out the device on control endpoint */
2018 2002 this_urb->transfer_buffer_length = sizeof(msg);
2019 2003  
2020   - this_urb->dev = serial->dev;
2021 2004 err = usb_submit_urb(this_urb, GFP_ATOMIC);
2022 2005 if (err != 0)
2023 2006 dbg("%s - usb_submit_urb(setup) failed", __func__);
... ... @@ -2204,8 +2187,6 @@
2204 2187  
2205 2188 /* send the data out the device on control endpoint */
2206 2189 this_urb->transfer_buffer_length = sizeof(msg);
2207   -
2208   - this_urb->dev = serial->dev;
2209 2190 }
2210 2191 err = usb_submit_urb(this_urb, GFP_ATOMIC);
2211 2192 if (err != 0)
... ... @@ -2348,7 +2329,6 @@
2348 2329 /* send the data out the device on control endpoint */
2349 2330 this_urb->transfer_buffer_length = sizeof(msg);
2350 2331  
2351   - this_urb->dev = serial->dev;
2352 2332 err = usb_submit_urb(this_urb, GFP_ATOMIC);
2353 2333 if (err != 0)
2354 2334 dbg("%s - usb_submit_urb(setup) failed (%d)", __func__, err);
... ... @@ -2494,7 +2474,6 @@
2494 2474  
2495 2475 /* send the data out the device on control endpoint */
2496 2476 this_urb->transfer_buffer_length = sizeof(msg);
2497   - this_urb->dev = serial->dev;
2498 2477  
2499 2478 err = usb_submit_urb(this_urb, GFP_ATOMIC);
2500 2479 if (err != 0)
2501 2480  
... ... @@ -2583,14 +2562,12 @@
2583 2562 keyspan_setup_urbs(serial);
2584 2563  
2585 2564 if (s_priv->instat_urb != NULL) {
2586   - s_priv->instat_urb->dev = serial->dev;
2587 2565 err = usb_submit_urb(s_priv->instat_urb, GFP_KERNEL);
2588 2566 if (err != 0)
2589 2567 dbg("%s - submit instat urb failed %d", __func__,
2590 2568 err);
2591 2569 }
2592 2570 if (s_priv->indat_urb != NULL) {
2593   - s_priv->indat_urb->dev = serial->dev;
2594 2571 err = usb_submit_urb(s_priv->indat_urb, GFP_KERNEL);
2595 2572 if (err != 0)
2596 2573 dbg("%s - submit indat urb failed %d", __func__,
drivers/usb/serial/keyspan_pda.c
Diff comments   View file @ 5833041
... ... @@ -237,7 +237,6 @@
237 237 struct usb_serial_port *port = tty->driver_data;
238 238 /* just restart the receive interrupt URB */
239 239 dbg("keyspan_pda_rx_unthrottle port %d", port->number);
240   - port->interrupt_in_urb->dev = port->serial->dev;
241 240 if (usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL))
242 241 dbg(" usb_submit_urb(read urb) failed");
243 242 }
... ... @@ -545,7 +544,6 @@
545 544  
546 545 priv->tx_room -= count;
547 546  
548   - port->write_urb->dev = port->serial->dev;
549 547 rc = usb_submit_urb(port->write_urb, GFP_ATOMIC);
550 548 if (rc) {
551 549 dbg(" usb_submit_urb(write bulk) failed");
... ... @@ -664,7 +662,6 @@
664 662 priv->tx_throttled = *room ? 0 : 1;
665 663  
666 664 /*Start reading from the device*/
667   - port->interrupt_in_urb->dev = serial->dev;
668 665 rc = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
669 666 if (rc) {
670 667 dbg("%s - usb_submit_urb(read int) failed", __func__);
drivers/usb/serial/kobil_sct.c
Diff comments   View file @ 5833041
... ... @@ -219,9 +219,6 @@
219 219 dbg("%s - port %d", __func__, port->number);
220 220 priv = usb_get_serial_port_data(port);
221 221  
222   - /* someone sets the dev to 0 if the close method has been called */
223   - port->interrupt_in_urb->dev = port->serial->dev;
224   -
225 222 /* allocate memory for transfer buffer */
226 223 transfer_buffer = kzalloc(transfer_buffer_length, GFP_KERNEL);
227 224 if (!transfer_buffer)
... ... @@ -381,8 +378,6 @@
381 378 tty_flip_buffer_push(tty);
382 379 }
383 380 tty_kref_put(tty);
384   - /* someone sets the dev to 0 if the close method has been called */
385   - port->interrupt_in_urb->dev = port->serial->dev;
386 381  
387 382 result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
388 383 dbg("%s - port %d Send read URB returns: %i",
389 384  
... ... @@ -463,17 +458,9 @@
463 458 priv->filled = 0;
464 459 priv->cur_pos = 0;
465 460  
466   - /* someone sets the dev to 0 if the close method
467   - has been called */
468   - port->interrupt_in_urb->dev = port->serial->dev;
469   -
470 461 /* start reading (except TWIN and KAAN SIM) */
471 462 if (priv->device_type == KOBIL_ADAPTER_B_PRODUCT_ID ||
472 463 priv->device_type == KOBIL_ADAPTER_K_PRODUCT_ID) {
473   - /* someone sets the dev to 0 if the close method has
474   - been called */
475   - port->interrupt_in_urb->dev = port->serial->dev;
476   -
477 464 result = usb_submit_urb(port->interrupt_in_urb,
478 465 GFP_NOIO);
479 466 dbg("%s - port %d Send read URB returns: %i",
drivers/usb/serial/mct_u232.c
Diff comments   View file @ 5833041
... ... @@ -482,7 +482,6 @@
482 482 mct_u232_msr_to_state(&priv->control_state, priv->last_msr);
483 483 spin_unlock_irqrestore(&priv->lock, flags);
484 484  
485   - port->read_urb->dev = port->serial->dev;
486 485 retval = usb_submit_urb(port->read_urb, GFP_KERNEL);
487 486 if (retval) {
488 487 dev_err(&port->dev,
... ... @@ -491,7 +490,6 @@
491 490 goto error;
492 491 }
493 492  
494   - port->interrupt_in_urb->dev = port->serial->dev;
495 493 retval = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
496 494 if (retval) {
497 495 usb_kill_urb(port->read_urb);
drivers/usb/serial/mos7720.c
Diff comments   View file @ 5833041
... ... @@ -940,8 +940,6 @@
940 940 tty_kref_put(tty);
941 941  
942 942 if (port->read_urb->status != -EINPROGRESS) {
943   - port->read_urb->dev = port->serial->dev;
944   -
945 943 retval = usb_submit_urb(port->read_urb, GFP_ATOMIC);
946 944 if (retval)
947 945 dbg("usb_submit_urb(read bulk) failed, retval = %d",
... ... @@ -1727,8 +1725,6 @@
1727 1725 write_mos_reg(serial, port_number, IER, 0x0c);
1728 1726  
1729 1727 if (port->read_urb->status != -EINPROGRESS) {
1730   - port->read_urb->dev = serial->dev;
1731   -
1732 1728 status = usb_submit_urb(port->read_urb, GFP_ATOMIC);
1733 1729 if (status)
1734 1730 dbg("usb_submit_urb(read bulk) failed, status = %d",
... ... @@ -1779,7 +1775,6 @@
1779 1775 change_port_settings(tty, mos7720_port, old_termios);
1780 1776  
1781 1777 if (port->read_urb->status != -EINPROGRESS) {
1782   - port->read_urb->dev = serial->dev;
1783 1778 status = usb_submit_urb(port->read_urb, GFP_ATOMIC);
1784 1779 if (status)
1785 1780 dbg("usb_submit_urb(read bulk) failed, status = %d",
drivers/usb/serial/mos7840.c
Diff comments   View file @ 5833041
... ... @@ -792,8 +792,6 @@
792 792 }
793 793  
794 794  
795   - mos7840_port->read_urb->dev = serial->dev;
796   -
797 795 mos7840_port->read_urb_busy = true;
798 796 retval = usb_submit_urb(mos7840_port->read_urb, GFP_ATOMIC);
799 797  
... ... @@ -2058,7 +2056,6 @@
2058 2056 mos7840_set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
2059 2057  
2060 2058 if (mos7840_port->read_urb_busy == false) {
2061   - mos7840_port->read_urb->dev = serial->dev;
2062 2059 mos7840_port->read_urb_busy = true;
2063 2060 status = usb_submit_urb(mos7840_port->read_urb, GFP_ATOMIC);
2064 2061 if (status) {
... ... @@ -2130,7 +2127,6 @@
2130 2127 }
2131 2128  
2132 2129 if (mos7840_port->read_urb_busy == false) {
2133   - mos7840_port->read_urb->dev = serial->dev;
2134 2130 mos7840_port->read_urb_busy = true;
2135 2131 status = usb_submit_urb(mos7840_port->read_urb, GFP_ATOMIC);
2136 2132 if (status) {
drivers/usb/serial/omninet.c
Diff comments   View file @ 5833041
... ... @@ -154,6 +154,7 @@
154 154 port->read_urb->transfer_buffer,
155 155 port->read_urb->transfer_buffer_length,
156 156 omninet_read_bulk_callback, port);
  157 +
157 158 result = usb_submit_urb(port->read_urb, GFP_KERNEL);
158 159 if (result)
159 160 dev_err(&port->dev,
... ... @@ -262,7 +263,6 @@
262 263 /* send the data out the bulk port, always 64 bytes */
263 264 wport->write_urb->transfer_buffer_length = 64;
264 265  
265   - wport->write_urb->dev = serial->dev;
266 266 result = usb_submit_urb(wport->write_urb, GFP_ATOMIC);
267 267 if (result) {
268 268 set_bit(0, &wport->write_urbs_free);
drivers/usb/serial/opticon.c
Diff comments   View file @ 5833041
... ... @@ -384,7 +384,6 @@
384 384 priv->actually_throttled = false;
385 385 spin_unlock_irqrestore(&priv->lock, flags);
386 386  
387   - priv->bulk_read_urb->dev = port->serial->dev;
388 387 if (was_throttled) {
389 388 result = usb_submit_urb(priv->bulk_read_urb, GFP_ATOMIC);
390 389 if (result)
drivers/usb/serial/oti6858.c
Diff comments   View file @ 5833041
... ... @@ -264,7 +264,6 @@
264 264 spin_unlock_irqrestore(&priv->lock, flags);
265 265  
266 266 dbg("%s(): submitting interrupt urb", __func__);
267   - port->interrupt_in_urb->dev = port->serial->dev;
268 267 result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
269 268 if (result != 0) {
270 269 dev_err(&port->dev, "%s(): usb_submit_urb() failed"
... ... @@ -321,7 +320,6 @@
321 320 priv->flags.write_urb_in_use = 0;
322 321  
323 322 dbg("%s(): submitting interrupt urb", __func__);
324   - port->interrupt_in_urb->dev = port->serial->dev;
325 323 result = usb_submit_urb(port->interrupt_in_urb, GFP_NOIO);
326 324 if (result != 0) {
327 325 dev_err(&port->dev, "%s(): usb_submit_urb() failed"
... ... @@ -334,7 +332,6 @@
334 332 port->write_urb->transfer_buffer,
335 333 count, &port->lock);
336 334 port->write_urb->transfer_buffer_length = count;
337   - port->write_urb->dev = port->serial->dev;
338 335 result = usb_submit_urb(port->write_urb, GFP_NOIO);
339 336 if (result != 0) {
340 337 dev_err(&port->dev, "%s(): usb_submit_urb() failed"
... ... @@ -583,7 +580,6 @@
583 580 kfree(buf);
584 581  
585 582 dbg("%s(): submitting interrupt urb", __func__);
586   - port->interrupt_in_urb->dev = serial->dev;
587 583 result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
588 584 if (result != 0) {
589 585 dev_err(&port->dev, "%s(): usb_submit_urb() failed"
... ... @@ -837,7 +833,6 @@
837 833 if (can_recv) {
838 834 int result;
839 835  
840   - port->read_urb->dev = port->serial->dev;
841 836 result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
842 837 if (result != 0) {
843 838 priv->flags.read_urb_in_use = 0;
... ... @@ -866,7 +861,6 @@
866 861 int result;
867 862  
868 863 /* dbg("%s(): submitting interrupt urb", __func__); */
869   - urb->dev = port->serial->dev;
870 864 result = usb_submit_urb(urb, GFP_ATOMIC);
871 865 if (result != 0) {
872 866 dev_err(&urb->dev->dev,
... ... @@ -918,7 +912,6 @@
918 912 tty_kref_put(tty);
919 913  
920 914 /* schedule the interrupt urb */
921   - port->interrupt_in_urb->dev = port->serial->dev;
922 915 result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
923 916 if (result != 0 && result != -EPERM) {
924 917 dev_err(&port->dev, "%s(): usb_submit_urb() failed,"
... ... @@ -955,7 +948,6 @@
955 948 dbg("%s(): overflow in write", __func__);
956 949  
957 950 port->write_urb->transfer_buffer_length = 1;
958   - port->write_urb->dev = port->serial->dev;
959 951 result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
960 952 if (result) {
961 953 dev_err(&port->dev, "%s(): usb_submit_urb() failed,"
... ... @@ -968,7 +960,6 @@
968 960 priv->flags.write_urb_in_use = 0;
969 961  
970 962 /* schedule the interrupt urb if we are still open */
971   - port->interrupt_in_urb->dev = port->serial->dev;
972 963 dbg("%s(): submitting interrupt urb", __func__);
973 964 result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
974 965 if (result != 0) {
drivers/usb/serial/sierra.c
Diff comments   View file @ 5833041
... ... @@ -681,7 +681,6 @@
681 681 /* Resubmit urb so we continue receiving IRQ data */
682 682 if (status != -ESHUTDOWN && status != -ENOENT) {
683 683 usb_mark_last_busy(serial->dev);
684   - urb->dev = serial->dev;
685 684 err = usb_submit_urb(urb, GFP_ATOMIC);
686 685 if (err && err != -EPERM)
687 686 dev_err(&port->dev, "%s: resubmit intr urb "
drivers/usb/serial/symbolserial.c
Diff comments   View file @ 5833041
... ... @@ -182,7 +182,6 @@
182 182 priv->actually_throttled = false;
183 183 spin_unlock_irq(&priv->lock);
184 184  
185   - priv->int_urb->dev = port->serial->dev;
186 185 if (was_throttled) {
187 186 result = usb_submit_urb(priv->int_urb, GFP_KERNEL);
188 187 if (result)
drivers/usb/serial/ti_usb_3410_5052.c
Diff comments   View file @ 5833041
... ... @@ -537,7 +537,6 @@
537 537 }
538 538 urb->complete = ti_interrupt_callback;
539 539 urb->context = tdev;
540   - urb->dev = dev;
541 540 status = usb_submit_urb(urb, GFP_KERNEL);
542 541 if (status) {
543 542 dev_err(&port->dev,
... ... @@ -621,7 +620,6 @@
621 620 tport->tp_read_urb_state = TI_READ_URB_RUNNING;
622 621 urb->complete = ti_bulk_in_callback;
623 622 urb->context = tport;
624   - urb->dev = dev;
625 623 status = usb_submit_urb(urb, GFP_KERNEL);
626 624 if (status) {
627 625 dev_err(&port->dev, "%s - submit read urb failed, %d\n",
628 626  
629 627  
... ... @@ -1236,12 +1234,11 @@
1236 1234 exit:
1237 1235 /* continue to read unless stopping */
1238 1236 spin_lock(&tport->tp_lock);
1239   - if (tport->tp_read_urb_state == TI_READ_URB_RUNNING) {
1240   - urb->dev = port->serial->dev;
  1237 + if (tport->tp_read_urb_state == TI_READ_URB_RUNNING)
1241 1238 retval = usb_submit_urb(urb, GFP_ATOMIC);
1242   - } else if (tport->tp_read_urb_state == TI_READ_URB_STOPPING) {
  1239 + else if (tport->tp_read_urb_state == TI_READ_URB_STOPPING)
1243 1240 tport->tp_read_urb_state = TI_READ_URB_STOPPED;
1244   - }
  1241 +
1245 1242 spin_unlock(&tport->tp_lock);
1246 1243 if (retval)
1247 1244 dev_err(dev, "%s - resubmit read urb failed, %d\n",
... ... @@ -1576,7 +1573,6 @@
1576 1573 spin_unlock_irqrestore(&tport->tp_lock, flags);
1577 1574 urb->complete = ti_bulk_in_callback;
1578 1575 urb->context = tport;
1579   - urb->dev = tport->tp_port->serial->dev;
1580 1576 status = usb_submit_urb(urb, GFP_KERNEL);
1581 1577 } else {
1582 1578 tport->tp_read_urb_state = TI_READ_URB_RUNNING;
drivers/usb/serial/whiteheat.c
Diff comments   View file @ 5833041
... ... @@ -702,7 +702,6 @@
702 702 static int whiteheat_write(struct tty_struct *tty,
703 703 struct usb_serial_port *port, const unsigned char *buf, int count)
704 704 {
705   - struct usb_serial *serial = port->serial;
706 705 struct whiteheat_private *info = usb_get_serial_port_data(port);
707 706 struct whiteheat_urb_wrap *wrap;
708 707 struct urb *urb;
... ... @@ -738,7 +737,6 @@
738 737 usb_serial_debug_data(debug, &port->dev,
739 738 __func__, bytes, urb->transfer_buffer);
740 739  
741   - urb->dev = serial->dev;
742 740 urb->transfer_buffer_length = bytes;
743 741 result = usb_submit_urb(urb, GFP_ATOMIC);
744 742 if (result) {
... ... @@ -984,7 +982,6 @@
984 982 dbg("%s - bad reply from firmware", __func__);
985 983  
986 984 /* Continue trying to always read */
987   - command_port->read_urb->dev = command_port->serial->dev;
988 985 result = usb_submit_urb(command_port->read_urb, GFP_ATOMIC);
989 986 if (result)
990 987 dbg("%s - failed resubmitting read urb, error %d",
... ... @@ -1090,7 +1087,6 @@
1090 1087 transfer_buffer[0] = command;
1091 1088 memcpy(&transfer_buffer[1], data, datasize);
1092 1089 command_port->write_urb->transfer_buffer_length = datasize + 1;
1093   - command_port->write_urb->dev = port->serial->dev;
1094 1090 retval = usb_submit_urb(command_port->write_urb, GFP_NOIO);
1095 1091 if (retval) {
1096 1092 dbg("%s - submit urb failed", __func__);
... ... @@ -1311,7 +1307,6 @@
1311 1307 /* Work around HCD bugs */
1312 1308 usb_clear_halt(serial->dev, command_port->read_urb->pipe);
1313 1309  
1314   - command_port->read_urb->dev = serial->dev;
1315 1310 retval = usb_submit_urb(command_port->read_urb, GFP_KERNEL);
1316 1311 if (retval) {
1317 1312 dev_err(&serial->dev->dev,
... ... @@ -1359,7 +1354,6 @@
1359 1354 list_del(tmp);
1360 1355 wrap = list_entry(tmp, struct whiteheat_urb_wrap, list);
1361 1356 urb = wrap->urb;
1362   - urb->dev = port->serial->dev;
1363 1357 spin_unlock_irqrestore(&info->lock, flags);
1364 1358 retval = usb_submit_urb(urb, GFP_KERNEL);
1365 1359 if (retval) {
... ... @@ -1439,7 +1433,6 @@
1439 1433 sent += tty_insert_flip_string(tty,
1440 1434 urb->transfer_buffer, urb->actual_length);
1441 1435  
1442   - urb->dev = port->serial->dev;
1443 1436 result = usb_submit_urb(urb, GFP_ATOMIC);
1444 1437 if (result) {
1445 1438 dev_err(&port->dev,