aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/drivers/quatech_daqp_cs.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-03-16 22:05:02 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:53:55 -0700
commit790c55415aa31f4c732729f94d2c3a54f7d3bfc2 (patch)
treeb99f2742dbaa8f43cc97df979ca507b602b3f7cd /drivers/staging/comedi/drivers/quatech_daqp_cs.c
parentStaging: comedi: Remove comedi_t typedef (diff)
downloadlinux-dev-790c55415aa31f4c732729f94d2c3a54f7d3bfc2.tar.xz
linux-dev-790c55415aa31f4c732729f94d2c3a54f7d3bfc2.zip
Staging: comedi: Remove lsampl_t and sampl_t typedefs
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers/quatech_daqp_cs.c')
-rw-r--r--drivers/staging/comedi/drivers/quatech_daqp_cs.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index 04fe5e397b55..ac34c5183c0c 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -313,7 +313,7 @@ static void daqp_interrupt(int irq, void *dev_id PT_REGS_ARG)
while (!((status = inb(dev->iobase + DAQP_STATUS))
& DAQP_STATUS_FIFO_EMPTY)) {
- sampl_t data;
+ short data;
if (status & DAQP_STATUS_DATA_LOST) {
s->async->events |=
@@ -362,7 +362,7 @@ static void daqp_interrupt(int irq, void *dev_id PT_REGS_ARG)
/* One-shot analog data acquisition routine */
static int daqp_ai_insn_read(comedi_device * dev, comedi_subdevice * s,
- comedi_insn * insn, lsampl_t * data)
+ comedi_insn * insn, unsigned int * data)
{
local_info_t *local = (local_info_t *) s->private;
int i;
@@ -794,7 +794,7 @@ static int daqp_ai_cmd(comedi_device * dev, comedi_subdevice * s)
/* Single-shot analog output routine */
static int daqp_ao_insn_write(comedi_device * dev, comedi_subdevice * s,
- comedi_insn * insn, lsampl_t * data)
+ comedi_insn * insn, unsigned int * data)
{
local_info_t *local = (local_info_t *) s->private;
int d;
@@ -821,7 +821,7 @@ static int daqp_ao_insn_write(comedi_device * dev, comedi_subdevice * s,
/* Digital input routine */
static int daqp_di_insn_read(comedi_device * dev, comedi_subdevice * s,
- comedi_insn * insn, lsampl_t * data)
+ comedi_insn * insn, unsigned int * data)
{
local_info_t *local = (local_info_t *) s->private;
@@ -837,7 +837,7 @@ static int daqp_di_insn_read(comedi_device * dev, comedi_subdevice * s,
/* Digital output routine */
static int daqp_do_insn_write(comedi_device * dev, comedi_subdevice * s,
- comedi_insn * insn, lsampl_t * data)
+ comedi_insn * insn, unsigned int * data)
{
local_info_t *local = (local_info_t *) s->private;