aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-05-04 14:23:54 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-09 16:33:39 -0400
commit98b08941b20e41fcbd3aaa577381e656e1c41291 (patch)
treefc172990cf436e7a3e56b98d3912e63d2b1d810e /drivers
parent294f930d98be86fb4f34302c718a49719650857f (diff)
staging: comedi: remove debug tracing in vmk80xx driver
The vmk80xx driver uses a non-existant Kconfig symbol to enable function call debug tracing. This output is really just noise and doesn't serve any useful purpose. Remove all it's uses in the driver. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/vmk80xx.c67
1 files changed, 0 insertions, 67 deletions
diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
index a7db6862f75c..d0e106523a56 100644
--- a/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
@@ -151,27 +151,12 @@ MODULE_DEVICE_TABLE(usb, vmk80xx_id_table);
151#define URB_RCV_FLAG (1 << 0) 151#define URB_RCV_FLAG (1 << 0)
152#define URB_SND_FLAG (1 << 1) 152#define URB_SND_FLAG (1 << 1)
153 153
154#define CONFIG_VMK80XX_DEBUG
155#undef CONFIG_VMK80XX_DEBUG
156
157#ifdef CONFIG_VMK80XX_DEBUG
158static int dbgvm = 1;
159#else
160static int dbgvm;
161#endif
162
163#ifdef CONFIG_COMEDI_DEBUG 154#ifdef CONFIG_COMEDI_DEBUG
164static int dbgcm = 1; 155static int dbgcm = 1;
165#else 156#else
166static int dbgcm; 157static int dbgcm;
167#endif 158#endif
168 159
169#define dbgvm(fmt, arg...) \
170do { \
171 if (dbgvm) \
172 printk(KERN_DEBUG fmt, ##arg); \
173} while (0)
174
175#define dbgcm(fmt, arg...) \ 160#define dbgcm(fmt, arg...) \
176do { \ 161do { \
177 if (dbgcm) \ 162 if (dbgcm) \
@@ -254,8 +239,6 @@ static void vmk80xx_tx_callback(struct urb *urb)
254 struct vmk80xx_usb *dev = urb->context; 239 struct vmk80xx_usb *dev = urb->context;
255 int stat = urb->status; 240 int stat = urb->status;
256 241
257 dbgvm("vmk80xx: %s\n", __func__);
258
259 if (stat && !(stat == -ENOENT 242 if (stat && !(stat == -ENOENT
260 || stat == -ECONNRESET || stat == -ESHUTDOWN)) 243 || stat == -ECONNRESET || stat == -ESHUTDOWN))
261 dbgcm("comedi#: vmk80xx: %s - nonzero urb status (%d)\n", 244 dbgcm("comedi#: vmk80xx: %s - nonzero urb status (%d)\n",
@@ -274,8 +257,6 @@ static void vmk80xx_rx_callback(struct urb *urb)
274 struct vmk80xx_usb *dev = urb->context; 257 struct vmk80xx_usb *dev = urb->context;
275 int stat = urb->status; 258 int stat = urb->status;
276 259
277 dbgvm("vmk80xx: %s\n", __func__);
278
279 switch (stat) { 260 switch (stat) {
280 case 0: 261 case 0:
281 break; 262 break;
@@ -316,8 +297,6 @@ static int vmk80xx_check_data_link(struct vmk80xx_usb *dev)
316 unsigned char tx[1]; 297 unsigned char tx[1];
317 unsigned char rx[2]; 298 unsigned char rx[2];
318 299
319 dbgvm("vmk80xx: %s\n", __func__);
320
321 tx_pipe = usb_sndbulkpipe(dev->udev, 0x01); 300 tx_pipe = usb_sndbulkpipe(dev->udev, 0x01);
322 rx_pipe = usb_rcvbulkpipe(dev->udev, 0x81); 301 rx_pipe = usb_rcvbulkpipe(dev->udev, 0x81);
323 302
@@ -342,8 +321,6 @@ static void vmk80xx_read_eeprom(struct vmk80xx_usb *dev, int flag)
342 unsigned char rx[64]; 321 unsigned char rx[64];
343 int cnt; 322 int cnt;
344 323
345 dbgvm("vmk80xx: %s\n", __func__);
346
347 tx_pipe = usb_sndbulkpipe(dev->udev, 0x01); 324 tx_pipe = usb_sndbulkpipe(dev->udev, 0x01);
348 rx_pipe = usb_rcvbulkpipe(dev->udev, 0x81); 325 rx_pipe = usb_rcvbulkpipe(dev->udev, 0x81);
349 326
@@ -371,8 +348,6 @@ static int vmk80xx_reset_device(struct vmk80xx_usb *dev)
371 int ival; 348 int ival;
372 size_t size; 349 size_t size;
373 350
374 dbgvm("vmk80xx: %s\n", __func__);
375
376 urb = usb_alloc_urb(0, GFP_KERNEL); 351 urb = usb_alloc_urb(0, GFP_KERNEL);
377 if (!urb) 352 if (!urb)
378 return -ENOMEM; 353 return -ENOMEM;
@@ -410,8 +385,6 @@ static void vmk80xx_build_int_urb(struct urb *urb, int flag)
410 void (*callback) (struct urb *); 385 void (*callback) (struct urb *);
411 int ival; 386 int ival;
412 387
413 dbgvm("vmk80xx: %s\n", __func__);
414
415 if (flag & URB_RCV_FLAG) { 388 if (flag & URB_RCV_FLAG) {
416 rx_addr = dev->ep_rx->bEndpointAddress; 389 rx_addr = dev->ep_rx->bEndpointAddress;
417 pipe = usb_rcvintpipe(dev->udev, rx_addr); 390 pipe = usb_rcvintpipe(dev->udev, rx_addr);
@@ -439,8 +412,6 @@ static void vmk80xx_do_bulk_msg(struct vmk80xx_usb *dev)
439 unsigned int rx_pipe; 412 unsigned int rx_pipe;
440 size_t size; 413 size_t size;
441 414
442 dbgvm("vmk80xx: %s\n", __func__);
443
444 set_bit(TRANS_IN_BUSY, &dev->flags); 415 set_bit(TRANS_IN_BUSY, &dev->flags);
445 set_bit(TRANS_OUT_BUSY, &dev->flags); 416 set_bit(TRANS_OUT_BUSY, &dev->flags);
446 417
@@ -468,8 +439,6 @@ static int vmk80xx_read_packet(struct vmk80xx_usb *dev)
468 struct urb *urb; 439 struct urb *urb;
469 int retval; 440 int retval;
470 441
471 dbgvm("vmk80xx: %s\n", __func__);
472
473 if (!dev->intf) 442 if (!dev->intf)
474 return -ENODEV; 443 return -ENODEV;
475 444
@@ -516,8 +485,6 @@ static int vmk80xx_write_packet(struct vmk80xx_usb *dev, int cmd)
516 struct urb *urb; 485 struct urb *urb;
517 int retval; 486 int retval;
518 487
519 dbgvm("vmk80xx: %s\n", __func__);
520
521 if (!dev->intf) 488 if (!dev->intf)
522 return -ENODEV; 489 return -ENODEV;
523 490
@@ -592,8 +559,6 @@ static int vmk80xx_ai_rinsn(struct comedi_device *cdev,
592 int reg[2]; 559 int reg[2];
593 int n; 560 int n;
594 561
595 dbgvm("vmk80xx: %s\n", __func__);
596
597 n = rudimentary_check(dev, DIR_IN); 562 n = rudimentary_check(dev, DIR_IN);
598 if (n) 563 if (n)
599 return n; 564 return n;
@@ -645,8 +610,6 @@ static int vmk80xx_ao_winsn(struct comedi_device *cdev,
645 int reg; 610 int reg;
646 int n; 611 int n;
647 612
648 dbgvm("vmk80xx: %s\n", __func__);
649
650 n = rudimentary_check(dev, DIR_OUT); 613 n = rudimentary_check(dev, DIR_OUT);
651 if (n) 614 if (n)
652 return n; 615 return n;
@@ -690,8 +653,6 @@ static int vmk80xx_ao_rinsn(struct comedi_device *cdev,
690 int reg; 653 int reg;
691 int n; 654 int n;
692 655
693 dbgvm("vmk80xx: %s\n", __func__);
694
695 n = rudimentary_check(dev, DIR_IN); 656 n = rudimentary_check(dev, DIR_IN);
696 if (n) 657 if (n)
697 return n; 658 return n;
@@ -724,8 +685,6 @@ static int vmk80xx_di_bits(struct comedi_device *cdev,
724 int reg; 685 int reg;
725 int retval; 686 int retval;
726 687
727 dbgvm("vmk80xx: %s\n", __func__);
728
729 retval = rudimentary_check(dev, DIR_IN); 688 retval = rudimentary_check(dev, DIR_IN);
730 if (retval) 689 if (retval)
731 return retval; 690 return retval;
@@ -770,8 +729,6 @@ static int vmk80xx_di_rinsn(struct comedi_device *cdev,
770 int inp; 729 int inp;
771 int n; 730 int n;
772 731
773 dbgvm("vmk80xx: %s\n", __func__);
774
775 n = rudimentary_check(dev, DIR_IN); 732 n = rudimentary_check(dev, DIR_IN);
776 if (n) 733 if (n)
777 return n; 734 return n;
@@ -817,8 +774,6 @@ static int vmk80xx_do_winsn(struct comedi_device *cdev,
817 int cmd; 774 int cmd;
818 int n; 775 int n;
819 776
820 dbgvm("vmk80xx: %s\n", __func__);
821
822 n = rudimentary_check(dev, DIR_OUT); 777 n = rudimentary_check(dev, DIR_OUT);
823 if (n) 778 if (n)
824 return n; 779 return n;
@@ -865,8 +820,6 @@ static int vmk80xx_do_rinsn(struct comedi_device *cdev,
865 int reg; 820 int reg;
866 int n; 821 int n;
867 822
868 dbgvm("vmk80xx: %s\n", __func__);
869
870 n = rudimentary_check(dev, DIR_IN); 823 n = rudimentary_check(dev, DIR_IN);
871 if (n) 824 if (n)
872 return n; 825 return n;
@@ -899,8 +852,6 @@ static int vmk80xx_do_bits(struct comedi_device *cdev,
899 int dir, reg, cmd; 852 int dir, reg, cmd;
900 int retval; 853 int retval;
901 854
902 dbgvm("vmk80xx: %s\n", __func__);
903
904 dir = 0; 855 dir = 0;
905 856
906 if (data[0]) 857 if (data[0])
@@ -966,8 +917,6 @@ static int vmk80xx_cnt_rinsn(struct comedi_device *cdev,
966 int reg[2]; 917 int reg[2];
967 int n; 918 int n;
968 919
969 dbgvm("vmk80xx: %s\n", __func__);
970
971 n = rudimentary_check(dev, DIR_IN); 920 n = rudimentary_check(dev, DIR_IN);
972 if (n) 921 if (n)
973 return n; 922 return n;
@@ -1016,8 +965,6 @@ static int vmk80xx_cnt_cinsn(struct comedi_device *cdev,
1016 int reg; 965 int reg;
1017 int n; 966 int n;
1018 967
1019 dbgvm("vmk80xx: %s\n", __func__);
1020
1021 n = rudimentary_check(dev, DIR_OUT); 968 n = rudimentary_check(dev, DIR_OUT);
1022 if (n) 969 if (n)
1023 return n; 970 return n;
@@ -1064,8 +1011,6 @@ static int vmk80xx_cnt_winsn(struct comedi_device *cdev,
1064 int cmd; 1011 int cmd;
1065 int n; 1012 int n;
1066 1013
1067 dbgvm("vmk80xx: %s\n", __func__);
1068
1069 n = rudimentary_check(dev, DIR_OUT); 1014 n = rudimentary_check(dev, DIR_OUT);
1070 if (n) 1015 if (n)
1071 return n; 1016 return n;
@@ -1110,8 +1055,6 @@ static int vmk80xx_pwm_rinsn(struct comedi_device *cdev,
1110 int reg[2]; 1055 int reg[2];
1111 int n; 1056 int n;
1112 1057
1113 dbgvm("vmk80xx: %s\n", __func__);
1114
1115 n = rudimentary_check(dev, DIR_IN); 1058 n = rudimentary_check(dev, DIR_IN);
1116 if (n) 1059 if (n)
1117 return n; 1060 return n;
@@ -1145,8 +1088,6 @@ static int vmk80xx_pwm_winsn(struct comedi_device *cdev,
1145 int cmd; 1088 int cmd;
1146 int n; 1089 int n;
1147 1090
1148 dbgvm("vmk80xx: %s\n", __func__);
1149
1150 n = rudimentary_check(dev, DIR_OUT); 1091 n = rudimentary_check(dev, DIR_OUT);
1151 if (n) 1092 if (n)
1152 return n; 1093 return n;
@@ -1195,8 +1136,6 @@ static int vmk80xx_attach(struct comedi_device *cdev,
1195 struct comedi_subdevice *s; 1136 struct comedi_subdevice *s;
1196 int minor; 1137 int minor;
1197 1138
1198 dbgvm("vmk80xx: %s\n", __func__);
1199
1200 mutex_lock(&glb_mutex); 1139 mutex_lock(&glb_mutex);
1201 1140
1202 for (i = 0; i < VMK80XX_MAX_BOARDS; i++) 1141 for (i = 0; i < VMK80XX_MAX_BOARDS; i++)
@@ -1316,8 +1255,6 @@ static int vmk80xx_detach(struct comedi_device *cdev)
1316 struct vmk80xx_usb *dev; 1255 struct vmk80xx_usb *dev;
1317 int minor; 1256 int minor;
1318 1257
1319 dbgvm("vmk80xx: %s\n", __func__);
1320
1321 if (!cdev) 1258 if (!cdev)
1322 return -EFAULT; 1259 return -EFAULT;
1323 1260
@@ -1350,8 +1287,6 @@ static int vmk80xx_probe(struct usb_interface *intf,
1350 struct usb_endpoint_descriptor *ep_desc; 1287 struct usb_endpoint_descriptor *ep_desc;
1351 size_t size; 1288 size_t size;
1352 1289
1353 dbgvm("vmk80xx: %s\n", __func__);
1354
1355 mutex_lock(&glb_mutex); 1290 mutex_lock(&glb_mutex);
1356 1291
1357 for (i = 0; i < VMK80XX_MAX_BOARDS; i++) 1292 for (i = 0; i < VMK80XX_MAX_BOARDS; i++)
@@ -1499,8 +1434,6 @@ static void vmk80xx_disconnect(struct usb_interface *intf)
1499{ 1434{
1500 struct vmk80xx_usb *dev = usb_get_intfdata(intf); 1435 struct vmk80xx_usb *dev = usb_get_intfdata(intf);
1501 1436
1502 dbgvm("vmk80xx: %s\n", __func__);
1503
1504 if (!dev) 1437 if (!dev)
1505 return; 1438 return;
1506 1439