aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/drivers.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-04-27 17:44:31 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 14:00:33 -0400
commit5f74ea14c07fee91d3bdbaad88bff6264c6200e6 (patch)
treead077b6cac71be4ec8f0f136bd7b2473718e65e7 /drivers/staging/comedi/drivers.c
parent81874ff7895f332920621104308e803434a17183 (diff)
Staging: comedi: remove comedi-specific wrappers
There are a number of comedi "wrappers" for some RT functions that are about to go away. This patch removes all of the wrapper calls within the comedi drivers and core in order to prepare for removing the RT comedi code. Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers.c')
-rw-r--r--drivers/staging/comedi/drivers.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index e5185ac3604..42a02571ff1 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -554,7 +554,7 @@ unsigned int comedi_buf_munge(struct comedi_async *async, unsigned int num_bytes
554 554
555 block_size = num_bytes - count; 555 block_size = num_bytes - count;
556 if (block_size < 0) { 556 if (block_size < 0) {
557 rt_printk("%s: %s: bug! block_size is negative\n", 557 printk("%s: %s: bug! block_size is negative\n",
558 __FILE__, __func__); 558 __FILE__, __func__);
559 break; 559 break;
560 } 560 }
@@ -633,8 +633,7 @@ unsigned comedi_buf_write_free(struct comedi_async *async, unsigned int nbytes)
633{ 633{
634 if ((int)(async->buf_write_count + nbytes - 634 if ((int)(async->buf_write_count + nbytes -
635 async->buf_write_alloc_count) > 0) { 635 async->buf_write_alloc_count) > 0) {
636 rt_printk 636 printk("comedi: attempted to write-free more bytes than have been write-allocated.\n");
637 ("comedi: attempted to write-free more bytes than have been write-allocated.\n");
638 nbytes = async->buf_write_alloc_count - async->buf_write_count; 637 nbytes = async->buf_write_alloc_count - async->buf_write_count;
639 } 638 }
640 async->buf_write_count += nbytes; 639 async->buf_write_count += nbytes;
@@ -667,8 +666,7 @@ unsigned comedi_buf_read_free(struct comedi_async *async, unsigned int nbytes)
667 smp_mb(); 666 smp_mb();
668 if ((int)(async->buf_read_count + nbytes - 667 if ((int)(async->buf_read_count + nbytes -
669 async->buf_read_alloc_count) > 0) { 668 async->buf_read_alloc_count) > 0) {
670 rt_printk 669 printk("comedi: attempted to read-free more bytes than have been read-allocated.\n");
671 ("comedi: attempted to read-free more bytes than have been read-allocated.\n");
672 nbytes = async->buf_read_alloc_count - async->buf_read_count; 670 nbytes = async->buf_read_alloc_count - async->buf_read_count;
673 } 671 }
674 async->buf_read_count += nbytes; 672 async->buf_read_count += nbytes;