summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/fl512.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/fl512.c
parent0b3fb27fa7b4bf811c31ee66453cda0a6d94aa6c (diff)
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/fl512.c')
-rw-r--r--drivers/staging/comedi/drivers/fl512.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c
index 81c47304d204..26709987278c 100644
--- a/drivers/staging/comedi/drivers/fl512.c
+++ b/drivers/staging/comedi/drivers/fl512.c
@@ -25,7 +25,7 @@ Configuration options:
#define FL512_SIZE 16 /* the size of the used memory */
typedef struct {
- sampl_t ao_readback[2];
+ short ao_readback[2];
} fl512_private;
#define devpriv ((fl512_private *) dev->private)
@@ -53,17 +53,17 @@ static comedi_driver driver_fl512 = {
COMEDI_INITCLEANUP(driver_fl512);
static int fl512_ai_insn(comedi_device * dev,
- comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+ comedi_subdevice * s, comedi_insn * insn, unsigned int * data);
static int fl512_ao_insn(comedi_device * dev,
- comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+ comedi_subdevice * s, comedi_insn * insn, unsigned int * data);
static int fl512_ao_insn_readback(comedi_device * dev,
- comedi_subdevice * s, comedi_insn * insn, lsampl_t * data);
+ comedi_subdevice * s, comedi_insn * insn, unsigned int * data);
/*
* fl512_ai_insn : this is the analog input function
*/
static int fl512_ai_insn(comedi_device * dev,
- comedi_subdevice * s, comedi_insn * insn, lsampl_t * data)
+ comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{
int n;
unsigned int lo_byte, hi_byte;
@@ -88,7 +88,7 @@ static int fl512_ai_insn(comedi_device * dev,
* fl512_ao_insn : used to write to a DA port n times
*/
static int fl512_ao_insn(comedi_device * dev,
- comedi_subdevice * s, comedi_insn * insn, lsampl_t * data)
+ comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{
int n;
int chan = CR_CHAN(insn->chanspec); /* get chan to write */
@@ -109,7 +109,7 @@ static int fl512_ao_insn(comedi_device * dev,
* DA port
*/
static int fl512_ao_insn_readback(comedi_device * dev,
- comedi_subdevice * s, comedi_insn * insn, lsampl_t * data)
+ comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{
int n;
int chan = CR_CHAN(insn->chanspec);