Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d26f6e57e71169bab907bdf716021b2d19bd09f0

Authored by Greg Kroah-Hartman
1 parent 457163c4c7
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

USB: legotower: remove unneeded tracing macros 

Remove the unneeded tracing macros in this driver.  The kernel has a
built-in trace function that can be used if this is really still needed.

Cc: Juergen Stuber <starblue@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 1 additions and 41 deletions Side-by-side Diff

drivers/usb/misc/legousbtower.c
Diff comments   View file @ d26f6e5
... ... @@ -318,8 +318,6 @@
318 318 */
319 319 static inline void tower_delete (struct lego_usb_tower *dev)
320 320 {
321   - dbg(2, "%s: enter", __func__);
322   -
323 321 tower_abort_transfers (dev);
324 322  
325 323 /* free data structures */
... ... @@ -329,8 +327,6 @@
329 327 kfree (dev->interrupt_in_buffer);
330 328 kfree (dev->interrupt_out_buffer);
331 329 kfree (dev);
332   -
333   - dbg(2, "%s: leave", __func__);
334 330 }
335 331  
336 332  
... ... @@ -346,8 +342,6 @@
346 342 struct tower_reset_reply reset_reply;
347 343 int result;
348 344  
349   - dbg(2, "%s: enter", __func__);
350   -
351 345 nonseekable_open(inode, file);
352 346 subminor = iminor(inode);
353 347  
... ... @@ -435,8 +429,6 @@
435 429 mutex_unlock(&dev->lock);
436 430  
437 431 exit:
438   - dbg(2, "%s: leave, return value %d ", __func__, retval);
439   -
440 432 return retval;
441 433 }
442 434  
... ... @@ -448,8 +440,6 @@
448 440 struct lego_usb_tower *dev;
449 441 int retval = 0;
450 442  
451   - dbg(2, "%s: enter", __func__);
452   -
453 443 dev = file->private_data;
454 444  
455 445 if (dev == NULL) {
... ... @@ -491,7 +481,6 @@
491 481 exit:
492 482 mutex_unlock(&open_disc_mutex);
493 483 exit_nolock:
494   - dbg(2, "%s: leave, return value %d", __func__, retval);
495 484 return retval;
496 485 }
497 486  
498 487  
... ... @@ -502,11 +491,9 @@
502 491 */
503 492 static void tower_abort_transfers (struct lego_usb_tower *dev)
504 493 {
505   - dbg(2, "%s: enter", __func__);
506   -
507 494 if (dev == NULL) {
508 495 dbg(1, "%s: dev is null", __func__);
509   - goto exit;
  496 + return;
510 497 }
511 498  
512 499 /* shutdown transfer */
... ... @@ -518,9 +505,6 @@
518 505 }
519 506 if (dev->interrupt_out_busy && dev->udev)
520 507 usb_kill_urb(dev->interrupt_out_urb);
521   -
522   -exit:
523   - dbg(2, "%s: leave", __func__);
524 508 }
525 509  
526 510  
... ... @@ -553,8 +537,6 @@
553 537 struct lego_usb_tower *dev;
554 538 unsigned int mask = 0;
555 539  
556   - dbg(2, "%s: enter", __func__);
557   -
558 540 dev = file->private_data;
559 541  
560 542 if (!dev->udev)
... ... @@ -571,8 +553,6 @@
571 553 mask |= POLLOUT | POLLWRNORM;
572 554 }
573 555  
574   - dbg(2, "%s: leave, mask = %d", __func__, mask);
575   -
576 556 return mask;
577 557 }
578 558  
... ... @@ -597,8 +577,6 @@
597 577 int retval = 0;
598 578 unsigned long timeout = 0;
599 579  
600   - dbg(2, "%s: enter, count = %Zd", __func__, count);
601   -
602 580 dev = file->private_data;
603 581  
604 582 /* lock this object */
... ... @@ -672,7 +650,6 @@
672 650 mutex_unlock(&dev->lock);
673 651  
674 652 exit:
675   - dbg(2, "%s: leave, return value %d", __func__, retval);
676 653 return retval;
677 654 }
678 655  
... ... @@ -686,8 +663,6 @@
686 663 size_t bytes_to_write;
687 664 int retval = 0;
688 665  
689   - dbg(2, "%s: enter, count = %Zd", __func__, count);
690   -
691 666 dev = file->private_data;
692 667  
693 668 /* lock this object */
... ... @@ -757,8 +732,6 @@
757 732 mutex_unlock(&dev->lock);
758 733  
759 734 exit:
760   - dbg(2, "%s: leave, return value %d", __func__, retval);
761   -
762 735 return retval;
763 736 }
764 737  
... ... @@ -772,8 +745,6 @@
772 745 int status = urb->status;
773 746 int retval;
774 747  
775   - dbg(4, "%s: enter, status %d", __func__, status);
776   -
777 748 lego_usb_tower_debug_data(5, __func__, urb->actual_length, urb->transfer_buffer);
778 749  
779 750 if (status) {
... ... @@ -817,7 +788,6 @@
817 788 wake_up_interruptible (&dev->read_wait);
818 789  
819 790 lego_usb_tower_debug_data(5, __func__, urb->actual_length, urb->transfer_buffer);
820   - dbg(4, "%s: leave, status %d", __func__, status);
821 791 }
822 792  
823 793  
... ... @@ -829,7 +799,6 @@
829 799 struct lego_usb_tower *dev = urb->context;
830 800 int status = urb->status;
831 801  
832   - dbg(4, "%s: enter, status %d", __func__, status);
833 802 lego_usb_tower_debug_data(5, __func__, urb->actual_length, urb->transfer_buffer);
834 803  
835 804 /* sync/async unlink faults aren't errors */
... ... @@ -844,7 +813,6 @@
844 813 wake_up_interruptible(&dev->write_wait);
845 814  
846 815 lego_usb_tower_debug_data(5, __func__, urb->actual_length, urb->transfer_buffer);
847   - dbg(4, "%s: leave, status %d", __func__, status);
848 816 }
849 817  
850 818  
... ... @@ -866,8 +834,6 @@
866 834 int retval = -ENOMEM;
867 835 int result;
868 836  
869   - dbg(2, "%s: enter", __func__);
870   -
871 837 /* allocate memory for our device state and initialize it */
872 838  
873 839 dev = kmalloc (sizeof(struct lego_usb_tower), GFP_KERNEL);
... ... @@ -993,8 +959,6 @@
993 959  
994 960  
995 961 exit:
996   - dbg(2, "%s: leave, return value 0x%.8lx (dev)", __func__, (long) dev);
997   -
998 962 return retval;
999 963  
1000 964 error:
... ... @@ -1013,8 +977,6 @@
1013 977 struct lego_usb_tower *dev;
1014 978 int minor;
1015 979  
1016   - dbg(2, "%s: enter", __func__);
1017   -
1018 980 dev = usb_get_intfdata (interface);
1019 981 mutex_lock(&open_disc_mutex);
1020 982 usb_set_intfdata (interface, NULL);
... ... @@ -1041,8 +1003,6 @@
1041 1003  
1042 1004 dev_info(&interface->dev, "LEGO USB Tower #%d now disconnected\n",
1043 1005 (minor - LEGO_USB_TOWER_MINOR_BASE));
1044   -
1045   - dbg(2, "%s: leave", __func__);
1046 1006 }
1047 1007  
1048 1008 module_usb_driver(tower_driver);