diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:05:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:56 -0700 |
commit | 34c43922e62708d45e9660eee4b4f1fb7b4bf2c7 (patch) | |
tree | 9d49b7a121b9e07f2ff24e28c45bfc052c63b324 /drivers/staging/comedi/drivers/icp_multi.c | |
parent | 71b5f4f11971dea972832ad63a994c7e5b45db6b (diff) | |
download | kernel_samsung_smdk4412-34c43922e62708d45e9660eee4b4f1fb7b4bf2c7.zip kernel_samsung_smdk4412-34c43922e62708d45e9660eee4b4f1fb7b4bf2c7.tar.gz kernel_samsung_smdk4412-34c43922e62708d45e9660eee4b4f1fb7b4bf2c7.tar.bz2 |
Staging: comedi: Remove comedi_subdevice typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers/icp_multi.c')
-rw-r--r-- | drivers/staging/comedi/drivers/icp_multi.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c index 0415214..ee17c6c 100644 --- a/drivers/staging/comedi/drivers/icp_multi.c +++ b/drivers/staging/comedi/drivers/icp_multi.c @@ -214,10 +214,10 @@ struct icp_multi_private { */ #if 0 -static int check_channel_list(struct comedi_device *dev, comedi_subdevice *s, +static int check_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, unsigned int *chanlist, unsigned int n_chan); #endif -static void setup_channel_list(struct comedi_device *dev, comedi_subdevice *s, +static void setup_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, unsigned int *chanlist, unsigned int n_chan); static int icp_multi_reset(struct comedi_device *dev); @@ -237,7 +237,7 @@ static int icp_multi_reset(struct comedi_device *dev); Parameters: struct comedi_device *dev Pointer to current device structure - comedi_subdevice *s Pointer to current subdevice structure + struct comedi_subdevice *s Pointer to current subdevice structure comedi_insn *insn Pointer to current comedi instruction unsigned int *data Pointer to analogue input data @@ -245,7 +245,7 @@ static int icp_multi_reset(struct comedi_device *dev); ============================================================================== */ -static int icp_multi_insn_read_ai(struct comedi_device *dev, comedi_subdevice *s, +static int icp_multi_insn_read_ai(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { int n, timeout; @@ -356,7 +356,7 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev, comedi_subdevice *s Parameters: struct comedi_device *dev Pointer to current device structure - comedi_subdevice *s Pointer to current subdevice structure + struct comedi_subdevice *s Pointer to current subdevice structure comedi_insn *insn Pointer to current comedi instruction unsigned int *data Pointer to analogue output data @@ -364,7 +364,7 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev, comedi_subdevice *s ============================================================================== */ -static int icp_multi_insn_write_ao(struct comedi_device *dev, comedi_subdevice *s, +static int icp_multi_insn_write_ao(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { int n, chan, range, timeout; @@ -464,7 +464,7 @@ static int icp_multi_insn_write_ao(struct comedi_device *dev, comedi_subdevice * Parameters: struct comedi_device *dev Pointer to current device structure - comedi_subdevice *s Pointer to current subdevice structure + struct comedi_subdevice *s Pointer to current subdevice structure comedi_insn *insn Pointer to current comedi instruction unsigned int *data Pointer to analogue output data @@ -472,7 +472,7 @@ static int icp_multi_insn_write_ao(struct comedi_device *dev, comedi_subdevice * ============================================================================== */ -static int icp_multi_insn_read_ao(struct comedi_device *dev, comedi_subdevice *s, +static int icp_multi_insn_read_ao(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { int n, chan; @@ -497,7 +497,7 @@ static int icp_multi_insn_read_ao(struct comedi_device *dev, comedi_subdevice *s Parameters: struct comedi_device *dev Pointer to current device structure - comedi_subdevice *s Pointer to current subdevice structure + struct comedi_subdevice *s Pointer to current subdevice structure comedi_insn *insn Pointer to current comedi instruction unsigned int *data Pointer to analogue output data @@ -505,7 +505,7 @@ static int icp_multi_insn_read_ao(struct comedi_device *dev, comedi_subdevice *s ============================================================================== */ -static int icp_multi_insn_bits_di(struct comedi_device *dev, comedi_subdevice *s, +static int icp_multi_insn_bits_di(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { data[1] = readw(devpriv->io_addr + ICP_MULTI_DI); @@ -523,7 +523,7 @@ static int icp_multi_insn_bits_di(struct comedi_device *dev, comedi_subdevice *s Parameters: struct comedi_device *dev Pointer to current device structure - comedi_subdevice *s Pointer to current subdevice structure + struct comedi_subdevice *s Pointer to current subdevice structure comedi_insn *insn Pointer to current comedi instruction unsigned int *data Pointer to analogue output data @@ -531,7 +531,7 @@ static int icp_multi_insn_bits_di(struct comedi_device *dev, comedi_subdevice *s ============================================================================== */ -static int icp_multi_insn_bits_do(struct comedi_device *dev, comedi_subdevice *s, +static int icp_multi_insn_bits_do(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { #ifdef ICP_MULTI_EXTDEBUG @@ -565,7 +565,7 @@ static int icp_multi_insn_bits_do(struct comedi_device *dev, comedi_subdevice *s Parameters: struct comedi_device *dev Pointer to current device structure - comedi_subdevice *s Pointer to current subdevice structure + struct comedi_subdevice *s Pointer to current subdevice structure comedi_insn *insn Pointer to current comedi instruction unsigned int *data Pointer to counter data @@ -573,7 +573,7 @@ static int icp_multi_insn_bits_do(struct comedi_device *dev, comedi_subdevice *s ============================================================================== */ -static int icp_multi_insn_read_ctr(struct comedi_device *dev, comedi_subdevice *s, +static int icp_multi_insn_read_ctr(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { return 0; @@ -589,7 +589,7 @@ static int icp_multi_insn_read_ctr(struct comedi_device *dev, comedi_subdevice * Parameters: struct comedi_device *dev Pointer to current device structure - comedi_subdevice *s Pointer to current subdevice structure + struct comedi_subdevice *s Pointer to current subdevice structure comedi_insn *insn Pointer to current comedi instruction unsigned int *data Pointer to counter data @@ -597,7 +597,7 @@ static int icp_multi_insn_read_ctr(struct comedi_device *dev, comedi_subdevice * ============================================================================== */ -static int icp_multi_insn_write_ctr(struct comedi_device *dev, comedi_subdevice *s, +static int icp_multi_insn_write_ctr(struct comedi_device *dev, struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) { return 0; @@ -680,7 +680,7 @@ static irqreturn_t interrupt_service_icp_multi(int irq, void *d PT_REGS_ARG) Parameters: struct comedi_device *dev Pointer to current sevice structure - comedi_subdevice *s Pointer to current subdevice structure + struct comedi_subdevice *s Pointer to current subdevice structure unsigned int *chanlist Pointer to packed channel list unsigned int n_chan Number of channels to scan @@ -689,7 +689,7 @@ static irqreturn_t interrupt_service_icp_multi(int irq, void *d PT_REGS_ARG) ============================================================================== */ -static int check_channel_list(struct comedi_device *dev, comedi_subdevice *s, +static int check_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, unsigned int *chanlist, unsigned int n_chan) { unsigned int i; @@ -735,7 +735,7 @@ static int check_channel_list(struct comedi_device *dev, comedi_subdevice *s, Parameters: struct comedi_device *dev Pointer to current sevice structure - comedi_subdevice *s Pointer to current subdevice structure + struct comedi_subdevice *s Pointer to current subdevice structure unsigned int *chanlist Pointer to packed channel list unsigned int n_chan Number of channels to scan @@ -743,7 +743,7 @@ static int check_channel_list(struct comedi_device *dev, comedi_subdevice *s, ============================================================================== */ -static void setup_channel_list(struct comedi_device *dev, comedi_subdevice *s, +static void setup_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, unsigned int *chanlist, unsigned int n_chan) { unsigned int i, range, chanprog; @@ -872,7 +872,7 @@ static int icp_multi_reset(struct comedi_device *dev) */ static int icp_multi_attach(struct comedi_device *dev, comedi_devconfig *it) { - comedi_subdevice *s; + struct comedi_subdevice *s; int ret, subdev, n_subdevices; unsigned int irq; struct pcilst_struct *card = NULL; |