diff options
| author | Bill Pemberton | 2009-03-17 03:05:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2009-04-03 23:53:57 +0200 |
| commit | 90035c0886b256d75bced13b3b3cea5234aff136 (patch) | |
| tree | 8dbe0756731a1e3a771ce9f77c865f572db042e1 /drivers/staging/comedi | |
| parent | Staging: comedi: Remove comedi_cmd typedef (diff) | |
| download | kernel-qcow2-linux-90035c0886b256d75bced13b3b3cea5234aff136.tar.gz kernel-qcow2-linux-90035c0886b256d75bced13b3b3cea5234aff136.tar.xz kernel-qcow2-linux-90035c0886b256d75bced13b3b3cea5234aff136.zip | |
Staging: comedi: Remove comedi_insn typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi')
150 files changed, 1143 insertions, 1144 deletions
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h index 1057c9126b85..3c99179f90ef 100644 --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h @@ -303,14 +303,13 @@ enum comedi_support_level { #define COMEDI_CMD _IOR(CIO, 9, struct comedi_cmd) #define COMEDI_CMDTEST _IOR(CIO, 10, struct comedi_cmd) #define COMEDI_INSNLIST _IOR(CIO, 11, comedi_insnlist) -#define COMEDI_INSN _IOR(CIO, 12, comedi_insn) +#define COMEDI_INSN _IOR(CIO, 12, struct comedi_insn) #define COMEDI_BUFCONFIG _IOR(CIO, 13, comedi_bufconfig) #define COMEDI_BUFINFO _IOWR(CIO, 14, comedi_bufinfo) #define COMEDI_POLL _IO(CIO, 15) /* structures */ -typedef struct comedi_insn_struct comedi_insn; typedef struct comedi_insnlist_struct comedi_insnlist; typedef struct comedi_chaninfo_struct comedi_chaninfo; typedef struct comedi_subdinfo_struct comedi_subdinfo; @@ -336,7 +335,7 @@ struct comedi_trig { unsigned int unused[3]; }; -struct comedi_insn_struct { +struct comedi_insn { unsigned int insn; unsigned int n; unsigned int *data; @@ -347,7 +346,7 @@ struct comedi_insn_struct { struct comedi_insnlist_struct { unsigned int n_insns; - comedi_insn *insns; + struct comedi_insn *insns; }; struct comedi_cmd { diff --git a/drivers/staging/comedi/comedi_compat32.c b/drivers/staging/comedi/comedi_compat32.c index 3eb1d5cdbe7a..62990905774d 100644 --- a/drivers/staging/comedi/comedi_compat32.c +++ b/drivers/staging/comedi/comedi_compat32.c @@ -91,7 +91,7 @@ struct comedi32_insn_struct { struct comedi32_insnlist_struct { unsigned int n_insns; - compat_uptr_t insns; /* 32-bit 'comedi_insn *' */ + compat_uptr_t insns; /* 32-bit 'struct comedi_insn *' */ }; /* Handle translated ioctl. */ @@ -329,7 +329,7 @@ static int compat_cmdtest(struct file *file, unsigned long arg) } /* Copy 32-bit insn structure to native insn structure. */ -static int get_compat_insn(comedi_insn __user *insn, +static int get_compat_insn(struct comedi_insn __user *insn, struct comedi32_insn_struct __user *insn32) { int err; @@ -362,7 +362,7 @@ static int compat_insnlist(struct file *file, unsigned long arg) { struct combined_insnlist { comedi_insnlist insnlist; - comedi_insn insn[1]; + struct comedi_insn insn[1]; } __user *s; struct comedi32_insnlist_struct __user *insnlist32; struct comedi32_insn_struct __user *insn32; @@ -410,7 +410,7 @@ static int compat_insnlist(struct file *file, unsigned long arg) /* Handle 32-bit COMEDI_INSN ioctl. */ static int compat_insn(struct file *file, unsigned long arg) { - comedi_insn __user *insn; + struct comedi_insn __user *insn; struct comedi32_insn_struct __user *insn32; int rc; diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 1d83c0890b4e..d944c5e64eb4 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -607,7 +607,7 @@ copyback: return 0; } -static int parse_insn(struct comedi_device *dev, comedi_insn *insn, unsigned int *data, +static int parse_insn(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data, void *file); /* * COMEDI_INSNLIST @@ -629,7 +629,7 @@ static int parse_insn(struct comedi_device *dev, comedi_insn *insn, unsigned int static int do_insnlist_ioctl(struct comedi_device *dev, void *arg, void *file) { comedi_insnlist insnlist; - comedi_insn *insns = NULL; + struct comedi_insn *insns = NULL; unsigned int *data = NULL; int i = 0; int ret = 0; @@ -644,7 +644,7 @@ static int do_insnlist_ioctl(struct comedi_device *dev, void *arg, void *file) goto error; } - insns = kmalloc(sizeof(comedi_insn) * insnlist.n_insns, GFP_KERNEL); + insns = kmalloc(sizeof(struct comedi_insn) * insnlist.n_insns, GFP_KERNEL); if (!insns) { DPRINTK("kmalloc failed\n"); ret = -ENOMEM; @@ -652,7 +652,7 @@ static int do_insnlist_ioctl(struct comedi_device *dev, void *arg, void *file) } if (copy_from_user(insns, insnlist.insns, - sizeof(comedi_insn) * insnlist.n_insns)) { + sizeof(struct comedi_insn) * insnlist.n_insns)) { DPRINTK("copy_from_user failed\n"); ret = -EFAULT; goto error; @@ -696,7 +696,7 @@ error: return i; } -static int check_insn_config_length(comedi_insn *insn, unsigned int *data) +static int check_insn_config_length(struct comedi_insn *insn, unsigned int *data) { if (insn->n < 1) return -EINVAL; @@ -757,7 +757,7 @@ static int check_insn_config_length(comedi_insn *insn, unsigned int *data) return -EINVAL; } -static int parse_insn(struct comedi_device *dev, comedi_insn *insn, unsigned int *data, +static int parse_insn(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data, void *file) { struct comedi_subdevice *s; @@ -911,7 +911,7 @@ out: * pointer to insn * * reads: - * comedi_insn struct at arg + * struct comedi_insn struct at arg * data (for writes) * * writes: @@ -919,7 +919,7 @@ out: */ static int do_insn_ioctl(struct comedi_device *dev, void *arg, void *file) { - comedi_insn insn; + struct comedi_insn insn; unsigned int *data = NULL; int ret = 0; @@ -929,7 +929,7 @@ static int do_insn_ioctl(struct comedi_device *dev, void *arg, void *file) goto error; } - if (copy_from_user(&insn, arg, sizeof(comedi_insn))) { + if (copy_from_user(&insn, arg, sizeof(struct comedi_insn))) { ret = -EFAULT; goto error; } diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index 8e60fdb33964..36dd82299c0a 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -155,13 +155,13 @@ struct comedi_subdevice { unsigned int *chanlist; /* driver-owned chanlist (not used) */ - int (*insn_read) (struct comedi_device *, struct comedi_subdevice *, comedi_insn *, + int (*insn_read) (struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *, unsigned int *); - int (*insn_write) (struct comedi_device *, struct comedi_subdevice *, comedi_insn *, + int (*insn_write) (struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *, unsigned int *); - int (*insn_bits) (struct comedi_device *, struct comedi_subdevice *, comedi_insn *, + int (*insn_bits) (struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *, unsigned int *); - int (*insn_config) (struct comedi_device *, struct comedi_subdevice *, comedi_insn *, + int (*insn_config) (struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *, unsigned int *); int (*do_cmd) (struct comedi_device *, struct comedi_subdevice *); @@ -381,7 +381,7 @@ void comedi_set_subdevice_runflags(struct comedi_subdevice *s, unsigned mask, unsigned bits); unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s); int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); /* range stuff */ diff --git a/drivers/staging/comedi/comedilib.h b/drivers/staging/comedi/comedilib.h index e94f1b79d2c3..f27ef837c3d2 100644 --- a/drivers/staging/comedi/comedilib.h +++ b/drivers/staging/comedi/comedilib.h @@ -92,7 +92,7 @@ unsigned int comedi_get_maxdata(void *dev, unsigned int subdevice, unsigned int chan); int comedi_get_n_ranges(void *dev, unsigned int subdevice, unsigned int chan); -int comedi_do_insn(void *dev, comedi_insn *insn); +int comedi_do_insn(void *dev, struct comedi_insn *insn); int comedi_poll(void *dev, unsigned int subdev); /* DEPRECATED functions */ @@ -165,7 +165,7 @@ unsigned int comedi_get_maxdata(unsigned int minor, unsigned int subdevice, unsi int chan); int comedi_get_n_ranges(unsigned int minor, unsigned int subdevice, unsigned int chan); -int comedi_do_insn(unsigned int minor, comedi_insn *insn); +int comedi_do_insn(unsigned int minor, struct comedi_insn *insn); int comedi_poll(unsigned int minor, unsigned int subdev); /* DEPRECATED functions */ diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index 2d09a01c86c3..9728c7430f8b 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c @@ -49,7 +49,7 @@ static int postconfig(struct comedi_device *dev); static int insn_rw_emulate_bits(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static void *comedi_recognize(struct comedi_driver * driv, const char *name); static void comedi_report_boards(struct comedi_driver *driv); static int poll_invalid(struct comedi_device *dev, struct comedi_subdevice *s); @@ -337,15 +337,15 @@ static int poll_invalid(struct comedi_device *dev, struct comedi_subdevice *s) } int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { return -EINVAL; } static int insn_rw_emulate_bits(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { - comedi_insn new_insn; + struct comedi_insn new_insn; int ret; static const unsigned channels_per_bitfield = 32; diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c index 2b57041bfe9d..ec5f9167110b 100644 --- a/drivers/staging/comedi/drivers/8255.c +++ b/drivers/staging/comedi/drivers/8255.c @@ -144,7 +144,7 @@ static int subdev_8255_cb(int dir, int port, int data, unsigned long arg) } static int subdev_8255_insn(struct comedi_device *dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (data[0]) { s->state &= ~data[0]; @@ -169,7 +169,7 @@ static int subdev_8255_insn(struct comedi_device *dev, struct comedi_subdevice * } static int subdev_8255_insn_config(struct comedi_device *dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int mask; unsigned int bits; diff --git a/drivers/staging/comedi/drivers/acl7225b.c b/drivers/staging/comedi/drivers/acl7225b.c index 235dcfea49d4..3e257cd9eb02 100644 --- a/drivers/staging/comedi/drivers/acl7225b.c +++ b/drivers/staging/comedi/drivers/acl7225b.c @@ -51,7 +51,7 @@ static struct comedi_driver driver_acl7225b = { COMEDI_INITCLEANUP(driver_acl7225b); static int acl7225b_do_insn(struct comedi_device *dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -72,7 +72,7 @@ static int acl7225b_do_insn(struct comedi_device *dev, struct comedi_subdevice * } static int acl7225b_di_insn(struct comedi_device *dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c index d69b87a1691a..c96aee09e1b6 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c @@ -33,7 +33,7 @@ | BYTE_ b_OutputLevel, | | BYTE_ b_HardwareGateLevel) INT i_InsnConfig_InitTimer(struct comedi_device *dev,struct comedi_subdevice *s, - comedi_insn *insn,unsigned int *data) + struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configure the Timer (b_TimerNbr) operating mode | @@ -220,7 +220,7 @@ INT i_InsnConfig_InitTimer(struct comedi_device *dev,struct comedi_subdevice *s, */ INT i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; @@ -407,7 +407,7 @@ INT i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, struct comedi_sub | BYTE_ b_TimerNbr, | | BYTE_ b_InterruptEnable) INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,struct comedi_subdevice *s, - comedi_insn *insn,unsigned int *data) | + struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Enable OR Disable the Timer (b_TimerNbr) from selected module | | (b_ModulNbr). You must calling the | @@ -450,7 +450,7 @@ i_ReturnValue=insn->n; INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; DWORD dw_DummyRead; @@ -562,7 +562,7 @@ INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev, | BYTE_ b_ModulNbr, | | PULONG_ pul_TimerValueArray) INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,struct comedi_subdevice *s, - comedi_insn *insn,unsigned int *data) | + struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the all timer values from selected timer | | module (b_ModulNbr). | @@ -591,7 +591,7 @@ INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,struct comedi_sub */ INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { INT i_ReturnValue = 0; BYTE b_ModulNbr, b_ReadType; @@ -669,7 +669,7 @@ INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_su /* +----------------------------------------------------------------------------+ | Function Name :INT i_APCI1710_InsnBitsTimer(struct comedi_device *dev, -struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | +struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read write functions for Timer | +----------------------------------------------------------------------------+ @@ -682,7 +682,7 @@ struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) */ INT i_APCI1710_InsnBitsTimer(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { BYTE b_BitsType; INT i_ReturnValue = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h index 9785f925a1d4..4797c0b77a43 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h @@ -35,20 +35,20 @@ * 82X54 TIMER INISIALISATION FUNCTION */ INT i_APCI1710_InsnConfigInitTimer(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); /* * 82X54 READ FUNCTION */ INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1710_InsnBitsTimer(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); /* * 82X54 READ & WRITE FUNCTION diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c index 472e182a582a..1a54d3b2c694 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c @@ -132,7 +132,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc */ INT i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; ULONG ul_TimerValue = 0; @@ -791,7 +791,7 @@ INT i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su | BYTE_ b_CycleMode, | | BYTE_ b_InterruptEnable) INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev, -struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | +struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Enable the chronometer from selected module | | (b_ModulNbr). You must calling the | @@ -841,7 +841,7 @@ struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | */ INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; BYTE b_ModulNbr, b_CycleMode, b_InterruptEnable, b_Action; @@ -1078,7 +1078,7 @@ INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name :INT i_APCI1710_InsnReadChrono(struct comedi_device *dev,struct comedi_subdevice *s, -comedi_insn *insn,unsigned int *data) | +struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read functions for Timer | +----------------------------------------------------------------------------+ @@ -1091,7 +1091,7 @@ comedi_insn *insn,unsigned int *data) | */ INT i_APCI1710_InsnReadChrono(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { BYTE b_ReadType; INT i_ReturnValue = insn->n; @@ -1758,7 +1758,7 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,struct comedi_subdevice *s, - comedi_insn *insn,unsigned int *data) | + struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Sets the output witch has been passed with the | | parameter b_Channel. Setting an output means setting an| @@ -1877,7 +1877,7 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev, */ INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; BYTE b_ModulNbr, b_OutputChannel, b_InputChannel, b_IOType; diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h index 588f5735e24d..26b50cefee5a 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h @@ -36,18 +36,18 @@ * CHRONOMETER INISIALISATION FUNCTION */ INT i_APCI1710_InsnConfigInitChrono(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); /* * CHRONOMETER READ FUNCTION */ INT i_APCI1710_InsnReadChrono(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev, BYTE b_ModulNbr, PBYTE pb_ChronoStatus); @@ -70,5 +70,5 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device *dev, * CHRONOMETER DIGITAL INPUT OUTPUT FUNCTION */ INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c index 3b0c502de480..8be27aedaaf5 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c @@ -62,7 +62,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, | -| struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data)| +| struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)| +----------------------------------------------------------------------------+ | Task : Configure the digital I/O operating mode from selected | | module (b_ModulNbr). You must calling this function be| @@ -100,7 +100,7 @@ Activates and deactivates the digital output memory. */ INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { BYTE b_ModulNbr, b_ChannelAMode, b_ChannelBMode; BYTE b_MemoryOnOff, b_ConfigType; @@ -248,7 +248,7 @@ INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_sub +----------------------------------------------------------------------------+ |INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev,comedi_subdevice -*s, comedi_insn *insn,unsigned int *data) +*s, struct comedi_insn *insn,unsigned int *data) +----------------------------------------------------------------------------+ | Task : Read the status from selected digital I/O digital input| @@ -294,7 +294,7 @@ INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_sub // // PBYTE_ pb_ChannelStatus) INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; DWORD dw_StatusReg; @@ -446,7 +446,7 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device -|*dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) +|*dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) +----------------------------------------------------------------------------+ | Task : Sets or resets the output witch has been passed with the | @@ -482,7 +482,7 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev, // BYTE_ b_ModulNbr, // BYTE_ b_OutputChannel) INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; DWORD dw_WriteValue = 0; @@ -677,7 +677,7 @@ INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev, +----------------------------------------------------------------------------+ |INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device *dev,comedi_subdevice - *s, comedi_insn *insn,unsigned int *data) + *s, struct comedi_insn *insn,unsigned int *data) +----------------------------------------------------------------------------+ | Task : write: Sets or resets one or several outputs from port. | @@ -729,7 +729,7 @@ INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev, // BYTE_ b_ModulNbr, // BYTE_ b_PortValue) INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; DWORD dw_WriteValue = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h index 68a00d69e5f9..5ef157a55ca1 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h @@ -28,19 +28,19 @@ * DIGITAL I/O INISIALISATION FUNCTION */ INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); /* * INPUT OUTPUT FUNCTIONS */ INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c index 6939895bc401..1062f2fdec30 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c @@ -62,7 +62,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc /* +----------------------------------------------------------------------------+ | INT i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev,struct comedi_subdevice *s, -comedi_insn *insn,unsigned int *data) +struct comedi_insn *insn,unsigned int *data) +----------------------------------------------------------------------------+ | Task : Configuration function for INC_CPT | @@ -76,7 +76,7 @@ comedi_insn *insn,unsigned int *data) */ INT i_APCI1710_InsnConfigINCCPT(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_ConfigType; INT i_ReturnValue = 0; @@ -2003,7 +2003,7 @@ INT i_APCI1710_InitFrequencyMeasurement(struct comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name :INT i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev,struct comedi_subdevice *s, -comedi_insn *insn,unsigned int *data) | +struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Set & Clear Functions for INC_CPT | +----------------------------------------------------------------------------+ @@ -2016,7 +2016,7 @@ comedi_insn *insn,unsigned int *data) | */ INT i_APCI1710_InsnBitsINCCPT(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_BitsType; INT i_ReturnValue = 0; @@ -2940,7 +2940,7 @@ INT i_APCI1710_SetDigitalChlOff(struct comedi_device * dev, BYTE b_ModulNbr) /* +----------------------------------------------------------------------------+ | Function Name :INT i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev,struct comedi_subdevice *s, -comedi_insn *insn,unsigned int *data) | +struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Enable Disable functions for INC_CPT | +----------------------------------------------------------------------------+ @@ -2952,7 +2952,7 @@ comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ */ INT i_APCI1710_InsnWriteINCCPT(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_WriteType; INT i_ReturnValue = 0; @@ -4038,7 +4038,7 @@ INT i_APCI1710_DisableFrequencyMeasurement(struct comedi_device * dev, BYTE b_Mo /* +----------------------------------------------------------------------------+ | Function Name :INT i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev,struct comedi_subdevice *s, -comedi_insn *insn,unsigned int *data) | +struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read and Get functions for INC_CPT | +----------------------------------------------------------------------------+ @@ -4050,7 +4050,7 @@ comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ */ INT i_APCI1710_InsnReadINCCPT(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_ReadType; INT i_ReturnValue = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h index a4ffd8a1b15c..5153cf686658 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h @@ -133,16 +133,16 @@ /************ Main Functions *************/ INT i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int * data); + struct comedi_insn *insn, unsigned int * data); INT i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev, struct comedi_subdevice * s, - comedi_insn *insn, unsigned int * data); + struct comedi_insn *insn, unsigned int * data); INT i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev, struct comedi_subdevice * s, - comedi_insn *insn, unsigned int * data); + struct comedi_insn *insn, unsigned int * data); INT i_APCI1710_InsnReadINCCPT(struct comedi_device *dev, struct comedi_subdevice * s, - comedi_insn *insn, unsigned int * data); + struct comedi_insn *insn, unsigned int * data); /*********** Supplementary Functions********/ diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c index 6f654a39ff7f..3ac6a264ef54 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c @@ -124,7 +124,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc */ INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; DWORD dw_IntRegister; @@ -415,7 +415,7 @@ INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev, */ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; BYTE b_ModulNbr; @@ -709,7 +709,7 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device * dev, PBYTE_ pb_Status) */ INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; DWORD dw_StatusRegister; @@ -835,7 +835,7 @@ INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device * dev, } INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { data[0] = devpriv->s_InterruptParameters. diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h index bf84cb625ea7..28252873e862 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h @@ -23,11 +23,11 @@ INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); /* @@ -35,7 +35,7 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev, */ INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); /* @@ -43,5 +43,5 @@ INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev, */ INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c index 11927b503f45..5ddd092a656a 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c @@ -58,7 +58,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc /* +----------------------------------------------------------------------------+ | Function Name :INT i_APCI1710_InsnConfigPWM(struct comedi_device *dev, -struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | +struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Pwm Init and Get Pwm Initialisation | +----------------------------------------------------------------------------+ @@ -71,7 +71,7 @@ struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) */ INT i_APCI1710_InsnConfigPWM(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { BYTE b_ConfigType; INT i_ReturnValue = 0; @@ -1671,7 +1671,7 @@ INT i_APCI1710_GetPWMInitialisation(struct comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name :INT i_APCI1710_InsnWritePWM(struct comedi_device *dev, -struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | +struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Pwm Enable Disable and Set New Timing | +----------------------------------------------------------------------------+ @@ -1684,7 +1684,7 @@ struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) */ INT i_APCI1710_InsnWritePWM(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { BYTE b_WriteType; INT i_ReturnValue = 0; @@ -3461,7 +3461,7 @@ INT i_APCI1710_SetNewPWMTiming(struct comedi_device * dev, */ INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; DWORD dw_Status; @@ -3562,7 +3562,7 @@ INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device * dev, struct comedi_su } INT i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { data[0] = devpriv->s_InterruptParameters. s_FIFOInterruptParameters[devpriv-> diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h index 31a217842e4a..c1b7f4ca47c3 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h @@ -27,7 +27,7 @@ #define APCI1710_PWM_NEWTIMING 2 INT i_APCI1710_InsnConfigPWM(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1710_InitPWM(struct comedi_device *dev, BYTE b_ModulNbr, @@ -51,7 +51,7 @@ INT i_APCI1710_GetPWMInitialisation(struct comedi_device *dev, PBYTE pb_InterruptEnable, PBYTE pb_Enable); INT i_APCI1710_InsnWritePWM(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1710_EnablePWM(struct comedi_device *dev, BYTE b_ModulNbr, @@ -69,8 +69,8 @@ INT i_APCI1710_SetNewPWMTiming(struct comedi_device *dev, INT i_APCI1710_DisablePWM(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_PWM); INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c index e67a2236cb60..bb6e1622e379 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c @@ -134,7 +134,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc */ INT i_APCI1710_InsnConfigInitSSI(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; UINT ui_TimerValue; @@ -363,7 +363,7 @@ INT i_APCI1710_InsnConfigInitSSI(struct comedi_device * dev, struct comedi_subde | PULONG_ pul_Position, | | PULONG_ pul_TurnCpt) INT i_APCI1710_ReadSSIValue(struct comedi_device *dev,struct comedi_subdevice *s, - comedi_insn *insn,unsigned int *data) | + struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : @@ -401,7 +401,7 @@ pul_Position = (PULONG) &data[0]; */ INT i_APCI1710_InsnReadSSIValue(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; BYTE b_Cpt; @@ -736,7 +736,7 @@ INT i_APCI1710_InsnReadSSIValue(struct comedi_device * dev, struct comedi_subdev */ INT i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; DWORD dw_StatusReg; diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h index 3fc70532729f..88daad1a3912 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h @@ -34,10 +34,10 @@ * SSI INISIALISATION FUNCTION */ INT i_APCI1710_InsnConfigInitSSI(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c index 97655db21458..90316e10a3bd 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c @@ -131,7 +131,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc */ INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; ULONG ul_TimerValue = 0; @@ -988,7 +988,7 @@ INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev, */ INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; DWORD dw_Status; @@ -1461,7 +1461,7 @@ INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device * dev, */ INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; DWORD dw_Status; @@ -1701,7 +1701,7 @@ INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev, */ INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; DWORD dw_Status; diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h index a2940f6d845f..c245d16207b8 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h @@ -37,21 +37,21 @@ */ INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); /* * TOR_COUNTER READ FUNCTION */ INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c index 61c1526c43fa..68b1d26bae13 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c @@ -101,7 +101,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc */ INT i_APCI1710_InsnConfigInitTTLIO(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; BYTE b_ModulNbr; @@ -407,7 +407,7 @@ APCI1710_TTL_READCHANNEL */ INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; DWORD dw_StatusReg; @@ -634,7 +634,7 @@ INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, struct comedi_subde /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI1710_InsnReadTTLIOAllPortValue(comedi_device -*dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | +*dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read the status from all digital input ports | | (port A, port B and port C) from selected TTL | @@ -656,7 +656,7 @@ INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, struct comedi_subde */ INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; DWORD dw_StatusReg; @@ -793,7 +793,7 @@ INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device * dev, | BYTE_ b_ModulNbr, | | BYTE_ b_OutputChannel) INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,struct comedi_subdevice *s, - comedi_insn *insn,unsigned int *data) | + struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Sets or resets the output witch has been passed with the | | parameter b_Channel. Setting an output means setting | @@ -826,7 +826,7 @@ INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,struct comedi */ INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = 0; DWORD dw_StatusReg = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h index fe168db93ae6..00915ddf9218 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h @@ -25,20 +25,20 @@ * TTL INISIALISATION FUNCTION */ INT i_APCI1710_InsnConfigInitTTLIO(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); /* * TTL INPUT FUNCTION */ INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); /* * TTL OUTPUT FUNCTIONS */ INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c index 718c4be560f0..adb5deacd947 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c @@ -3030,14 +3030,14 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG) +----------------------------------------------------------------------------+ | Function name : | |INT i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev,struct comedi_subdevice *s, - comedi_insn *insn,unsigned int *data) + struct comedi_insn *insn,unsigned int *data) | | +----------------------------------------------------------------------------+ | Task : Read 256 words from EEPROM | | | +----------------------------------------------------------------------------+ | Input Parameters :(struct comedi_device *dev,struct comedi_subdevice *s, - comedi_insn *insn,unsigned int *data) | + struct comedi_insn *insn,unsigned int *data) | | | | | +----------------------------------------------------------------------------+ @@ -3047,7 +3047,7 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG) */ static int i_ADDIDATA_InsnReadEeprom(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { WORD w_Data; WORD w_Address; diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h index 2f3fc3c43060..2b01577683b5 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h @@ -119,19 +119,19 @@ typedef struct { /* ANALOG INPUT */ int (*i_hwdrv_InsnConfigAnalogInput)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); int (*i_hwdrv_InsnReadAnalogInput)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); int (*i_hwdrv_InsnWriteAnalogInput)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); int (*i_hwdrv_InsnBitsAnalogInput)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); int (*i_hwdrv_CommandTestAnalogInput)(struct comedi_device *dev, struct comedi_subdevice *s, @@ -144,78 +144,78 @@ typedef struct { /* Analog Output */ int (*i_hwdrv_InsnConfigAnalogOutput)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); int (*i_hwdrv_InsnWriteAnalogOutput)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); int (*i_hwdrv_InsnBitsAnalogOutput)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); /* Digital Input */ int (*i_hwdrv_InsnConfigDigitalInput) (struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); int (*i_hwdrv_InsnReadDigitalInput) (struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); int (*i_hwdrv_InsnWriteDigitalInput) (struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); int (*i_hwdrv_InsnBitsDigitalInput) (struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); /* Digital Output */ int (*i_hwdrv_InsnConfigDigitalOutput)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); int (*i_hwdrv_InsnWriteDigitalOutput)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); int (*i_hwdrv_InsnBitsDigitalOutput)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); int (*i_hwdrv_InsnReadDigitalOutput)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); /* TIMER */ int (*i_hwdrv_InsnConfigTimer)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int (*i_hwdrv_InsnWriteTimer)(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); int (*i_hwdrv_InsnReadTimer)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int (*i_hwdrv_InsnBitsTimer)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); /* TTL IO */ int (*i_hwdr_ConfigInitTTLIO)(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); int (*i_hwdr_ReadTTLIOBits)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int (*i_hwdr_ReadTTLIOAllPortValue)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); int (*i_hwdr_WriteTTLIOChlOnOff)(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); } boardtype; //MODULE INFO STRUCTURE @@ -462,4 +462,4 @@ static int i_ADDI_Reset(struct comedi_device *dev); static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG); static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c index 360e9da4c999..e4527926c2df 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c @@ -59,7 +59,7 @@ INT i_Flag = 1; +----------------------------------------------------------------------------+ | Function Name : int i_APCI035_ConfigTimerWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ @@ -110,7 +110,7 @@ INT i_Flag = 1; +----------------------------------------------------------------------------+ */ INT i_APCI035_ConfigTimerWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Status = 0; UINT ui_Command = 0; @@ -255,7 +255,7 @@ INT i_APCI035_ConfigTimerWatchdog(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ | Function Name : int i_APCI035_StartStopWriteTimerWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Start / Stop The Selected Timer , or Watchdog | +----------------------------------------------------------------------------+ @@ -279,7 +279,7 @@ INT i_APCI035_ConfigTimerWatchdog(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ */ INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { UINT ui_Command = 0; INT i_Count = 0; @@ -368,7 +368,7 @@ INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device * dev, +----------------------------------------------------------------------------+ | Function Name : int i_APCI035_ReadTimerWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read The Selected Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ @@ -392,7 +392,7 @@ INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device * dev, +----------------------------------------------------------------------------+ */ INT i_APCI035_ReadTimerWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Status = 0; // Status register i_WatchdogNbr = insn->unused[0]; @@ -428,13 +428,13 @@ INT i_APCI035_ReadTimerWatchdog(struct comedi_device * dev, struct comedi_subdev +----------------------------------------------------------------------------+ | Function Name : INT i_APCI035_ConfigAnalogInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Analog Input Subdevice | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s : Subdevice Pointer | -| comedi_insn *insn : Insn Structure Pointer | +| struct comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer contains | | configuration parameters as below | | data[0] : Warning delay value @@ -448,7 +448,7 @@ INT i_APCI035_ReadTimerWatchdog(struct comedi_device * dev, struct comedi_subdev +----------------------------------------------------------------------------+ */ INT i_APCI035_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { devpriv->tsk_Current = current; outl(0x200 | 0, devpriv->iobase + 128 + 0x4); @@ -467,7 +467,7 @@ INT i_APCI035_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subdev +----------------------------------------------------------------------------+ | Function Name : int i_APCI035_ReadAnalogInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel | +----------------------------------------------------------------------------+ @@ -485,7 +485,7 @@ INT i_APCI035_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subdev +----------------------------------------------------------------------------+ */ INT i_APCI035_ReadAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_CommandRegister = 0; /******************/ diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h index 01964823b34f..80d7c0d39aab 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h @@ -102,19 +102,19 @@ struct comedi_lrange range_apci035_ai = { 8, { /* TIMER */ /* timer value is passed as u seconds */ INT i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI035_ReadTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); /* Temperature Related Defines (Analog Input Subdevice) */ INT i_APCI035_ConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI035_ReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); /* Interrupt */ static void v_APCI035_Interrupt(int irq, void *d); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c index d3f13eafb6f5..05ea0784d764 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c @@ -60,7 +60,7 @@ UINT ui_InterruptStatus = 0; +----------------------------------------------------------------------------+ | Function Name : int i_APCI1032_ConfigDigitalInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures the digital input Subdevice | +----------------------------------------------------------------------------+ @@ -85,7 +85,7 @@ UINT ui_InterruptStatus = 0; */ INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_TmpValue; @@ -129,7 +129,7 @@ INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ | Function Name : int i_APCI1032_Read1DigitalInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the digital input | +----------------------------------------------------------------------------+ @@ -145,7 +145,7 @@ INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ */ INT i_APCI1032_Read1DigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_TmpValue = 0; UINT ui_Channel; @@ -167,7 +167,7 @@ INT i_APCI1032_Read1DigitalInput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ | Function Name : int i_APCI1032_ReadMoreDigitalInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the Requested digital inputs | +----------------------------------------------------------------------------+ @@ -184,7 +184,7 @@ INT i_APCI1032_Read1DigitalInput(struct comedi_device * dev, struct comedi_subde */ INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_PortValue = data[0]; UINT ui_Mask = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h index f24704f99f81..d45707f3eaf2 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h @@ -48,13 +48,13 @@ // for di read INT i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1032_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); // Interrupt functions..... diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c index 9806199e0d16..c9035ceaade4 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c @@ -62,7 +62,7 @@ int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled = +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ConfigDigitalInputEvent | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : An event can be generated for each port. | | The first event is related to the first 8 channels | @@ -138,7 +138,7 @@ int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled = */ INT i_APCI1500_ConfigDigitalInputEvent(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { int i_PatternPolarity = 0, i_PatternTransition = 0, i_PatternMask = 0; int i_MaxChannel = 0, i_Count = 0, i_EventMask = 0; @@ -501,7 +501,7 @@ INT i_APCI1500_ConfigDigitalInputEvent(struct comedi_device * dev, +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_StartStopInputEvent | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Allows or disallows a port event | +----------------------------------------------------------------------------+ @@ -520,7 +520,7 @@ INT i_APCI1500_ConfigDigitalInputEvent(struct comedi_device * dev, +----------------------------------------------------------------------------+ */ int i_APCI1500_StartStopInputEvent(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i_Event1InterruptStatus = 0, i_Event2InterruptStatus = 0, i_RegValue; @@ -769,7 +769,7 @@ int i_APCI1500_StartStopInputEvent(struct comedi_device * dev, struct comedi_sub +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_Initialisation | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the digital input | +----------------------------------------------------------------------------+ @@ -785,7 +785,7 @@ int i_APCI1500_StartStopInputEvent(struct comedi_device * dev, struct comedi_sub +----------------------------------------------------------------------------+ */ INT i_APCI1500_Initialisation(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i_DummyRead = 0; /******************/ @@ -938,7 +938,7 @@ INT i_APCI1500_Initialisation(struct comedi_device * dev, struct comedi_subdevic +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ReadMoreDigitalInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the Requested digital inputs | +----------------------------------------------------------------------------+ @@ -958,7 +958,7 @@ INT i_APCI1500_Initialisation(struct comedi_device * dev, struct comedi_subdevic */ INT i_APCI1500_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_PortValue = data[1]; UINT ui_Mask = 0; @@ -1015,7 +1015,7 @@ INT i_APCI1500_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ConfigDigitalOutputErrorInterrupt - (struct comedi_device *dev,struct comedi_subdevice *s comedi_insn + (struct comedi_device *dev,struct comedi_subdevice *s struct comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ @@ -1026,7 +1026,7 @@ INT i_APCI1500_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su | unsigned int *data : Data Pointer contains | | configuration parameters as below | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | data[0] :1:Memory on | | 0:Memory off | data[1] :1 Enable the voltage error interrupt @@ -1041,7 +1041,7 @@ INT i_APCI1500_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su +----------------------------------------------------------------------------+ */ int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { devpriv->b_OutputMemoryStatus = data[0]; return insn->n; @@ -1051,7 +1051,7 @@ int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device * dev, +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_WriteDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Writes port value To the selected port | +----------------------------------------------------------------------------+ @@ -1068,7 +1068,7 @@ int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device * dev, */ INT i_APCI1500_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { static UINT ui_Temp = 0; UINT ui_Temp1; @@ -1215,14 +1215,14 @@ INT i_APCI1500_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device - *dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data)| + *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)| | | +----------------------------------------------------------------------------+ | Task : Configures The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status data[0] : 2 APCI1500_1_8_KHZ | 1 APCI1500_3_6_KHZ | | 0 APCI1500_115_KHZ @@ -1262,7 +1262,7 @@ INT i_APCI1500_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd */ int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { int i_TimerCounterMode, i_MasterConfiguration; @@ -1836,13 +1836,13 @@ int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device * dev, +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_StartStopTriggerTimerCounterWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, - comedi_insn *insn,unsigned int *data); | + struct comedi_insn *insn,unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Start / Stop or trigger the timer counter or Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | data[0] : 0 Counter1/Timer1 1 Counter2/Timer2 @@ -1861,7 +1861,7 @@ int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device * dev, +----------------------------------------------------------------------------+ */ int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { int i_CommandAndStatusValue; @@ -2160,14 +2160,14 @@ int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ReadCounterTimerWatchdog | -| (struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Read The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | data[0] : 0 Counter1/Timer1 1 Counter2/Timer2 @@ -2183,7 +2183,7 @@ int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device * dev, */ int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { int i_CommandAndStatusValue; switch (data[0]) { @@ -2351,14 +2351,14 @@ int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ReadInterruptMask | -| (struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Read the interrupt mask | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | @@ -2371,7 +2371,7 @@ int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device * dev, +----------------------------------------------------------------------------+ */ int i_APCI1500_ReadInterruptMask(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = i_InterruptMask; data[1] = i_InputChannel; @@ -2382,14 +2382,14 @@ int i_APCI1500_ReadInterruptMask(struct comedi_device * dev, struct comedi_subde /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1500_ConfigureInterrupt | -| (struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Configures the interrupt registers | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer | @@ -2402,7 +2402,7 @@ int i_APCI1500_ReadInterruptMask(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ */ int i_APCI1500_ConfigureInterrupt(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Status; int i_RegValue; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h index d824934370b1..5d960b40a6a8 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h @@ -117,49 +117,49 @@ enum { /*----------DIGITAL INPUT----------------*/ static int i_APCI1500_Initialisation(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); /*---------- DIGITAL OUTPUT------------*/ static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); /*----------TIMER----------------*/ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); static int i_APCI1500_ReadInterruptMask(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); /*----------INTERRUPT HANDLER------*/ static void v_APCI1500_Interrupt(int irq, void *d); static int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); /*----------RESET---------------*/ static int i_APCI1500_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c index 21dde69dad03..5ae9a93844e7 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c @@ -57,13 +57,13 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc +----------------------------------------------------------------------------+ | Function Name : int i_APCI1516_Read1DigitalInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the digital input | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -74,7 +74,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc +----------------------------------------------------------------------------+ */ INT i_APCI1516_Read1DigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_TmpValue = 0; UINT ui_Channel; @@ -97,13 +97,13 @@ INT i_APCI1516_Read1DigitalInput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ | Function Name : int i_APCI1516_ReadMoreDigitalInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the Requested digital inputs | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -115,7 +115,7 @@ INT i_APCI1516_Read1DigitalInput(struct comedi_device * dev, struct comedi_subde */ INT i_APCI1516_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_PortValue = data[0]; @@ -149,7 +149,7 @@ INT i_APCI1516_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1516_ConfigDigitalOutput (struct comedi_device *dev, - struct comedi_subdevice *s comedi_insn *insn,unsigned int *data) | + struct comedi_subdevice *s struct comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Configures The Digital Output Subdevice. | @@ -158,7 +158,7 @@ INT i_APCI1516_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su | unsigned int *data : Data Pointer contains | | configuration parameters as below | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | data[0] :1:Memory on | | 0:Memory off | | | @@ -172,7 +172,7 @@ INT i_APCI1516_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su +----------------------------------------------------------------------------+ */ int i_APCI1516_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { devpriv->b_OutputMemoryStatus = data[0]; return insn->n; @@ -181,14 +181,14 @@ int i_APCI1516_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1516_WriteDigitalOutput | -| (struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Writes port value To the selected port | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -200,7 +200,7 @@ int i_APCI1516_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub */ INT i_APCI1516_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Temp, ui_Temp1; UINT ui_NoOfChannel = CR_CHAN(insn->chanspec); // get the channel @@ -341,14 +341,14 @@ INT i_APCI1516_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1516_ReadDigitalOutput | -| (struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -360,7 +360,7 @@ INT i_APCI1516_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd */ INT i_APCI1516_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Temp; @@ -401,14 +401,14 @@ INT i_APCI1516_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1516_ConfigWatchdog(struct comedi_device *dev, - struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | + struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Configures The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -420,7 +420,7 @@ INT i_APCI1516_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde */ int i_APCI1516_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (data[0] == 0) { //Disable the watchdog @@ -448,13 +448,13 @@ int i_APCI1516_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevic +----------------------------------------------------------------------------+ | Function Name : int i_APCI1516_StartStopWriteWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, - comedi_insn *insn,unsigned int *data); | + struct comedi_insn *insn,unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Start / Stop The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -466,7 +466,7 @@ int i_APCI1516_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevic */ int i_APCI1516_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { switch (data[0]) { case 0: //stop the watchdog @@ -492,14 +492,14 @@ int i_APCI1516_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_ /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI1516_ReadWatchdog | -| (struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Read The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -511,7 +511,7 @@ int i_APCI1516_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_ */ int i_APCI1516_ReadWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = inw(devpriv->i_IobaseAddon + APCI1516_WATCHDOG_STATUS) & 0x1; return insn->n; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h index 8d857e7adc13..398baa04a163 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h @@ -39,26 +39,26 @@ //Digital Input INT i_APCI1516_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1516_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); //Digital Output int i_APCI1516_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1516_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1516_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); // TIMER // timer value is passed as u seconds int i_APCI1516_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI1516_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI1516_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); //reset INT i_APCI1516_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c index e45390f3f988..da69bee176e6 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c @@ -63,7 +63,7 @@ UINT ui_InterruptData, ui_Type; +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_ConfigDigitalInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures the digital input Subdevice | +----------------------------------------------------------------------------+ @@ -87,7 +87,7 @@ UINT ui_InterruptData, ui_Type; +----------------------------------------------------------------------------+ */ INT i_APCI1564_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { devpriv->tsk_Current = current; /*******************************/ @@ -132,7 +132,7 @@ INT i_APCI1564_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_Read1DigitalInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the digital input | +----------------------------------------------------------------------------+ @@ -148,7 +148,7 @@ INT i_APCI1564_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ */ INT i_APCI1564_Read1DigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_TmpValue = 0; UINT ui_Channel; @@ -172,7 +172,7 @@ INT i_APCI1564_Read1DigitalInput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_ReadMoreDigitalInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the Requested digital inputs | +----------------------------------------------------------------------------+ @@ -188,7 +188,7 @@ INT i_APCI1564_Read1DigitalInput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ */ INT i_APCI1564_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_PortValue = data[0]; UINT ui_Mask = 0; @@ -234,7 +234,7 @@ INT i_APCI1564_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_ConfigDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Digital Output Subdevice. | +----------------------------------------------------------------------------+ @@ -256,7 +256,7 @@ INT i_APCI1564_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su +----------------------------------------------------------------------------+ */ INT i_APCI1564_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { ULONG ul_Command = 0; @@ -297,7 +297,7 @@ INT i_APCI1564_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_WriteDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Writes port value To the selected port | +----------------------------------------------------------------------------+ @@ -313,7 +313,7 @@ INT i_APCI1564_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub +----------------------------------------------------------------------------+ */ INT i_APCI1564_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Temp, ui_Temp1; UINT ui_NoOfChannel; @@ -471,7 +471,7 @@ INT i_APCI1564_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_ReadDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ @@ -487,7 +487,7 @@ INT i_APCI1564_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ */ INT i_APCI1564_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Temp; UINT ui_NoOfChannel; @@ -538,7 +538,7 @@ INT i_APCI1564_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_ConfigTimerCounterWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ @@ -565,7 +565,7 @@ INT i_APCI1564_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ */ INT i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { ULONG ul_Command1 = 0; devpriv->tsk_Current = current; @@ -696,7 +696,7 @@ INT i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device * dev, +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_StartStopWriteTimerCounterWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Start / Stop The Selected Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ @@ -719,7 +719,7 @@ INT i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device * dev, +----------------------------------------------------------------------------+ */ INT i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { ULONG ul_Command1 = 0; if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) { @@ -796,7 +796,7 @@ INT i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device * dev, +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_ReadTimerCounterWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read The Selected Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ @@ -814,7 +814,7 @@ INT i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device * dev, +----------------------------------------------------------------------------+ */ INT i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { ULONG ul_Command1 = 0; @@ -879,7 +879,7 @@ INT i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device * dev, +----------------------------------------------------------------------------+ | Function Name : int i_APCI1564_ReadInterruptStatus | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task :Reads the interrupt status register | +----------------------------------------------------------------------------+ @@ -893,7 +893,7 @@ INT i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device * dev, */ int i_APCI1564_ReadInterruptStatus(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { *data = ui_Type; return insn->n; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h index ff094f043caf..2fbc8ce7b764 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h @@ -83,34 +83,34 @@ //DI // for di read INT i_APCI1564_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1564_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1564_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); //DO int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1564_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI1564_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); // TIMER // timer value is passed as u seconds INT i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); // INTERRUPT static VOID v_APCI1564_Interrupt(int irq, void *d); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c index 0cab42aa0bb8..906d635da6b2 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c @@ -60,7 +60,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | Function Name : INT i_APCI16XX_InsnConfigInitTTLIO | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task APCI16XX_TTL_INIT (using defaults) : | @@ -91,7 +91,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc */ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; BYTE b_Command = 0; @@ -253,7 +253,7 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev, | Function Name : INT i_APCI16XX_InsnBitsReadTTLIO | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read the status from selected TTL digital input | @@ -284,7 +284,7 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev, */ int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; BYTE b_Command = 0; @@ -413,7 +413,7 @@ int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev, | Function Name : INT i_APCI16XX_InsnReadTTLIOAllPortValue | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read the status from all digital input ports | @@ -431,7 +431,7 @@ int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev, */ int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { BYTE b_Command = (BYTE) CR_AREF(insn->chanspec); INT i_ReturnValue = insn->n; @@ -538,7 +538,7 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev, | Function Name : INT i_APCI16XX_InsnBitsWriteTTLIO | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Set the state from selected TTL digital output | @@ -571,7 +571,7 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev, */ int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; BYTE b_Command = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h index 63ec520bb3a7..5bf91e13a035 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h @@ -63,7 +63,7 @@ static const struct comedi_lrange range_apci16xx_ttl = { 12, */ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); /* @@ -73,12 +73,12 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device *dev, */ int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); /* +----------------------------------------------------------------------------+ @@ -87,7 +87,7 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev, */ int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); int i_APCI16XX_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c index 6a692cf3fb13..31f55da39ea8 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c @@ -57,7 +57,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc +----------------------------------------------------------------------------+ | Function Name : int i_APCI2016_ConfigDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Digital Output Subdevice. | +----------------------------------------------------------------------------+ @@ -76,7 +76,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc +----------------------------------------------------------------------------+ */ int i_APCI2016_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if ((data[0] != 0) && (data[0] != 1)) { comedi_error(dev, @@ -96,7 +96,7 @@ int i_APCI2016_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub +----------------------------------------------------------------------------+ | Function Name : int i_APCI2016_WriteDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Writes port value To the selected port | +----------------------------------------------------------------------------+ @@ -112,7 +112,7 @@ int i_APCI2016_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub +----------------------------------------------------------------------------+ */ int i_APCI2016_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_NoOfChannel; UINT ui_Temp, ui_Temp1; @@ -251,7 +251,7 @@ int i_APCI2016_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ | Function Name : int i_APCI2016_BitsDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ @@ -267,7 +267,7 @@ int i_APCI2016_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ */ int i_APCI2016_BitsDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Temp; UINT ui_NoOfChannel; @@ -321,13 +321,13 @@ int i_APCI2016_BitsDigitalOutput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ | Function Name : int i_APCI2016_ConfigWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure | -| comedi_insn *insn :pointer to insn structure | +| struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -338,7 +338,7 @@ int i_APCI2016_BitsDigitalOutput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ */ int i_APCI2016_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (data[0] == 0) { @@ -364,13 +364,13 @@ int i_APCI2016_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevic +----------------------------------------------------------------------------+ | Function Name : int i_APCI2016_StartStopWriteWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Start / Stop The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure | -| comedi_insn *insn :pointer to insn structure | +| struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -381,7 +381,7 @@ int i_APCI2016_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevic +----------------------------------------------------------------------------+ */ int i_APCI2016_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { switch (data[0]) { @@ -410,13 +410,13 @@ int i_APCI2016_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_ +----------------------------------------------------------------------------+ | Function Name : int i_APCI2016_ReadWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure | -| comedi_insn *insn :pointer to insn structure | +| struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -428,7 +428,7 @@ int i_APCI2016_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_ */ int i_APCI2016_ReadWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { udelay(5); data[0] = inw(devpriv->i_IobaseAddon + APCI2016_WATCHDOG_STATUS) & 0x1; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h index ca98f6a51675..b6a3a999c906 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h @@ -41,25 +41,25 @@ //DO int i_APCI2016_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI2016_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI2016_BitsDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); // TIMER // timer value is passed as u seconds int i_APCI2016_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI2016_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI2016_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); // Interrupt functions..... diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c index 067ee8679d3e..1347bc388f3e 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c @@ -58,7 +58,7 @@ UINT ui_InterruptData, ui_Type; +----------------------------------------------------------------------------+ | Function Name : int i_APCI2032_ConfigDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Digital Output Subdevice. | +----------------------------------------------------------------------------+ @@ -80,7 +80,7 @@ UINT ui_InterruptData, ui_Type; +----------------------------------------------------------------------------+ */ int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { ULONG ul_Command = 0; devpriv->tsk_Current = current; @@ -118,7 +118,7 @@ int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub +----------------------------------------------------------------------------+ | Function Name : int i_APCI2032_WriteDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Writes port value To the selected port | +----------------------------------------------------------------------------+ @@ -135,7 +135,7 @@ int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub */ INT i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Temp, ui_Temp1; UINT ui_NoOfChannel = CR_CHAN(insn->chanspec); // get the channel @@ -297,7 +297,7 @@ INT i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ | Function Name : int i_APCI2032_ReadDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ @@ -314,7 +314,7 @@ INT i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd */ INT i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Temp; UINT ui_NoOfChannel; @@ -363,14 +363,14 @@ INT i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde /* +----------------------------------------------------------------------------+ | Function Name : INT i_APCI2032_ConfigWatchdog(comedi_device - *dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data)| + *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)| | | +----------------------------------------------------------------------------+ | Task : Configures The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -381,7 +381,7 @@ INT i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ */ INT i_APCI2032_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (data[0] == 0) { //Disable the watchdog @@ -404,13 +404,13 @@ INT i_APCI2032_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevic +----------------------------------------------------------------------------+ | Function Name : int i_APCI2032_StartStopWriteWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, - comedi_insn *insn,unsigned int *data); | + struct comedi_insn *insn,unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Start / Stop The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -422,7 +422,7 @@ INT i_APCI2032_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevic */ int i_APCI2032_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { switch (data[0]) { case 0: //stop the watchdog @@ -448,14 +448,14 @@ int i_APCI2032_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_ /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2032_ReadWatchdog | -| (struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Read The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -467,7 +467,7 @@ int i_APCI2032_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_ */ int i_APCI2032_ReadWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = @@ -531,7 +531,7 @@ void v_APCI2032_Interrupt(int irq, void *d) +----------------------------------------------------------------------------+ | Function Name : int i_APCI2032_ReadInterruptStatus | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task :Reads the interrupt status register | +----------------------------------------------------------------------------+ @@ -545,7 +545,7 @@ void v_APCI2032_Interrupt(int irq, void *d) */ int i_APCI2032_ReadInterruptStatus(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { *data = ui_Type; return insn->n; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h index 3aab1d999315..55002e0288b5 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h @@ -56,22 +56,22 @@ //DO int i_APCI2032_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI2032_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI2032_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI2032_ReadInterruptStatus(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); // TIMER // timer value is passed as u seconds INT i_APCI2032_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI2032_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); // Interrupt functions..... diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c index 3f7dc9a67197..947e18ef3ab3 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c @@ -57,13 +57,13 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc +----------------------------------------------------------------------------+ | Function Name : int i_APCI2200_Read1DigitalInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the digital input | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -74,7 +74,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc +----------------------------------------------------------------------------+ */ INT i_APCI2200_Read1DigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_TmpValue = 0; UINT ui_Channel; @@ -95,13 +95,13 @@ INT i_APCI2200_Read1DigitalInput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ | Function Name : int i_APCI2200_ReadMoreDigitalInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Return the status of the Requested digital inputs | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -113,7 +113,7 @@ INT i_APCI2200_Read1DigitalInput(struct comedi_device * dev, struct comedi_subde */ INT i_APCI2200_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_PortValue = data[0]; @@ -147,7 +147,7 @@ INT i_APCI2200_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2200_ConfigDigitalOutput (struct comedi_device *dev, - struct comedi_subdevice *s comedi_insn *insn,unsigned int *data) | + struct comedi_subdevice *s struct comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Configures The Digital Output Subdevice. | @@ -156,7 +156,7 @@ INT i_APCI2200_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su | unsigned int *data : Data Pointer contains | | configuration parameters as below | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | data[0] :1:Memory on | | 0:Memory off | | | @@ -170,7 +170,7 @@ INT i_APCI2200_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su +----------------------------------------------------------------------------+ */ int i_APCI2200_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { devpriv->b_OutputMemoryStatus = data[0]; return insn->n; @@ -179,14 +179,14 @@ int i_APCI2200_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2200_WriteDigitalOutput | -| (struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Writes port value To the selected port | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -198,7 +198,7 @@ int i_APCI2200_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub */ INT i_APCI2200_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Temp, ui_Temp1; UINT ui_NoOfChannel = CR_CHAN(insn->chanspec); // get the channel @@ -336,14 +336,14 @@ INT i_APCI2200_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2200_ReadDigitalOutput | -| (struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -355,7 +355,7 @@ INT i_APCI2200_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd */ INT i_APCI2200_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Temp; @@ -400,14 +400,14 @@ INT i_APCI2200_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2200_ConfigWatchdog(struct comedi_device *dev, - struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | + struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Configures The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -419,7 +419,7 @@ INT i_APCI2200_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde */ int i_APCI2200_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (data[0] == 0) { //Disable the watchdog @@ -447,13 +447,13 @@ int i_APCI2200_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevic +----------------------------------------------------------------------------+ | Function Name : int i_APCI2200_StartStopWriteWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, - comedi_insn *insn,unsigned int *data); | + struct comedi_insn *insn,unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Start / Stop The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -465,7 +465,7 @@ int i_APCI2200_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevic */ int i_APCI2200_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { switch (data[0]) { case 0: //stop the watchdog @@ -491,14 +491,14 @@ int i_APCI2200_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_ /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI2200_ReadWatchdog | -| (struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn, +| (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn, unsigned int *data); | +----------------------------------------------------------------------------+ | Task : Read The Watchdog | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s, :pointer to subdevice structure - comedi_insn *insn :pointer to insn structure | + struct comedi_insn *insn :pointer to insn structure | | unsigned int *data : Data Pointer to read status | +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -510,7 +510,7 @@ int i_APCI2200_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_ */ int i_APCI2200_ReadWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = inw(devpriv->iobase + APCI2200_WATCHDOG + diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h index 778bea21dd63..0a115b4c44c9 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h @@ -37,25 +37,25 @@ //Digital Input INT i_APCI2200_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI2200_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); //Digital Output int i_APCI2200_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI2200_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI2200_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); // TIMER int i_APCI2200_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI2200_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI2200_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); //reset INT i_APCI2200_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index 0bebf87c7b29..68eb8dfd5139 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c @@ -58,7 +58,7 @@ static UINT ui_Temp = 0; /* +----------------------------------------------------------------------------+ | Function name :int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev,| -| struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | +| struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Calls card specific function | @@ -66,7 +66,7 @@ static UINT ui_Temp = 0; +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev | | struct comedi_subdevice *s | -| comedi_insn *insn | +| struct comedi_insn *insn | | unsigned int *data | +----------------------------------------------------------------------------+ | Return Value : | @@ -75,7 +75,7 @@ static UINT ui_Temp = 0; */ int i_APCI3120_InsnConfigAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT i; @@ -125,7 +125,7 @@ int i_APCI3120_InsnConfigAnalogInput(struct comedi_device * dev, struct comedi_s /* +----------------------------------------------------------------------------+ | Function name :int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, | -| struct comedi_subdevice *s,comedi_insn *insn, unsigned int *data) | +| struct comedi_subdevice *s,struct comedi_insn *insn, unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : card specific function | @@ -137,7 +137,7 @@ int i_APCI3120_InsnConfigAnalogInput(struct comedi_device * dev, struct comedi_s +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev | | struct comedi_subdevice *s | -| comedi_insn *insn | +| struct comedi_insn *insn | | unsigned int *data | +----------------------------------------------------------------------------+ | Return Value : | @@ -146,7 +146,7 @@ int i_APCI3120_InsnConfigAnalogInput(struct comedi_device * dev, struct comedi_s */ int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { USHORT us_ConvertTiming, us_TmpValue, i; BYTE b_Tmp; @@ -1946,7 +1946,7 @@ void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function name :int i_APCI3120_InsnConfigTimer(struct comedi_device *dev, | -| struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | +| struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task :Configure Timer 2 | @@ -1954,7 +1954,7 @@ void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device * dev, +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev | | struct comedi_subdevice *s | -| comedi_insn *insn | +| struct comedi_insn *insn | | unsigned int *data | | | | data[0]= TIMER configure as timer | @@ -1969,7 +1969,7 @@ void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device * dev, */ int i_APCI3120_InsnConfigTimer(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Timervalue2; @@ -2094,14 +2094,14 @@ int i_APCI3120_InsnConfigTimer(struct comedi_device * dev, struct comedi_subdevi /* +----------------------------------------------------------------------------+ | Function name :int i_APCI3120_InsnWriteTimer(struct comedi_device *dev, | -| struct comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | +| struct comedi_subdevice *s, struct comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : To start and stop the timer | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev | | struct comedi_subdevice *s | -| comedi_insn *insn | +| struct comedi_insn *insn | | unsigned int *data | | | | data[0] = 1 (start) | @@ -2120,7 +2120,7 @@ int i_APCI3120_InsnConfigTimer(struct comedi_device * dev, struct comedi_subdevi */ int i_APCI3120_InsnWriteTimer(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Timervalue2 = 0; @@ -2285,7 +2285,7 @@ int i_APCI3120_InsnWriteTimer(struct comedi_device * dev, struct comedi_subdevic /* +----------------------------------------------------------------------------+ | Function name : int i_APCI3120_InsnReadTimer(struct comedi_device *dev, | -| struct comedi_subdevice *s,comedi_insn *insn, unsigned int *data) | +| struct comedi_subdevice *s,struct comedi_insn *insn, unsigned int *data) | | | | | +----------------------------------------------------------------------------+ @@ -2293,7 +2293,7 @@ int i_APCI3120_InsnWriteTimer(struct comedi_device * dev, struct comedi_subdevic +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev | | struct comedi_subdevice *s | -| comedi_insn *insn | +| struct comedi_insn *insn | | unsigned int *data | | | +----------------------------------------------------------------------------+ @@ -2306,7 +2306,7 @@ int i_APCI3120_InsnWriteTimer(struct comedi_device * dev, struct comedi_subdevic +----------------------------------------------------------------------------+ */ int i_APCI3120_InsnReadTimer(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { BYTE b_Tmp; USHORT us_TmpValue, us_TmpValue_2, us_StatusValue; @@ -2362,7 +2362,7 @@ int i_APCI3120_InsnReadTimer(struct comedi_device * dev, struct comedi_subdevice /* +----------------------------------------------------------------------------+ | Function name :int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev, | -| struct comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | +| struct comedi_subdevice *s, struct comedi_insn *insn,unsigned int *data) | | | | | +----------------------------------------------------------------------------+ @@ -2371,7 +2371,7 @@ int i_APCI3120_InsnReadTimer(struct comedi_device * dev, struct comedi_subdevice +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev | | struct comedi_subdevice *s | -| comedi_insn *insn | +| struct comedi_insn *insn | | unsigned int *data | +----------------------------------------------------------------------------+ | Return Value : | @@ -2381,7 +2381,7 @@ int i_APCI3120_InsnReadTimer(struct comedi_device * dev, struct comedi_subdevice int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data) { UINT ui_Chan, ui_TmpValue; @@ -2407,7 +2407,7 @@ int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev, /* +----------------------------------------------------------------------------+ | Function name :int i_APCI3120_InsnBitsDigitalInput(struct comedi_device *dev, | -|struct comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | +|struct comedi_subdevice *s, struct comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Reads the value of the Digital input Port i.e.4channels| @@ -2416,7 +2416,7 @@ int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev, +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev | | struct comedi_subdevice *s | -| comedi_insn *insn | +| struct comedi_insn *insn | | unsigned int *data | +----------------------------------------------------------------------------+ | Return Value : | @@ -2424,7 +2424,7 @@ int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev, +----------------------------------------------------------------------------+ */ int i_APCI3120_InsnBitsDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_TmpValue; ui_TmpValue = (UINT) inw(devpriv->iobase + APCI3120_RD_STATUS); @@ -2446,7 +2446,7 @@ int i_APCI3120_InsnBitsDigitalInput(struct comedi_device * dev, struct comedi_su /* +----------------------------------------------------------------------------+ | Function name :int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device | -| *dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | +| *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task :Configure the output memory ON or OFF | @@ -2454,7 +2454,7 @@ int i_APCI3120_InsnBitsDigitalInput(struct comedi_device * dev, struct comedi_su +----------------------------------------------------------------------------+ | Input Parameters :struct comedi_device *dev | | struct comedi_subdevice *s | -| comedi_insn *insn | +| struct comedi_insn *insn | | unsigned int *data | +----------------------------------------------------------------------------+ | Return Value : | @@ -2463,7 +2463,7 @@ int i_APCI3120_InsnBitsDigitalInput(struct comedi_device * dev, struct comedi_su */ int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { if ((data[0] != 0) && (data[0] != 1)) { @@ -2489,7 +2489,7 @@ int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function name :int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device *dev, | -| struct comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | +| struct comedi_subdevice *s, struct comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : write diatal output port | @@ -2497,7 +2497,7 @@ int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device * dev, +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev | | struct comedi_subdevice *s | -| comedi_insn *insn | +| struct comedi_insn *insn | | unsigned int *data | data[0] Value to be written data[1] :1 Set digital o/p ON @@ -2510,7 +2510,7 @@ int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device * dev, int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device * dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data) { if ((data[0] > this_board->i_DoMaxdata) || (data[0] < 0)) { @@ -2542,7 +2542,7 @@ int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device * dev, /* +----------------------------------------------------------------------------+ | Function name :int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev,| -|struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | +|struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Write digiatl output | @@ -2550,7 +2550,7 @@ int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device * dev, +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev | | struct comedi_subdevice *s | -| comedi_insn *insn | +| struct comedi_insn *insn | | unsigned int *data | data[0] Value to be written data[1] :1 Set digital o/p ON @@ -2563,7 +2563,7 @@ int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device * dev, int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data) { @@ -2625,7 +2625,7 @@ int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev, /* +----------------------------------------------------------------------------+ | Function name :int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev,| -|struct comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | +|struct comedi_subdevice *s, struct comedi_insn *insn,unsigned int *data) | | | +----------------------------------------------------------------------------+ | Task : Write analog output | @@ -2633,7 +2633,7 @@ int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev, +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev | | struct comedi_subdevice *s | -| comedi_insn *insn | +| struct comedi_insn *insn | | unsigned int *data | +----------------------------------------------------------------------------+ | Return Value : | @@ -2643,7 +2643,7 @@ int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev, int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data) { UINT ui_Range, ui_Channel; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h index 0fb31835a68b..59d5d87a845b 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h @@ -199,41 +199,41 @@ void v_APCI3120_InterruptDma(int irq, void *d); // TIMER int i_APCI3120_InsnConfigTimer(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI3120_InsnWriteTimer(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI3120_InsnReadTimer(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); //DI // for di read int i_APCI3120_InsnBitsDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); //DO //int i_APCI3120_WriteDigitalOutput(struct comedi_device *dev, BYTE data); int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); //AO //int i_APCI3120_Write1AnalogValue(struct comedi_device *dev,UINT ui_Range,UINT ui_Channel,UINT data ); int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); //AI HArdware layer int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd); int i_APCI3120_CommandAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c index c7e42b54daf7..b4a900308b96 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c @@ -531,7 +531,7 @@ INT i_APCI3200_GetChannelCalibrationValue(struct comedi_device * dev, +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadDigitalInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | - | comedi_insn *insn,unsigned int *data) | + | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ @@ -551,7 +551,7 @@ INT i_APCI3200_GetChannelCalibrationValue(struct comedi_device * dev, */ INT i_APCI3200_ReadDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Temp = 0; UINT ui_NoOfChannel = 0; @@ -593,7 +593,7 @@ INT i_APCI3200_ReadDigitalInput(struct comedi_device * dev, struct comedi_subdev +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ConfigDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | - | comedi_insn *insn,unsigned int *data) | + | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Digital Output Subdevice. | +----------------------------------------------------------------------------+ @@ -609,7 +609,7 @@ INT i_APCI3200_ReadDigitalInput(struct comedi_device * dev, struct comedi_subdev +----------------------------------------------------------------------------+ */ int i_APCI3200_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if ((data[0] != 0) && (data[0] != 1)) { @@ -630,13 +630,13 @@ int i_APCI3200_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_WriteDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | - | comedi_insn *insn,unsigned int *data) | + | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : writes To the digital Output Subdevice | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s : Subdevice Pointer | - | comedi_insn *insn : Insn Structure Pointer | + | struct comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer contains | | configuration parameters as below | | data[0] :Value to output @@ -654,7 +654,7 @@ int i_APCI3200_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub +----------------------------------------------------------------------------+ */ INT i_APCI3200_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Temp = 0, ui_Temp1 = 0; UINT ui_NoOfChannel = CR_CHAN(insn->chanspec); // get the channel @@ -747,7 +747,7 @@ INT i_APCI3200_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | - | comedi_insn *insn,unsigned int *data) | + | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ @@ -767,7 +767,7 @@ INT i_APCI3200_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ */ INT i_APCI3200_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Temp; UINT ui_NoOfChannel; @@ -808,13 +808,13 @@ INT i_APCI3200_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ | Function Name : INT i_APCI3200_ConfigAnalogInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | - | comedi_insn *insn,unsigned int *data) | + | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Analog Input Subdevice | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s : Subdevice Pointer | - | comedi_insn *insn : Insn Structure Pointer | + | struct comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer contains | | configuration parameters as below | | | @@ -875,7 +875,7 @@ INT i_APCI3200_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ */ INT i_APCI3200_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ul_Config = 0, ul_Temp = 0; @@ -1335,7 +1335,7 @@ INT i_APCI3200_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadAnalogInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | - | comedi_insn *insn,unsigned int *data) | + | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel | +----------------------------------------------------------------------------+ @@ -1362,7 +1362,7 @@ INT i_APCI3200_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ */ INT i_APCI3200_ReadAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_DummyValue = 0; int i_ConvertCJCCalibration; @@ -1634,7 +1634,7 @@ INT i_APCI3200_ReadAnalogInput(struct comedi_device * dev, struct comedi_subdevi +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_Read1AnalogInputChannel | | (struct comedi_device *dev,struct comedi_subdevice *s, | - | comedi_insn *insn,unsigned int *data) | + | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel | +----------------------------------------------------------------------------+ @@ -1652,7 +1652,7 @@ INT i_APCI3200_ReadAnalogInput(struct comedi_device * dev, struct comedi_subdevi +----------------------------------------------------------------------------+ */ INT i_APCI3200_Read1AnalogInputChannel(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { UINT ui_EOC = 0; UINT ui_ChannelNo = 0; @@ -1760,7 +1760,7 @@ INT i_APCI3200_Read1AnalogInputChannel(struct comedi_device * dev, +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadCalibrationOffsetValue | | (struct comedi_device *dev,struct comedi_subdevice *s, | - | comedi_insn *insn,unsigned int *data) | + | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read calibration offset value of the selected channel| +----------------------------------------------------------------------------+ @@ -1896,7 +1896,7 @@ int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device * dev, UINT * dat +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadCalibrationGainValue | | (struct comedi_device *dev,struct comedi_subdevice *s, | - | comedi_insn *insn,unsigned int *data) | + | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read calibration gain value of the selected channel | +----------------------------------------------------------------------------+ @@ -2031,7 +2031,7 @@ int i_APCI3200_ReadCalibrationGainValue(struct comedi_device * dev, UINT * data) +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadCJCValue | | (struct comedi_device *dev,struct comedi_subdevice *s, | - | comedi_insn *insn,unsigned int *data) | + | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read CJC value of the selected channel | +----------------------------------------------------------------------------+ @@ -2151,7 +2151,7 @@ int i_APCI3200_ReadCJCValue(struct comedi_device * dev, unsigned int * data) +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadCJCCalOffset | | (struct comedi_device *dev,struct comedi_subdevice *s, | - | comedi_insn *insn,unsigned int *data) | + | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read CJC calibration offset value of the selected channel +----------------------------------------------------------------------------+ @@ -2266,7 +2266,7 @@ int i_APCI3200_ReadCJCCalOffset(struct comedi_device * dev, unsigned int * data) +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_ReadCJCGainValue | | (struct comedi_device *dev,struct comedi_subdevice *s, | - | comedi_insn *insn,unsigned int *data) | + | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read CJC calibration gain value +----------------------------------------------------------------------------+ @@ -2376,13 +2376,13 @@ int i_APCI3200_ReadCJCCalGain(struct comedi_device * dev, unsigned int * data) +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_InsnBits_AnalogInput_Test | | (struct comedi_device *dev,struct comedi_subdevice *s, | - | comedi_insn *insn,unsigned int *data) | + | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Tests the Selected Anlog Input Channel | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s : Subdevice Pointer | - | comedi_insn *insn : Insn Structure Pointer | + | struct comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer contains | | configuration parameters as below | | @@ -2405,7 +2405,7 @@ int i_APCI3200_ReadCJCCalGain(struct comedi_device * dev, unsigned int * data) */ INT i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { UINT ui_Configuration = 0; INT i_Temp; //,i_TimeUnit; @@ -2511,13 +2511,13 @@ INT i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device * dev, +----------------------------------------------------------------------------+ | Function Name : int i_APCI3200_InsnWriteReleaseAnalogInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | - | comedi_insn *insn,unsigned int *data) | + | struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Resets the channels | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s : Subdevice Pointer | - | comedi_insn *insn : Insn Structure Pointer | + | struct comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer +----------------------------------------------------------------------------+ | Output Parameters : -- | @@ -2530,7 +2530,7 @@ INT i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device * dev, */ INT i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { i_APCI3200_Reset(dev); return insn->n; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h index 94d9cef4bce5..a6f57f55e79c 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h @@ -155,22 +155,22 @@ typedef struct { //AI INT i_APCI3200_ConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI3200_ReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_subdevice *s); INT i_APCI3200_InterruptHandleEos(struct comedi_device *dev); INT i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd); INT i_APCI3200_CommandAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s); INT i_APCI3200_ReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); //Interrupt void v_APCI3200_Interrupt(int irq, void *d); int i_APCI3200_InterruptHandleEos(struct comedi_device *dev); @@ -182,6 +182,6 @@ int i_APCI3200_ReadCJCValue(struct comedi_device *dev, unsigned int *data); int i_APCI3200_ReadCalibrationGainValue(struct comedi_device *dev, UINT *data); int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device *dev, UINT *data); int i_APCI3200_Read1AnalogInputChannel(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); int i_APCI3200_ReadCJCCalGain(struct comedi_device *dev, unsigned int *data); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c index 2e4c8ad54db2..20391a91da03 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c @@ -57,7 +57,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_ReadDigitalInput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ @@ -74,7 +74,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc */ INT i_APCI3501_ReadDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Temp; UINT ui_NoOfChannel; @@ -100,7 +100,7 @@ INT i_APCI3501_ReadDigitalInput(struct comedi_device * dev, struct comedi_subdev +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_ConfigDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Digital Output Subdevice. | +----------------------------------------------------------------------------+ @@ -122,7 +122,7 @@ INT i_APCI3501_ReadDigitalInput(struct comedi_device * dev, struct comedi_subdev +----------------------------------------------------------------------------+ */ int i_APCI3501_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if ((data[0] != 0) && (data[0] != 1)) { @@ -143,13 +143,13 @@ int i_APCI3501_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_WriteDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : writes To the digital Output Subdevice | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s : Subdevice Pointer | -| comedi_insn *insn : Insn Structure Pointer | +| struct comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer contains | | configuration parameters as below | | | @@ -162,7 +162,7 @@ int i_APCI3501_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub +----------------------------------------------------------------------------+ */ INT i_APCI3501_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Temp, ui_Temp1; UINT ui_NoOfChannel = CR_CHAN(insn->chanspec); // get the channel @@ -233,7 +233,7 @@ INT i_APCI3501_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_ReadDigitalOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read value of the selected channel or port | +----------------------------------------------------------------------------+ @@ -249,7 +249,7 @@ INT i_APCI3501_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ */ INT i_APCI3501_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { UINT ui_Temp; UINT ui_NoOfChannel; @@ -276,13 +276,13 @@ INT i_APCI3501_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_ConfigAnalogOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Analog Output Subdevice | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s : Subdevice Pointer | -| comedi_insn *insn : Insn Structure Pointer | +| struct comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer contains | | configuration parameters as below | | | @@ -299,7 +299,7 @@ INT i_APCI3501_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ */ INT i_APCI3501_ConfigAnalogOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { outl(data[0], devpriv->iobase + APCI3501_ANALOG_OUTPUT + @@ -317,13 +317,13 @@ INT i_APCI3501_ConfigAnalogOutput(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_WriteAnalogOutput | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Writes To the Selected Anlog Output Channel | +----------------------------------------------------------------------------+ | Input Parameters : struct comedi_device *dev : Driver handle | | struct comedi_subdevice *s : Subdevice Pointer | -| comedi_insn *insn : Insn Structure Pointer | +| struct comedi_insn *insn : Insn Structure Pointer | | unsigned int *data : Data Pointer contains | | configuration parameters as below | | | @@ -337,7 +337,7 @@ INT i_APCI3501_ConfigAnalogOutput(struct comedi_device * dev, struct comedi_subd +----------------------------------------------------------------------------+ */ INT i_APCI3501_WriteAnalogOutput(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { ULONG ul_Command1 = 0, ul_Channel_no, ul_Polarity, ul_DAC_Ready = 0;; @@ -387,7 +387,7 @@ INT i_APCI3501_WriteAnalogOutput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_ConfigTimerCounterWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Configures The Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ @@ -411,7 +411,7 @@ INT i_APCI3501_WriteAnalogOutput(struct comedi_device * dev, struct comedi_subde +----------------------------------------------------------------------------+ */ INT i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { ULONG ul_Command1 = 0; devpriv->tsk_Current = current; @@ -490,7 +490,7 @@ INT i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device * dev, +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_StartStopWriteTimerCounterWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Start / Stop The Selected Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ @@ -512,7 +512,7 @@ INT i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device * dev, */ int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { ULONG ul_Command1 = 0; int i_Temp; @@ -593,7 +593,7 @@ int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device * dev, +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_ReadTimerCounterWatchdog | | (struct comedi_device *dev,struct comedi_subdevice *s, | -| comedi_insn *insn,unsigned int *data) | +| struct comedi_insn *insn,unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read The Selected Timer , Counter or Watchdog | +----------------------------------------------------------------------------+ @@ -614,7 +614,7 @@ int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device * dev, */ int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) { diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h index 550d81543b16..51e7b66544ac 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h @@ -56,37 +56,37 @@ struct comedi_lrange range_apci3501_ao = { 2, { //AO INT i_APCI3501_ConfigAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI3501_WriteAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); //DI // for di read -//INT i_APCI3501_ReadDigitalInput(struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data); +//INT i_APCI3501_ReadDigitalInput(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data); INT i_APCI3501_ReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); //DO int i_APCI3501_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI3501_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); INT i_APCI3501_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); // TIMER // timer value is passed as u seconds INT i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, + struct comedi_insn *insn, unsigned int *data); int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); //Interrupt void v_APCI3501_Interrupt(int irq, void *d); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c index ae11fb7af323..b7268e4da64e 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c @@ -82,7 +82,7 @@ int i_APCI3XXX_TestConversionStarted(struct comedi_device * dev) | Function Name : INT i_APCI3XXX_AnalogInputConfigOperatingMode | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task Converting mode and convert time selection | @@ -106,7 +106,7 @@ int i_APCI3XXX_TestConversionStarted(struct comedi_device * dev) */ int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; BYTE b_TimeBase = 0; @@ -276,7 +276,7 @@ int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device * dev, | Function Name : INT i_APCI3XXX_InsnConfigAnalogInput | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task Converting mode and convert time selection | @@ -296,7 +296,7 @@ int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device * dev, */ int i_APCI3XXX_InsnConfigAnalogInput(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; @@ -334,7 +334,7 @@ int i_APCI3XXX_InsnConfigAnalogInput(struct comedi_device * dev, | Function Name : INT i_APCI3XXX_InsnReadAnalogInput | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task Read 1 analog input | @@ -356,7 +356,7 @@ int i_APCI3XXX_InsnConfigAnalogInput(struct comedi_device * dev, */ int i_APCI3XXX_InsnReadAnalogInput(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; BYTE b_Configuration = (BYTE) CR_RANGE(insn->chanspec); @@ -665,7 +665,7 @@ void v_APCI3XXX_Interrupt(int irq, void *d) | Function Name : INT i_APCI3XXX_InsnWriteAnalogOutput | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task Read 1 analog input | @@ -685,7 +685,7 @@ void v_APCI3XXX_Interrupt(int irq, void *d) */ int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { BYTE b_Range = (BYTE) CR_RANGE(insn->chanspec); BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec); @@ -771,7 +771,7 @@ int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device * dev, | Function Name : INT i_APCI3XXX_InsnConfigInitTTLIO | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task You must calling this function be | @@ -792,7 +792,7 @@ int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device * dev, */ int i_APCI3XXX_InsnConfigInitTTLIO(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; BYTE b_Command = 0; @@ -902,7 +902,7 @@ int i_APCI3XXX_InsnConfigInitTTLIO(struct comedi_device * dev, | Function Name : INT i_APCI3XXX_InsnBitsTTLIO | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Write the selected output mask and read the status from| @@ -920,7 +920,7 @@ int i_APCI3XXX_InsnConfigInitTTLIO(struct comedi_device * dev, */ int i_APCI3XXX_InsnBitsTTLIO(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; BYTE b_ChannelCpt = 0; @@ -1059,7 +1059,7 @@ int i_APCI3XXX_InsnBitsTTLIO(struct comedi_device * dev, | Function Name : INT i_APCI3XXX_InsnReadTTLIO | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read the status from selected channel | @@ -1075,7 +1075,7 @@ int i_APCI3XXX_InsnBitsTTLIO(struct comedi_device * dev, */ int i_APCI3XXX_InsnReadTTLIO(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec); INT i_ReturnValue = insn->n; @@ -1171,7 +1171,7 @@ int i_APCI3XXX_InsnReadTTLIO(struct comedi_device * dev, | Function Name : INT i_APCI3XXX_InsnWriteTTLIO | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Set the state from TTL output channel | @@ -1188,7 +1188,7 @@ int i_APCI3XXX_InsnReadTTLIO(struct comedi_device * dev, */ int i_APCI3XXX_InsnWriteTTLIO(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec); @@ -1283,7 +1283,7 @@ int i_APCI3XXX_InsnWriteTTLIO(struct comedi_device * dev, | Function name :int i_APCI3XXX_InsnReadDigitalInput | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Reads the value of the specified Digital input channel | @@ -1299,7 +1299,7 @@ int i_APCI3XXX_InsnWriteTTLIO(struct comedi_device * dev, */ int i_APCI3XXX_InsnReadDigitalInput(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec); @@ -1342,7 +1342,7 @@ int i_APCI3XXX_InsnReadDigitalInput(struct comedi_device * dev, | Function name :int i_APCI3XXX_InsnBitsDigitalInput | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Reads the value of the Digital input Port i.e.4channels| @@ -1357,7 +1357,7 @@ int i_APCI3XXX_InsnReadDigitalInput(struct comedi_device * dev, +----------------------------------------------------------------------------+ */ int i_APCI3XXX_InsnBitsDigitalInput(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; DWORD dw_Temp = 0; @@ -1393,7 +1393,7 @@ int i_APCI3XXX_InsnBitsDigitalInput(struct comedi_device * dev, | Function name :int i_APCI3XXX_InsnBitsDigitalOutput | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Write the selected output mask and read the status from| @@ -1410,7 +1410,7 @@ int i_APCI3XXX_InsnBitsDigitalInput(struct comedi_device * dev, +----------------------------------------------------------------------------+ */ int i_APCI3XXX_InsnBitsDigitalOutput(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; BYTE b_ChannelCpt = 0; @@ -1489,7 +1489,7 @@ int i_APCI3XXX_InsnBitsDigitalOutput(struct comedi_device * dev, | Function name :int i_APCI3XXX_InsnWriteDigitalOutput | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Set the state from digital output channel | @@ -1506,7 +1506,7 @@ int i_APCI3XXX_InsnBitsDigitalOutput(struct comedi_device * dev, */ int i_APCI3XXX_InsnWriteDigitalOutput(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; BYTE b_Channel = CR_CHAN(insn->chanspec); @@ -1565,7 +1565,7 @@ int i_APCI3XXX_InsnWriteDigitalOutput(struct comedi_device * dev, | Function name :int i_APCI3XXX_InsnReadDigitalOutput | | (struct comedi_device *dev, | | struct comedi_subdevice *s, | -| comedi_insn *insn, | +| struct comedi_insn *insn, | | unsigned int *data) | +----------------------------------------------------------------------------+ | Task : Read the state from digital output channel | @@ -1581,7 +1581,7 @@ int i_APCI3XXX_InsnWriteDigitalOutput(struct comedi_device * dev, */ int i_APCI3XXX_InsnReadDigitalOutput(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { INT i_ReturnValue = insn->n; BYTE b_Channel = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c index 9572f04c4cdd..cb0073156718 100644 --- a/drivers/staging/comedi/drivers/adl_pci6208.c +++ b/drivers/staging/comedi/drivers/adl_pci6208.c @@ -128,13 +128,13 @@ pci6208_pci_setup(struct pci_dev *pci_dev, unsigned long *io_base_ptr, /*read/write functions*/ static int pci6208_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int pci6208_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); //static int pci6208_dio_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, -// comedi_insn *insn,unsigned int *data); +// struct comedi_insn *insn,unsigned int *data); //static int pci6208_dio_insn_config(struct comedi_device *dev,struct comedi_subdevice *s, -// comedi_insn *insn,unsigned int *data); +// struct comedi_insn *insn,unsigned int *data); /* * Attach is called by the Comedi core to configure the driver @@ -220,7 +220,7 @@ static int pci6208_detach(struct comedi_device * dev) } static int pci6208_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i = 0, Data_Read; unsigned short chan = CR_CHAN(insn->chanspec); @@ -245,7 +245,7 @@ static int pci6208_ao_winsn(struct comedi_device * dev, struct comedi_subdevice /* AO subdevices should have a read insn as well as a write insn. * Usually this means copying a value stored in devpriv. */ static int pci6208_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -262,7 +262,7 @@ static int pci6208_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * This allows packed reading/writing of the DIO channels. The * comedi core can convert between insn_bits and insn_read/write */ //static int pci6208_dio_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, -// comedi_insn *insn,unsigned int *data) +// struct comedi_insn *insn,unsigned int *data) //{ // if(insn->n!=2)return -EINVAL; @@ -286,7 +286,7 @@ static int pci6208_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice //} //static int pci6208_dio_insn_config(struct comedi_device *dev,struct comedi_subdevice *s, -// comedi_insn *insn,unsigned int *data) +// struct comedi_insn *insn,unsigned int *data) //{ // int chan=CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/adl_pci7432.c b/drivers/staging/comedi/drivers/adl_pci7432.c index 7e8741e51cec..6759cb39d564 100644 --- a/drivers/staging/comedi/drivers/adl_pci7432.c +++ b/drivers/staging/comedi/drivers/adl_pci7432.c @@ -70,10 +70,10 @@ static struct comedi_driver driver_adl_pci7432 = { /* Digital IO */ static int adl_pci7432_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int adl_pci7432_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); /* */ @@ -165,7 +165,7 @@ static int adl_pci7432_detach(struct comedi_device * dev) } static int adl_pci7432_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { printk("comedi: pci7432_do_insn_bits called\n"); printk("comedi: data0: %8x data1: %8x\n", data[0], data[1]); @@ -185,7 +185,7 @@ static int adl_pci7432_do_insn_bits(struct comedi_device * dev, struct comedi_su } static int adl_pci7432_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { printk("comedi: pci7432_di_insn_bits called\n"); printk("comedi: data0: %8x data1: %8x\n", data[0], data[1]); diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c index fd925f5d86f6..0c93efc761a4 100644 --- a/drivers/staging/comedi/drivers/adl_pci8164.c +++ b/drivers/staging/comedi/drivers/adl_pci8164.c @@ -80,28 +80,28 @@ static struct comedi_driver driver_adl_pci8164 = { }; static int adl_pci8164_insn_read_msts(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int adl_pci8164_insn_read_ssts(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int adl_pci8164_insn_read_buf0(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int adl_pci8164_insn_read_buf1(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int adl_pci8164_insn_write_cmd(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int adl_pci8164_insn_write_otp(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int adl_pci8164_insn_write_buf0(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); static int adl_pci8164_insn_write_buf1(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); static int adl_pci8164_attach(struct comedi_device * dev, comedi_devconfig * it) { @@ -209,7 +209,7 @@ static int adl_pci8164_detach(struct comedi_device * dev) } static int adl_pci8164_insn_read_msts(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int axis, axis_reg; char *axisname; @@ -246,7 +246,7 @@ static int adl_pci8164_insn_read_msts(struct comedi_device * dev, struct comedi_ } static int adl_pci8164_insn_read_ssts(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int axis, axis_reg; char *axisname; @@ -283,7 +283,7 @@ static int adl_pci8164_insn_read_ssts(struct comedi_device * dev, struct comedi_ } static int adl_pci8164_insn_read_buf0(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int axis, axis_reg; char *axisname; @@ -320,7 +320,7 @@ static int adl_pci8164_insn_read_buf0(struct comedi_device * dev, struct comedi_ } static int adl_pci8164_insn_read_buf1(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int axis, axis_reg; @@ -358,7 +358,7 @@ static int adl_pci8164_insn_read_buf1(struct comedi_device * dev, struct comedi_ } static int adl_pci8164_insn_write_cmd(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int axis, axis_reg; @@ -396,7 +396,7 @@ static int adl_pci8164_insn_write_cmd(struct comedi_device * dev, struct comedi_ } static int adl_pci8164_insn_write_otp(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int axis, axis_reg; @@ -434,7 +434,7 @@ static int adl_pci8164_insn_write_otp(struct comedi_device * dev, struct comedi_ } static int adl_pci8164_insn_write_buf0(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { int axis, axis_reg; @@ -472,7 +472,7 @@ static int adl_pci8164_insn_write_buf0(struct comedi_device * dev, } static int adl_pci8164_insn_write_buf1(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { int axis, axis_reg; diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c index 41aaac7dfa4a..f6ec53728800 100644 --- a/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/drivers/staging/comedi/drivers/adl_pci9111.c @@ -1072,7 +1072,7 @@ static irqreturn_t pci9111_interrupt(int irq, void *p_device PT_REGS_ARG) #undef AI_INSN_DEBUG static int pci9111_ai_insn_read(struct comedi_device * dev, - struct comedi_subdevice * subdevice, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * subdevice, struct comedi_insn * insn, unsigned int * data) { int resolution = ((pci9111_board_struct *) dev->board_ptr)->ai_resolution; @@ -1132,7 +1132,7 @@ static int pci9111_ai_insn_read(struct comedi_device * dev, static int pci9111_ao_insn_write(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { int i; @@ -1149,7 +1149,7 @@ pci9111_ao_insn_write(struct comedi_device * dev, // static int pci9111_ao_insn_read(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { int i; @@ -1171,7 +1171,7 @@ static int pci9111_ao_insn_read(struct comedi_device * dev, // static int pci9111_di_insn_bits(struct comedi_device * dev, - struct comedi_subdevice * subdevice, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * subdevice, struct comedi_insn * insn, unsigned int * data) { unsigned int bits; @@ -1186,7 +1186,7 @@ static int pci9111_di_insn_bits(struct comedi_device * dev, // static int pci9111_do_insn_bits(struct comedi_device * dev, - struct comedi_subdevice * subdevice, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * subdevice, struct comedi_insn * insn, unsigned int * data) { unsigned int bits; diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index cc3ea6cfdb81..406eab7fd435 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c @@ -328,7 +328,7 @@ static void pci9118_calc_divisors(char mode, struct comedi_device * dev, ============================================================================== */ static int pci9118_insn_read_ai(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, timeout; @@ -378,7 +378,7 @@ static int pci9118_insn_read_ai(struct comedi_device * dev, struct comedi_subdev ============================================================================== */ static int pci9118_insn_write_ao(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, chanreg, ch; @@ -401,7 +401,7 @@ static int pci9118_insn_write_ao(struct comedi_device * dev, struct comedi_subde ============================================================================== */ static int pci9118_insn_read_ao(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, chan; @@ -416,7 +416,7 @@ static int pci9118_insn_read_ao(struct comedi_device * dev, struct comedi_subdev ============================================================================== */ static int pci9118_insn_bits_di(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[1] = inl(dev->iobase + PCI9118_DI) & 0xf; @@ -427,7 +427,7 @@ static int pci9118_insn_bits_di(struct comedi_device * dev, struct comedi_subdev ============================================================================== */ static int pci9118_insn_bits_do(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (data[0]) { s->state &= ~data[0]; diff --git a/drivers/staging/comedi/drivers/adq12b.c b/drivers/staging/comedi/drivers/adq12b.c index fd2a6f7733b2..07eea09e81fb 100644 --- a/drivers/staging/comedi/drivers/adq12b.c +++ b/drivers/staging/comedi/drivers/adq12b.c @@ -174,9 +174,9 @@ static struct comedi_driver driver_adq12b={ num_names: sizeof(adq12b_boards) / sizeof(adq12b_board), }; -static int adq12b_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data); -static int adq12b_di_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, comedi_insn *insn,unsigned int *data); -static int adq12b_do_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, comedi_insn *insn,unsigned int *data); +static int adq12b_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data); +static int adq12b_di_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, struct comedi_insn *insn,unsigned int *data); +static int adq12b_do_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, struct comedi_insn *insn,unsigned int *data); /* * Attach is called by the Comedi core to configure the driver @@ -314,7 +314,7 @@ static int adq12b_detach(struct comedi_device *dev) * mode. */ -static int adq12b_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) +static int adq12b_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) { int n, i; int range, channel; @@ -357,7 +357,7 @@ static int adq12b_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s, } -static int adq12b_di_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, comedi_insn *insn,unsigned int *data) +static int adq12b_di_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, struct comedi_insn *insn,unsigned int *data) { /* only bits 0-4 have information about digital inputs */ @@ -367,7 +367,7 @@ static int adq12b_di_insn_bits(struct comedi_device *dev,struct comedi_subdevice } -static int adq12b_do_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, comedi_insn *insn,unsigned int *data) +static int adq12b_do_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, struct comedi_insn *insn,unsigned int *data) { int channel; diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c index 0732cac2e710..64aec321274d 100644 --- a/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/drivers/staging/comedi/drivers/adv_pci1710.c @@ -323,7 +323,7 @@ static const unsigned int muxonechan[] = { 0x0000, 0x0101, 0x0202, 0x0303, 0x040 ============================================================================== */ static int pci171x_insn_read_ai(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, timeout; #ifdef PCI171x_PARANOIDCHECK @@ -391,7 +391,7 @@ static int pci171x_insn_read_ai(struct comedi_device * dev, struct comedi_subdev ============================================================================== */ static int pci171x_insn_write_ao(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, chan, range, ofs; @@ -422,7 +422,7 @@ static int pci171x_insn_write_ao(struct comedi_device * dev, struct comedi_subde ============================================================================== */ static int pci171x_insn_read_ao(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, chan; @@ -437,7 +437,7 @@ static int pci171x_insn_read_ao(struct comedi_device * dev, struct comedi_subdev ============================================================================== */ static int pci171x_insn_bits_di(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[1] = inw(dev->iobase + PCI171x_DI); @@ -448,7 +448,7 @@ static int pci171x_insn_bits_di(struct comedi_device * dev, struct comedi_subdev ============================================================================== */ static int pci171x_insn_bits_do(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (data[0]) { s->state &= ~data[0]; @@ -464,7 +464,7 @@ static int pci171x_insn_bits_do(struct comedi_device * dev, struct comedi_subdev ============================================================================== */ static int pci171x_insn_counter_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int msb, lsb, ccntrl; int i; @@ -486,7 +486,7 @@ static int pci171x_insn_counter_read(struct comedi_device * dev, struct comedi_s ============================================================================== */ static int pci171x_insn_counter_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { uint msb, lsb, ccntrl, status; @@ -513,7 +513,7 @@ static int pci171x_insn_counter_write(struct comedi_device * dev, struct comedi_ ============================================================================== */ static int pci171x_insn_counter_config(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { #ifdef unused /* This doesn't work like a normal Comedi counter config */ @@ -549,7 +549,7 @@ static int pci171x_insn_counter_config(struct comedi_device * dev, ============================================================================== */ static int pci1720_insn_write_ao(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, rangereg, chan; diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c index c50578dfab9c..002144a9f6bd 100644 --- a/drivers/staging/comedi/drivers/adv_pci1723.c +++ b/drivers/staging/comedi/drivers/adv_pci1723.c @@ -203,7 +203,7 @@ static int pci1723_reset(struct comedi_device * dev) } static int pci1723_insn_read_ao(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, chan; @@ -219,7 +219,7 @@ static int pci1723_insn_read_ao(struct comedi_device * dev, struct comedi_subdev analog data output; */ static int pci1723_ao_write_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, chan; chan = CR_CHAN(insn->chanspec); @@ -239,7 +239,7 @@ static int pci1723_ao_write_winsn(struct comedi_device * dev, struct comedi_subd digital i/o config/query */ static int pci1723_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int mask; unsigned int bits; @@ -279,7 +279,7 @@ static int pci1723_dio_insn_config(struct comedi_device * dev, struct comedi_sub digital i/o bits read/write */ static int pci1723_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (data[0]) { s->state &= ~data[0]; diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c index 5fcba548a786..7ed30317073c 100644 --- a/drivers/staging/comedi/drivers/adv_pci_dio.c +++ b/drivers/staging/comedi/drivers/adv_pci_dio.c @@ -358,7 +358,7 @@ static pci_dio_private *pci_priv = NULL; /* list of allocated cards */ ============================================================================== */ static int pci_dio_insn_bits_di_b(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { const diosubd_data *d = (const diosubd_data *)s->private; int i; @@ -375,7 +375,7 @@ static int pci_dio_insn_bits_di_b(struct comedi_device * dev, struct comedi_subd ============================================================================== */ static int pci_dio_insn_bits_di_w(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { const diosubd_data *d = (const diosubd_data *)s->private; int i; @@ -391,7 +391,7 @@ static int pci_dio_insn_bits_di_w(struct comedi_device * dev, struct comedi_subd ============================================================================== */ static int pci_dio_insn_bits_do_b(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { const diosubd_data *d = (const diosubd_data *)s->private; int i; @@ -412,7 +412,7 @@ static int pci_dio_insn_bits_do_b(struct comedi_device * dev, struct comedi_subd ============================================================================== */ static int pci_dio_insn_bits_do_w(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { const diosubd_data *d = (const diosubd_data *)s->private; int i; @@ -491,7 +491,7 @@ static int pci1760_mbxrequest(struct comedi_device * dev, ============================================================================== */ static int pci1760_insn_bits_di(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[1] = inb(dev->iobase + IMB3); @@ -502,7 +502,7 @@ static int pci1760_insn_bits_di(struct comedi_device * dev, struct comedi_subdev ============================================================================== */ static int pci1760_insn_bits_do(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int ret; unsigned char omb[4] = { @@ -529,7 +529,7 @@ static int pci1760_insn_bits_do(struct comedi_device * dev, struct comedi_subdev ============================================================================== */ static int pci1760_insn_cnt_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int ret, n; unsigned char omb[4] = { @@ -553,7 +553,7 @@ static int pci1760_insn_cnt_read(struct comedi_device * dev, struct comedi_subde ============================================================================== */ static int pci1760_insn_cnt_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int ret; unsigned char chan = CR_CHAN(insn->chanspec) & 0x07; diff --git a/drivers/staging/comedi/drivers/aio_aio12_8.c b/drivers/staging/comedi/drivers/aio_aio12_8.c index 2d1b8d269645..10fd18aeb3fe 100644 --- a/drivers/staging/comedi/drivers/aio_aio12_8.c +++ b/drivers/staging/comedi/drivers/aio_aio12_8.c @@ -89,7 +89,7 @@ typedef struct { #define devpriv ((aio12_8_private *) dev->private) static int aio_aio12_8_ai_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; unsigned char control = @@ -123,7 +123,7 @@ static int aio_aio12_8_ai_read(struct comedi_device * dev, struct comedi_subdevi } static int aio_aio12_8_ao_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int val = devpriv->ao_readback[CR_CHAN(insn->chanspec)]; @@ -134,7 +134,7 @@ static int aio_aio12_8_ao_read(struct comedi_device * dev, struct comedi_subdevi } static int aio_aio12_8_ao_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/aio_iiro_16.c b/drivers/staging/comedi/drivers/aio_iiro_16.c index b04ad03c85e7..a739bfa2b59b 100644 --- a/drivers/staging/comedi/drivers/aio_iiro_16.c +++ b/drivers/staging/comedi/drivers/aio_iiro_16.c @@ -82,10 +82,10 @@ static struct comedi_driver driver_aio_iiro_16 = { }; static int aio_iiro_16_dio_insn_bits_read(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); static int aio_iiro_16_dio_insn_bits_write(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); static int aio_iiro_16_attach(struct comedi_device * dev, comedi_devconfig * it) { @@ -143,7 +143,7 @@ static int aio_iiro_16_detach(struct comedi_device * dev) } static int aio_iiro_16_dio_insn_bits_write(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -162,7 +162,7 @@ static int aio_iiro_16_dio_insn_bits_write(struct comedi_device * dev, } static int aio_iiro_16_dio_insn_bits_read(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c index 25b8f4fa1c1a..88c127566b8a 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200.c +++ b/drivers/staging/comedi/drivers/amplc_dio200.c @@ -573,7 +573,7 @@ dio200_request_region(unsigned minor, unsigned long from, unsigned long extent) */ static int dio200_subdev_intr_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { dio200_subdev_intr *subpriv = s->private; @@ -1034,7 +1034,7 @@ static irqreturn_t dio200_interrupt(int irq, void *d PT_REGS_ARG) */ static int dio200_subdev_8254_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { dio200_subdev_8254 *subpriv = s->private; int chan = CR_CHAN(insn->chanspec); @@ -1049,7 +1049,7 @@ dio200_subdev_8254_read(struct comedi_device * dev, struct comedi_subdevice * s, */ static int dio200_subdev_8254_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { dio200_subdev_8254 *subpriv = s->private; int chan = CR_CHAN(insn->chanspec); @@ -1143,7 +1143,7 @@ dio200_get_clock_src(dio200_subdev_8254 * subpriv, unsigned int counter_number, */ static int dio200_subdev_8254_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { dio200_subdev_8254 *subpriv = s->private; int ret; diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c index 64cfcc8296e7..b9c883500ca5 100644 --- a/drivers/staging/comedi/drivers/amplc_pc236.c +++ b/drivers/staging/comedi/drivers/amplc_pc236.c @@ -189,7 +189,7 @@ static void pc236_intr_disable(struct comedi_device * dev); static void pc236_intr_enable(struct comedi_device * dev); static int pc236_intr_check(struct comedi_device * dev); static int pc236_intr_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int pc236_intr_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, struct comedi_cmd * cmd); static int pc236_intr_cmd(struct comedi_device * dev, struct comedi_subdevice * s); @@ -529,7 +529,7 @@ static int pc236_intr_check(struct comedi_device * dev) * Copied from the comedi_parport driver. */ static int pc236_intr_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[1] = 0; return 2; diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c index 313f4a094653..d7c33e1403bb 100644 --- a/drivers/staging/comedi/drivers/amplc_pc263.c +++ b/drivers/staging/comedi/drivers/amplc_pc263.c @@ -147,9 +147,9 @@ static struct comedi_driver driver_amplc_pc263 = { static int pc263_request_region(unsigned minor, unsigned long from, unsigned long extent); static int pc263_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int pc263_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); /* * This function looks for a PCI device matching the requested board name, @@ -388,7 +388,7 @@ static int pc263_request_region(unsigned minor, unsigned long from, * This allows packed reading/writing of the DIO channels. The * comedi core can convert between insn_bits and insn_read/write */ static int pc263_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -413,7 +413,7 @@ static int pc263_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevi } static int pc263_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 1) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c index 639bd2f588c5..ec60574786a9 100644 --- a/drivers/staging/comedi/drivers/amplc_pci224.c +++ b/drivers/staging/comedi/drivers/amplc_pci224.c @@ -478,7 +478,7 @@ pci224_ao_set_data(struct comedi_device * dev, int chan, int range, unsigned int */ static int pci224_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan, range; @@ -505,7 +505,7 @@ pci224_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, */ static int pci224_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan; diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c index d985f649f9fb..432f05ba3bc5 100644 --- a/drivers/staging/comedi/drivers/amplc_pci230.c +++ b/drivers/staging/comedi/drivers/amplc_pci230.c @@ -616,11 +616,11 @@ static struct comedi_driver driver_amplc_pci230 = { COMEDI_PCI_INITCLEANUP(driver_amplc_pci230, pci230_pci_table); static int pci230_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int pci230_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int pci230_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static void pci230_ct_setup_ns_mode(struct comedi_device * dev, unsigned int ct, unsigned int mode, uint64_t ns, unsigned int round); static void pci230_ns_to_single_timer(unsigned int *ns, unsigned int round); @@ -1059,7 +1059,7 @@ static inline void put_all_resources(struct comedi_device * dev, unsigned char o * COMEDI_SUBD_AI instruction; */ static int pci230_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int n, i; unsigned int chan, range, aref; @@ -1164,7 +1164,7 @@ static int pci230_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * * COMEDI_SUBD_AO instructions; */ static int pci230_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan, range; @@ -1192,7 +1192,7 @@ static int pci230_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * /* AO subdevices should have a read insn as well as a write insn. * Usually this means copying a value stored in devpriv. */ static int pci230_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/c6xdigio.c b/drivers/staging/comedi/drivers/c6xdigio.c index 612a04afb294..8b10ff927d41 100644 --- a/drivers/staging/comedi/drivers/c6xdigio.c +++ b/drivers/staging/comedi/drivers/c6xdigio.c @@ -339,14 +339,14 @@ static void C6X_encResetAll(unsigned long baseAddr) } static int c6xdigio_pwmo_insn_read(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { printk("c6xdigio_pwmo_insn_read %x\n", insn->n); return insn->n; } static int c6xdigio_pwmo_insn_write(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -361,7 +361,7 @@ static int c6xdigio_pwmo_insn_write(struct comedi_device * dev, //static int c6xdigio_ei_init_insn_read(struct comedi_device *dev, // struct comedi_subdevice *s, -// comedi_insn *insn, +// struct comedi_insn *insn, // unsigned int *data) //{ // printk("c6xdigio_ei_init_insn_read %x\n", insn->n); @@ -370,7 +370,7 @@ static int c6xdigio_pwmo_insn_write(struct comedi_device * dev, //static int c6xdigio_ei_init_insn_write(struct comedi_device *dev, // struct comedi_subdevice *s, -// comedi_insn *insn, +// struct comedi_insn *insn, // unsigned int *data) //{ // int i; @@ -382,7 +382,7 @@ static int c6xdigio_pwmo_insn_write(struct comedi_device * dev, //} static int c6xdigio_ei_insn_read(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { // printk("c6xdigio_ei__insn_read %x\n", insn->n); int n; diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c index ef126bcf6d07..df77102cfa5e 100644 --- a/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/drivers/staging/comedi/drivers/cb_das16_cs.c @@ -110,22 +110,22 @@ static const struct comedi_lrange das16cs_ai_range = { 4, { static irqreturn_t das16cs_interrupt(int irq, void *d PT_REGS_ARG); static int das16cs_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das16cs_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); static int das16cs_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, struct comedi_cmd * cmd); static int das16cs_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das16cs_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das16cs_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das16cs_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das16cs_timer_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das16cs_timer_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int get_prodid(struct comedi_device * dev, struct pcmcia_device *link) { @@ -287,7 +287,7 @@ static irqreturn_t das16cs_interrupt(int irq, void *d PT_REGS_ARG) * mode. */ static int das16cs_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int to; @@ -490,7 +490,7 @@ static int das16cs_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevic } static int das16cs_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -536,7 +536,7 @@ static int das16cs_ao_winsn(struct comedi_device * dev, struct comedi_subdevice /* AO subdevices should have a read insn as well as a write insn. * Usually this means copying a value stored in devpriv. */ static int das16cs_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -553,7 +553,7 @@ static int das16cs_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * This allows packed reading/writing of the DIO channels. The * comedi core can convert between insn_bits and insn_read/write */ static int das16cs_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -573,7 +573,7 @@ static int das16cs_dio_insn_bits(struct comedi_device * dev, struct comedi_subde } static int das16cs_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); int bits; @@ -611,13 +611,13 @@ static int das16cs_dio_insn_config(struct comedi_device * dev, struct comedi_sub } static int das16cs_timer_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { return -EINVAL; } static int das16cs_timer_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { return -EINVAL; } diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c index 70cb220f6422..f2d09e3e7fa8 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas.c +++ b/drivers/staging/comedi/drivers/cb_pcidas.c @@ -450,15 +450,15 @@ static struct comedi_driver driver_cb_pcidas = { }; static int cb_pcidas_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ai_config_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int cb_pcidas_ao_nofifo_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int cb_pcidas_ao_fifo_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int cb_pcidas_ao_readback_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int cb_pcidas_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); static int cb_pcidas_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, struct comedi_cmd * cmd); @@ -475,22 +475,22 @@ static int cb_pcidas_ao_cancel(struct comedi_device * dev, struct comedi_subdevi static void cb_pcidas_load_counters(struct comedi_device * dev, unsigned int *ns, int round_flags); static int eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int caldac_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int caldac_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int trimpot_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int cb_pcidas_trimpot_write(struct comedi_device * dev, unsigned int channel, unsigned int value); static int trimpot_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dac08_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dac08_write(struct comedi_device * dev, unsigned int value); static int dac08_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int caldac_8800_write(struct comedi_device * dev, unsigned int address, uint8_t value); static int trimpot_7376_write(struct comedi_device * dev, uint8_t value); @@ -754,7 +754,7 @@ static int cb_pcidas_detach(struct comedi_device * dev) * mode. */ static int cb_pcidas_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, i; unsigned int bits; @@ -821,7 +821,7 @@ static int ai_config_calibration_source(struct comedi_device * dev, unsigned int } static int ai_config_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int id = data[0]; @@ -838,7 +838,7 @@ static int ai_config_insn(struct comedi_device * dev, struct comedi_subdevice * // analog output insn for pcidas-1000 and 1200 series static int cb_pcidas_ao_nofifo_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int channel; unsigned long flags; @@ -863,7 +863,7 @@ static int cb_pcidas_ao_nofifo_winsn(struct comedi_device * dev, struct comedi_s // analog output insn for pcidas-1602 series static int cb_pcidas_ao_fifo_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int channel; unsigned long flags; @@ -894,7 +894,7 @@ static int cb_pcidas_ao_fifo_winsn(struct comedi_device * dev, struct comedi_sub // analog output readback insn // XXX loses track of analog output value back after an analog ouput command is executed static int cb_pcidas_ao_readback_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = devpriv->ao_value[CR_CHAN(insn->chanspec)]; @@ -902,7 +902,7 @@ static int cb_pcidas_ao_readback_insn(struct comedi_device * dev, struct comedi_ } static int eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { uint8_t nvram_data; int retval; @@ -917,7 +917,7 @@ static int eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice } static int caldac_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { const unsigned int channel = CR_CHAN(insn->chanspec); @@ -925,7 +925,7 @@ static int caldac_write_insn(struct comedi_device * dev, struct comedi_subdevice } static int caldac_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = devpriv->caldac_value[CR_CHAN(insn->chanspec)]; @@ -954,13 +954,13 @@ static int dac08_write(struct comedi_device * dev, unsigned int value) } static int dac08_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { return dac08_write(dev, data[0]); } static int dac08_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = devpriv->dac08_value; @@ -991,7 +991,7 @@ static int cb_pcidas_trimpot_write(struct comedi_device * dev, } static int trimpot_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int channel = CR_CHAN(insn->chanspec); @@ -999,7 +999,7 @@ static int trimpot_write_insn(struct comedi_device * dev, struct comedi_subdevic } static int trimpot_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int channel = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c index dd7a35cf7d5d..40d97134e384 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/drivers/staging/comedi/drivers/cb_pcidas64.c @@ -1135,13 +1135,13 @@ static struct comedi_driver driver_cb_pcidas = { }; static int ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ai_config_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ao_readback_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); static int ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, struct comedi_cmd * cmd); @@ -1156,25 +1156,25 @@ static int ao_cancel(struct comedi_device * dev, struct comedi_subdevice * s); static int dio_callback(int dir, int port, int data, unsigned long arg); static int dio_callback_4020(int dir, int port, int data, unsigned long arg); static int di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dio_60xx_config_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dio_60xx_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int calib_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int calib_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ad8402_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static void ad8402_write(struct comedi_device * dev, unsigned int channel, unsigned int value); static int ad8402_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static void check_adc_timing(struct comedi_device * dev, struct comedi_cmd * cmd); static unsigned int get_divisor(unsigned int ns, unsigned int flags); static void i2c_write(struct comedi_device * dev, unsigned int address, @@ -1882,7 +1882,7 @@ static int detach(struct comedi_device * dev) } static int ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int bits = 0, n, i; unsigned int channel, range, aref; @@ -2107,7 +2107,7 @@ static int ai_config_master_clock(struct comedi_device * dev, unsigned int * dat } static int ai_config_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int id = data[0]; @@ -3195,7 +3195,7 @@ static int ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) } static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); int range = CR_RANGE(insn->chanspec); @@ -3225,7 +3225,7 @@ static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, } static int ao_readback_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = priv(dev)->ao_value[CR_CHAN(insn->chanspec)]; @@ -3606,7 +3606,7 @@ static int dio_callback_4020(int dir, int port, int data, unsigned long iobase) } static int di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int bits; @@ -3619,7 +3619,7 @@ static int di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, } static int do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] &= 0xf; // zero bits we are going to change @@ -3635,7 +3635,7 @@ static int do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, } static int dio_60xx_config_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int mask; @@ -3662,7 +3662,7 @@ static int dio_60xx_config_insn(struct comedi_device * dev, struct comedi_subdev } static int dio_60xx_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (data[0]) { s->state &= ~data[0]; @@ -3695,7 +3695,7 @@ static void caldac_write(struct comedi_device * dev, unsigned int channel, } static int calib_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int channel = CR_CHAN(insn->chanspec); @@ -3710,7 +3710,7 @@ static int calib_write_insn(struct comedi_device * dev, struct comedi_subdevice } static int calib_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int channel = CR_CHAN(insn->chanspec); @@ -3751,7 +3751,7 @@ static void ad8402_write(struct comedi_device * dev, unsigned int channel, /* for pci-das6402/16, channel 0 is analog input gain and channel 1 is offset */ static int ad8402_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int channel = CR_CHAN(insn->chanspec); @@ -3768,7 +3768,7 @@ static int ad8402_write_insn(struct comedi_device * dev, struct comedi_subdevice } static int ad8402_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int channel = CR_CHAN(insn->chanspec); @@ -3840,7 +3840,7 @@ static uint16_t read_eeprom(struct comedi_device * dev, uint8_t address) } static int eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = read_eeprom(dev, CR_CHAN(insn->chanspec)); diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c index 794e5de21837..ade2ef1cbbd8 100644 --- a/drivers/staging/comedi/drivers/cb_pcidda.c +++ b/drivers/staging/comedi/drivers/cb_pcidda.c @@ -234,9 +234,9 @@ typedef struct { static int cb_pcidda_attach(struct comedi_device * dev, comedi_devconfig * it); static int cb_pcidda_detach(struct comedi_device * dev); -//static int cb_pcidda_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data); +//static int cb_pcidda_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data); static int cb_pcidda_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); //static int cb_pcidda_ai_cmd(struct comedi_device *dev,struct comedi_subdevice *s); //static int cb_pcidda_ai_cmdtest(struct comedi_device *dev,struct comedi_subdevice *s, struct comedi_cmd *cmd); //static int cb_pcidda_ns_to_timer(unsigned int *ns,int round); @@ -599,7 +599,7 @@ static int cb_pcidda_ns_to_timer(unsigned int *ns, int round) #endif static int cb_pcidda_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int command; unsigned int channel, range; diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c index ac983b17f594..ab588d15f576 100644 --- a/drivers/staging/comedi/drivers/cb_pcimdas.c +++ b/drivers/staging/comedi/drivers/cb_pcimdas.c @@ -185,11 +185,11 @@ static struct comedi_driver driver_cb_pcimdas = { }; static int cb_pcimdas_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int cb_pcimdas_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int cb_pcimdas_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); /* * Attach is called by the Comedi core to configure the driver @@ -373,7 +373,7 @@ static int cb_pcimdas_detach(struct comedi_device * dev) * mode. */ static int cb_pcimdas_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, i; unsigned int d; @@ -438,7 +438,7 @@ static int cb_pcimdas_ai_rinsn(struct comedi_device * dev, struct comedi_subdevi } static int cb_pcimdas_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -466,7 +466,7 @@ static int cb_pcimdas_ao_winsn(struct comedi_device * dev, struct comedi_subdevi /* AO subdevices should have a read insn as well as a write insn. * Usually this means copying a value stored in devpriv. */ static int cb_pcimdas_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c index 976b789c27e0..dfbdcfaa49af 100644 --- a/drivers/staging/comedi/drivers/cb_pcimdda.c +++ b/drivers/staging/comedi/drivers/cb_pcimdda.c @@ -198,9 +198,9 @@ MODULE_LICENSE("GPL"); COMEDI_PCI_INITCLEANUP_NOMODULE(cb_pcimdda_driver, pci_table); static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); /*--------------------------------------------------------------------------- HELPER FUNCTION DECLARATIONS @@ -353,7 +353,7 @@ static int detach(struct comedi_device * dev) } static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -392,7 +392,7 @@ static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, applications, I would imagine. */ static int ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c index deba16fb2fa8..be46f17560db 100644 --- a/drivers/staging/comedi/drivers/comedi_bond.c +++ b/drivers/staging/comedi/drivers/comedi_bond.c @@ -214,9 +214,9 @@ static struct comedi_driver driver_bonding = { }; static int bonding_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int bonding_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); /* * Attach is called by the Comedi core to configure the driver @@ -294,7 +294,7 @@ static int bonding_detach(struct comedi_device *dev) * This allows packed reading/writing of the DIO channels. The * comedi core can convert between insn_bits and insn_read/write */ static int bonding_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { #define LSAMPL_BITS (sizeof(unsigned int)*8) unsigned nchans = LSAMPL_BITS, num_done = 0, i; @@ -341,7 +341,7 @@ static int bonding_dio_insn_bits(struct comedi_device *dev, struct comedi_subdev } static int bonding_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int chan = CR_CHAN(insn->chanspec), ret, io_bits = s->io_bits; unsigned int io; diff --git a/drivers/staging/comedi/drivers/comedi_parport.c b/drivers/staging/comedi/drivers/comedi_parport.c index 3adb1240e4c9..d58ceff063d4 100644 --- a/drivers/staging/comedi/drivers/comedi_parport.c +++ b/drivers/staging/comedi/drivers/comedi_parport.c @@ -109,7 +109,7 @@ struct parport_private { #define devpriv ((struct parport_private *)(dev->private)) static int parport_insn_a(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { if (data[0]) { devpriv->a_data &= ~data[0]; @@ -124,7 +124,7 @@ static int parport_insn_a(struct comedi_device *dev, struct comedi_subdevice *s, } static int parport_insn_config_a(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { if (data[0]) { s->io_bits = 0xff; @@ -139,7 +139,7 @@ static int parport_insn_config_a(struct comedi_device *dev, struct comedi_subdev } static int parport_insn_b(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { if (data[0]) { /* should writes be ignored? */ @@ -152,7 +152,7 @@ static int parport_insn_b(struct comedi_device *dev, struct comedi_subdevice *s, } static int parport_insn_c(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { data[0] &= 0x0f; if (data[0]) { @@ -168,7 +168,7 @@ static int parport_insn_c(struct comedi_device *dev, struct comedi_subdevice *s, } static int parport_intr_insn(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { if (insn->n < 1) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/comedi_rt_timer.c b/drivers/staging/comedi/drivers/comedi_rt_timer.c index f57a6467ae4f..91a865d7ed9a 100644 --- a/drivers/staging/comedi/drivers/comedi_rt_timer.c +++ b/drivers/staging/comedi/drivers/comedi_rt_timer.c @@ -397,9 +397,9 @@ static void timer_task_func(comedi_rt_task_context_t d) } static int timer_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { - comedi_insn xinsn = *insn; + struct comedi_insn xinsn = *insn; xinsn.data = data; xinsn.subdev = devpriv->subd; diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c index 8fcec97a84dc..09df3d33d22a 100644 --- a/drivers/staging/comedi/drivers/comedi_test.c +++ b/drivers/staging/comedi/drivers/comedi_test.c @@ -112,9 +112,9 @@ static int waveform_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevic static int waveform_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s); static int waveform_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s); static int waveform_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int waveform_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static short fake_sawtooth(struct comedi_device *dev, unsigned int range, unsigned long current_time); static short fake_squarewave(struct comedi_device *dev, unsigned int range, @@ -505,7 +505,7 @@ static short fake_waveform(struct comedi_device *dev, unsigned int channel, } static int waveform_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int i, chan = CR_CHAN(insn->chanspec); @@ -516,7 +516,7 @@ static int waveform_ai_insn_read(struct comedi_device *dev, struct comedi_subdev } static int waveform_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int i, chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c index bbe58550083c..0e0c790ac740 100644 --- a/drivers/staging/comedi/drivers/contec_pci_dio.c +++ b/drivers/staging/comedi/drivers/contec_pci_dio.c @@ -86,9 +86,9 @@ static struct comedi_driver driver_contec = { /* Classic digital IO */ static int contec_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int contec_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); #if 0 static int contec_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, @@ -193,7 +193,7 @@ static int contec_ns_to_timer(unsigned int *ns, int round) #endif static int contec_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { printk("contec_do_insn_bits called\n"); @@ -213,7 +213,7 @@ static int contec_do_insn_bits(struct comedi_device * dev, struct comedi_subdevi } static int contec_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { rt_printk("contec_di_insn_bits called\n"); diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c index 05058bf8d5e9..adda2c4eef12 100644 --- a/drivers/staging/comedi/drivers/daqboard2000.c +++ b/drivers/staging/comedi/drivers/daqboard2000.c @@ -394,7 +394,7 @@ static void setup_sampling(struct comedi_device * dev, int chan, int gain) } static int daqboard2000_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; daqboard2000_hw *fpga = devpriv->daq; @@ -451,7 +451,7 @@ static int daqboard2000_ai_insn_read(struct comedi_device * dev, struct comedi_s } static int daqboard2000_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -464,7 +464,7 @@ static int daqboard2000_ao_insn_read(struct comedi_device * dev, struct comedi_s } static int daqboard2000_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c index 3cd44cc2fc67..8943a42badd6 100644 --- a/drivers/staging/comedi/drivers/das08.c +++ b/drivers/staging/comedi/drivers/das08.c @@ -155,19 +155,19 @@ driver. /* gainlist same as _pgx_ below */ static int das08_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das08_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das08_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das08jr_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das08jr_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das08jr_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das08ao_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static void i8254_set_mode_low(unsigned int base, int channel, unsigned int mode); @@ -513,7 +513,7 @@ MODULE_DEVICE_TABLE(pci, das08_pci_table); #define TIMEOUT 100000 static int das08_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i, n; int chan; @@ -580,7 +580,7 @@ static int das08_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * } static int das08_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = 0; data[1] = DAS08_IP(inb(dev->iobase + DAS08_STATUS)); @@ -589,7 +589,7 @@ static int das08_di_rbits(struct comedi_device * dev, struct comedi_subdevice * } static int das08_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int wbits; @@ -612,7 +612,7 @@ static int das08_do_wbits(struct comedi_device * dev, struct comedi_subdevice * } static int das08jr_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = 0; data[1] = inb(dev->iobase + DAS08JR_DIO); @@ -621,7 +621,7 @@ static int das08jr_di_rbits(struct comedi_device * dev, struct comedi_subdevice } static int das08jr_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { // null bits we are going to set devpriv->do_bits &= ~data[0]; @@ -635,7 +635,7 @@ static int das08jr_do_wbits(struct comedi_device * dev, struct comedi_subdevice } static int das08jr_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int lsb, msb; @@ -669,7 +669,7 @@ static int das08jr_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * */ static int das08ao_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int lsb, msb; @@ -783,7 +783,7 @@ static unsigned int i8254_read_status(struct i8254_struct *st, int channel) } static int das08_counter_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = insn->chanspec; @@ -795,7 +795,7 @@ static int das08_counter_read(struct comedi_device * dev, struct comedi_subdevic } static int das08_counter_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = insn->chanspec; @@ -806,7 +806,7 @@ static int das08_counter_write(struct comedi_device * dev, struct comedi_subdevi } static int das08_counter_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = insn->chanspec; diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c index 1ca8f2eb48ab..c4c12e6b1a71 100644 --- a/drivers/staging/comedi/drivers/das16.c +++ b/drivers/staging/comedi/drivers/das16.c @@ -327,13 +327,13 @@ struct munge_info { }; static int das16_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das16_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das16_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das16_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das16_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s, struct comedi_cmd * cmd); @@ -1032,7 +1032,7 @@ static void das16_reset(struct comedi_device * dev) } static int das16_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i, n; int range; @@ -1080,7 +1080,7 @@ static int das16_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * } static int das16_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int bits; @@ -1092,7 +1092,7 @@ static int das16_di_rbits(struct comedi_device * dev, struct comedi_subdevice * } static int das16_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int wbits; @@ -1112,7 +1112,7 @@ static int das16_do_wbits(struct comedi_device * dev, struct comedi_subdevice * } static int das16_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int lsb, msb; diff --git a/drivers/staging/comedi/drivers/das16m1.c b/drivers/staging/comedi/drivers/das16m1.c index 0de3afcc0ece..ea1fd6ec699d 100644 --- a/drivers/staging/comedi/drivers/das16m1.c +++ b/drivers/staging/comedi/drivers/das16m1.c @@ -132,11 +132,11 @@ static const struct comedi_lrange range_das16m1 = { 9, }; static int das16m1_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das16m1_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das16m1_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das16m1_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s, struct comedi_cmd * cmd); @@ -394,7 +394,7 @@ static int das16m1_cancel(struct comedi_device * dev, struct comedi_subdevice * } static int das16m1_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i, n; int byte; @@ -431,7 +431,7 @@ static int das16m1_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice } static int das16m1_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int bits; @@ -443,7 +443,7 @@ static int das16m1_di_rbits(struct comedi_device * dev, struct comedi_subdevice } static int das16m1_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int wbits; diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c index 8d8ecac73a08..cb53e8fe2403 100644 --- a/drivers/staging/comedi/drivers/das1800.c +++ b/drivers/staging/comedi/drivers/das1800.c @@ -200,13 +200,13 @@ static int das1800_ai_do_cmdtest(struct comedi_device * dev, struct comedi_subde struct comedi_cmd * cmd); static int das1800_ai_do_cmd(struct comedi_device * dev, struct comedi_subdevice * s); static int das1800_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das1800_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das1800_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das1800_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das1800_set_frequency(struct comedi_device * dev); static unsigned int burst_convert_arg(unsigned int convert_arg, int round_mode); @@ -1553,7 +1553,7 @@ static int das1800_ai_do_cmd(struct comedi_device * dev, struct comedi_subdevice /* read analog input */ static int das1800_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i, n; int chan, range, aref, chan_range; @@ -1613,7 +1613,7 @@ static int das1800_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice /* writes to an analog output channel */ static int das1800_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); // int range = CR_RANGE(insn->chanspec); @@ -1642,7 +1642,7 @@ static int das1800_ao_winsn(struct comedi_device * dev, struct comedi_subdevice /* reads from digital input channels */ static int das1800_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[1] = inb(dev->iobase + DAS1800_DIGITAL) & 0xf; @@ -1653,7 +1653,7 @@ static int das1800_di_rbits(struct comedi_device * dev, struct comedi_subdevice /* writes to digital output channels */ static int das1800_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int wbits; diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c index 6f94a6663eca..179a694b0745 100644 --- a/drivers/staging/comedi/drivers/das800.c +++ b/drivers/staging/comedi/drivers/das800.c @@ -263,11 +263,11 @@ static int das800_ai_do_cmdtest(struct comedi_device * dev, struct comedi_subdev struct comedi_cmd * cmd); static int das800_ai_do_cmd(struct comedi_device * dev, struct comedi_subdevice * s); static int das800_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das800_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das800_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int das800_probe(struct comedi_device * dev); static int das800_set_frequency(struct comedi_device * dev); @@ -789,7 +789,7 @@ static int das800_ai_do_cmd(struct comedi_device * dev, struct comedi_subdevice } static int das800_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i, n; int chan; @@ -843,7 +843,7 @@ static int das800_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * } static int das800_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int bits; @@ -856,7 +856,7 @@ static int das800_di_rbits(struct comedi_device * dev, struct comedi_subdevice * } static int das800_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int wbits; unsigned long irq_flags; diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c index 42c6c0e9a857..36e283ba753d 100644 --- a/drivers/staging/comedi/drivers/dmm32at.c +++ b/drivers/staging/comedi/drivers/dmm32at.c @@ -290,15 +290,15 @@ static struct comedi_driver driver_dmm32at = { /* prototypes for driver functions below */ static int dmm32at_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dmm32at_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dmm32at_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dmm32at_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dmm32at_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dmm32at_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, struct comedi_cmd * cmd); static int dmm32at_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); @@ -498,7 +498,7 @@ static int dmm32at_detach(struct comedi_device * dev) */ static int dmm32at_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, i; unsigned int d; @@ -894,7 +894,7 @@ static int dmm32at_ns_to_timer(unsigned int *ns, int round) } static int dmm32at_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -937,7 +937,7 @@ static int dmm32at_ao_winsn(struct comedi_device * dev, struct comedi_subdevice /* AO subdevices should have a read insn as well as a write insn. * Usually this means copying a value stored in devpriv. */ static int dmm32at_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -954,7 +954,7 @@ static int dmm32at_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * This allows packed reading/writing of the DIO channels. The * comedi core can convert between insn_bits and insn_read/write */ static int dmm32at_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned char diobits; @@ -1007,7 +1007,7 @@ static int dmm32at_dio_insn_bits(struct comedi_device * dev, struct comedi_subde } static int dmm32at_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned char chanbit; int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/dt2801.c b/drivers/staging/comedi/drivers/dt2801.c index dc815c130be0..847aa951d9c1 100644 --- a/drivers/staging/comedi/drivers/dt2801.c +++ b/drivers/staging/comedi/drivers/dt2801.c @@ -225,15 +225,15 @@ typedef struct { #define devpriv ((dt2801_private *)dev->private) static int dt2801_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dt2801_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dt2801_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dt2801_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dt2801_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); /* These are the low-level routines: writecommand: write a command to the board @@ -606,7 +606,7 @@ static int dt2801_error(struct comedi_device * dev, int stat) } static int dt2801_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int d; int stat; @@ -628,7 +628,7 @@ static int dt2801_ai_insn_read(struct comedi_device * dev, struct comedi_subdevi } static int dt2801_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = devpriv->ao_readback[CR_CHAN(insn->chanspec)]; @@ -636,7 +636,7 @@ static int dt2801_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi } static int dt2801_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { dt2801_writecmd(dev, DT_C_WRITE_DAIM); dt2801_writedata(dev, CR_CHAN(insn->chanspec)); @@ -648,7 +648,7 @@ static int dt2801_ao_insn_write(struct comedi_device * dev, struct comedi_subdev } static int dt2801_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int which = 0; @@ -672,7 +672,7 @@ static int dt2801_dio_insn_bits(struct comedi_device * dev, struct comedi_subdev } static int dt2801_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int which = 0; diff --git a/drivers/staging/comedi/drivers/dt2811.c b/drivers/staging/comedi/drivers/dt2811.c index 70d7bcf36820..165ea6f22ba4 100644 --- a/drivers/staging/comedi/drivers/dt2811.c +++ b/drivers/staging/comedi/drivers/dt2811.c @@ -227,15 +227,15 @@ static struct comedi_driver driver_dt2811 = { COMEDI_INITCLEANUP(driver_dt2811); static int dt2811_ai_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dt2811_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dt2811_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dt2811_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dt2811_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); enum { card_2811_pgh, card_2811_pgl }; typedef struct { @@ -491,7 +491,7 @@ static int dt2811_detach(struct comedi_device * dev) } static int dt2811_ai_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); int timeout = DT2811_TIMEOUT; @@ -542,7 +542,7 @@ int dt2811_adtrig(kdev_t minor, comedi_adtrig * adtrig) #endif static int dt2811_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan; @@ -560,7 +560,7 @@ static int dt2811_ao_insn(struct comedi_device * dev, struct comedi_subdevice * } static int dt2811_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan; @@ -575,7 +575,7 @@ static int dt2811_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi } static int dt2811_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -586,7 +586,7 @@ static int dt2811_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi } static int dt2811_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/dt2814.c b/drivers/staging/comedi/drivers/dt2814.c index 2ee2fa307b10..f97fed0552a2 100644 --- a/drivers/staging/comedi/drivers/dt2814.c +++ b/drivers/staging/comedi/drivers/dt2814.c @@ -82,7 +82,7 @@ typedef struct { #define DT2814_MAX_SPEED 100000 /* Arbitrary 10 khz limit */ static int dt2814_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, i, hi, lo; int chan; diff --git a/drivers/staging/comedi/drivers/dt2815.c b/drivers/staging/comedi/drivers/dt2815.c index ffd75c7b9263..f9b79d2867eb 100644 --- a/drivers/staging/comedi/drivers/dt2815.c +++ b/drivers/staging/comedi/drivers/dt2815.c @@ -107,7 +107,7 @@ static int dt2815_wait_for_status(struct comedi_device * dev, int status) } static int dt2815_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -120,7 +120,7 @@ static int dt2815_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi } static int dt2815_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/dt2817.c b/drivers/staging/comedi/drivers/dt2817.c index 203c6b3e8cbf..59376ac6c254 100644 --- a/drivers/staging/comedi/drivers/dt2817.c +++ b/drivers/staging/comedi/drivers/dt2817.c @@ -59,7 +59,7 @@ static struct comedi_driver driver_dt2817 = { COMEDI_INITCLEANUP(driver_dt2817); static int dt2817_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int mask; int chan; @@ -97,7 +97,7 @@ static int dt2817_dio_insn_config(struct comedi_device * dev, struct comedi_subd } static int dt2817_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int changed; diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c index 79308492bcb0..1a74f31ad3ff 100644 --- a/drivers/staging/comedi/drivers/dt282x.c +++ b/drivers/staging/comedi/drivers/dt282x.c @@ -675,7 +675,7 @@ static void dt282x_load_changain(struct comedi_device * dev, int n, * - trigger conversion and wait for it to finish */ static int dt282x_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; @@ -938,7 +938,7 @@ static int dt282x_ns_to_timer(int *nanosec, int round_mode) * data register, and performs the conversion. */ static int dt282x_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = devpriv->ao[CR_CHAN(insn->chanspec)]; @@ -946,7 +946,7 @@ static int dt282x_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi } static int dt282x_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { short d; unsigned int chan; @@ -1146,7 +1146,7 @@ static int dt282x_ao_cancel(struct comedi_device * dev, struct comedi_subdevice } static int dt282x_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (data[0]) { s->state &= ~data[0]; @@ -1160,7 +1160,7 @@ static int dt282x_dio_insn_bits(struct comedi_device * dev, struct comedi_subdev } static int dt282x_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int mask; diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c index 10875cfaa71c..4b140f21cbdf 100644 --- a/drivers/staging/comedi/drivers/dt3000.c +++ b/drivers/staging/comedi/drivers/dt3000.c @@ -668,7 +668,7 @@ static int dt3k_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * } static int dt3k_ai_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; unsigned int chan, gain, aref; @@ -686,7 +686,7 @@ static int dt3k_ai_insn(struct comedi_device * dev, struct comedi_subdevice * s, } static int dt3k_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; unsigned int chan; @@ -701,7 +701,7 @@ static int dt3k_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s, } static int dt3k_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; unsigned int chan; @@ -730,7 +730,7 @@ static void dt3k_dio_config(struct comedi_device * dev, int bits) } static int dt3k_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int mask; @@ -761,7 +761,7 @@ static int dt3k_dio_insn_config(struct comedi_device * dev, struct comedi_subdev } static int dt3k_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -777,7 +777,7 @@ static int dt3k_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevic } static int dt3k_mem_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int addr = CR_CHAN(insn->chanspec); int i; diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c index a3d4afc60421..e2131fd4f45f 100644 --- a/drivers/staging/comedi/drivers/dt9812.c +++ b/drivers/staging/comedi/drivers/dt9812.c @@ -941,7 +941,7 @@ static void dt9812_comedi_open(struct comedi_device *dev) } static int dt9812_di_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int n; u8 bits = 0; @@ -953,7 +953,7 @@ static int dt9812_di_rinsn(struct comedi_device *dev, struct comedi_subdevice *s } static int dt9812_do_winsn(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int n; u8 bits = 0; @@ -971,7 +971,7 @@ static int dt9812_do_winsn(struct comedi_device *dev, struct comedi_subdevice *s } static int dt9812_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int n; @@ -986,7 +986,7 @@ static int dt9812_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s } static int dt9812_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int n; u16 value; @@ -1000,7 +1000,7 @@ static int dt9812_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s } static int dt9812_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int n; diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c index 8b1e6c896517..cd6b3e037515 100644 --- a/drivers/staging/comedi/drivers/fl512.c +++ b/drivers/staging/comedi/drivers/fl512.c @@ -53,17 +53,17 @@ static struct comedi_driver driver_fl512 = { COMEDI_INITCLEANUP(driver_fl512); static int fl512_ai_insn(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); static int fl512_ao_insn(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); static int fl512_ao_insn_readback(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); /* * fl512_ai_insn : this is the analog input function */ static int fl512_ai_insn(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { int n; unsigned int lo_byte, hi_byte; @@ -88,7 +88,7 @@ static int fl512_ai_insn(struct comedi_device * dev, * fl512_ao_insn : used to write to a DA port n times */ static int fl512_ao_insn(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct 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(struct comedi_device * dev, * DA port */ static int fl512_ao_insn_readback(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { int n; int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c index 828fd315e644..5227e3ee273b 100644 --- a/drivers/staging/comedi/drivers/gsc_hpdi.c +++ b/drivers/staging/comedi/drivers/gsc_hpdi.c @@ -337,7 +337,7 @@ static struct comedi_driver driver_hpdi = { COMEDI_PCI_INITCLEANUP(driver_hpdi, hpdi_pci_table); static int dio_config_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { switch (data[0]) { case INSN_CONFIG_DIO_OUTPUT: diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c index 7b10bc48a5ec..5463718e5ff7 100644 --- a/drivers/staging/comedi/drivers/icp_multi.c +++ b/drivers/staging/comedi/drivers/icp_multi.c @@ -238,7 +238,7 @@ static int icp_multi_reset(struct comedi_device *dev); Parameters: struct comedi_device *dev Pointer to current device structure struct comedi_subdevice *s Pointer to current subdevice structure - comedi_insn *insn Pointer to current comedi instruction + struct comedi_insn *insn Pointer to current comedi instruction unsigned int *data Pointer to analogue input data Returns:int Nmuber of instructions executed @@ -246,7 +246,7 @@ static int icp_multi_reset(struct comedi_device *dev); ============================================================================== */ static int icp_multi_insn_read_ai(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int n, timeout; @@ -357,7 +357,7 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev, struct comedi_subde Parameters: struct comedi_device *dev Pointer to current device structure struct comedi_subdevice *s Pointer to current subdevice structure - comedi_insn *insn Pointer to current comedi instruction + struct comedi_insn *insn Pointer to current comedi instruction unsigned int *data Pointer to analogue output data Returns:int Nmuber of instructions executed @@ -365,7 +365,7 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev, struct comedi_subde ============================================================================== */ static int icp_multi_insn_write_ao(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int n, chan, range, timeout; @@ -465,7 +465,7 @@ static int icp_multi_insn_write_ao(struct comedi_device *dev, struct comedi_subd Parameters: struct comedi_device *dev Pointer to current device structure struct comedi_subdevice *s Pointer to current subdevice structure - comedi_insn *insn Pointer to current comedi instruction + struct comedi_insn *insn Pointer to current comedi instruction unsigned int *data Pointer to analogue output data Returns:int Nmuber of instructions executed @@ -473,7 +473,7 @@ static int icp_multi_insn_write_ao(struct comedi_device *dev, struct comedi_subd ============================================================================== */ static int icp_multi_insn_read_ao(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int n, chan; @@ -498,7 +498,7 @@ static int icp_multi_insn_read_ao(struct comedi_device *dev, struct comedi_subde Parameters: struct comedi_device *dev Pointer to current device structure struct comedi_subdevice *s Pointer to current subdevice structure - comedi_insn *insn Pointer to current comedi instruction + struct comedi_insn *insn Pointer to current comedi instruction unsigned int *data Pointer to analogue output data Returns:int Nmuber of instructions executed @@ -506,7 +506,7 @@ static int icp_multi_insn_read_ao(struct comedi_device *dev, struct comedi_subde ============================================================================== */ static int icp_multi_insn_bits_di(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { data[1] = readw(devpriv->io_addr + ICP_MULTI_DI); @@ -524,7 +524,7 @@ static int icp_multi_insn_bits_di(struct comedi_device *dev, struct comedi_subde Parameters: struct comedi_device *dev Pointer to current device structure struct comedi_subdevice *s Pointer to current subdevice structure - comedi_insn *insn Pointer to current comedi instruction + struct comedi_insn *insn Pointer to current comedi instruction unsigned int *data Pointer to analogue output data Returns:int Nmuber of instructions executed @@ -532,7 +532,7 @@ static int icp_multi_insn_bits_di(struct comedi_device *dev, struct comedi_subde ============================================================================== */ static int icp_multi_insn_bits_do(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { #ifdef ICP_MULTI_EXTDEBUG printk("icp multi EDBG: BGN: icp_multi_insn_bits_do(...)\n"); @@ -566,7 +566,7 @@ static int icp_multi_insn_bits_do(struct comedi_device *dev, struct comedi_subde Parameters: struct comedi_device *dev Pointer to current device structure struct comedi_subdevice *s Pointer to current subdevice structure - comedi_insn *insn Pointer to current comedi instruction + struct comedi_insn *insn Pointer to current comedi instruction unsigned int *data Pointer to counter data Returns:int Nmuber of instructions executed @@ -574,7 +574,7 @@ static int icp_multi_insn_bits_do(struct comedi_device *dev, struct comedi_subde ============================================================================== */ static int icp_multi_insn_read_ctr(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { return 0; } @@ -590,7 +590,7 @@ static int icp_multi_insn_read_ctr(struct comedi_device *dev, struct comedi_subd Parameters: struct comedi_device *dev Pointer to current device structure struct comedi_subdevice *s Pointer to current subdevice structure - comedi_insn *insn Pointer to current comedi instruction + struct comedi_insn *insn Pointer to current comedi instruction unsigned int *data Pointer to counter data Returns:int Nmuber of instructions executed @@ -598,7 +598,7 @@ static int icp_multi_insn_read_ctr(struct comedi_device *dev, struct comedi_subd ============================================================================== */ static int icp_multi_insn_write_ctr(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { return 0; } diff --git a/drivers/staging/comedi/drivers/ii_pci20kc.c b/drivers/staging/comedi/drivers/ii_pci20kc.c index ab62af50993b..5f513bac8e47 100644 --- a/drivers/staging/comedi/drivers/ii_pci20kc.c +++ b/drivers/staging/comedi/drivers/ii_pci20kc.c @@ -271,9 +271,9 @@ static int pci20xxx_detach(struct comedi_device * dev) /* pci20006m */ static int pci20006_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int pci20006_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static const struct comedi_lrange *pci20006_range_list[] = { &range_bipolar10, @@ -307,7 +307,7 @@ static int pci20006_init(struct comedi_device * dev, struct comedi_subdevice * s } static int pci20006_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { pci20xxx_subdev_private *sdp = s->private; @@ -317,7 +317,7 @@ static int pci20006_insn_read(struct comedi_device * dev, struct comedi_subdevic } static int pci20006_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { pci20xxx_subdev_private *sdp = s->private; int hi, lo; @@ -350,7 +350,7 @@ static int pci20006_insn_write(struct comedi_device * dev, struct comedi_subdevi /* PCI20341M */ static int pci20341_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static const int pci20341_timebase[] = { 0x00, 0x00, 0x00, 0x04 }; static const int pci20341_settling_time[] = { 0x58, 0x58, 0x93, 0x99 }; @@ -398,7 +398,7 @@ static int pci20341_init(struct comedi_device * dev, struct comedi_subdevice * s } static int pci20341_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { pci20xxx_subdev_private *sdp = s->private; unsigned int i = 0, j = 0; @@ -445,9 +445,9 @@ static int pci20341_insn_read(struct comedi_device * dev, struct comedi_subdevic static void pci20xxx_dio_config(struct comedi_device * dev, struct comedi_subdevice * s); static int pci20xxx_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int pci20xxx_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); /* initialize pci20xxx_private */ static int pci20xxx_dio_init(struct comedi_device * dev, struct comedi_subdevice * s) @@ -470,7 +470,7 @@ static int pci20xxx_dio_init(struct comedi_device * dev, struct comedi_subdevice } static int pci20xxx_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int mask, bits; @@ -495,7 +495,7 @@ static int pci20xxx_dio_insn_config(struct comedi_device * dev, struct comedi_su } static int pci20xxx_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int mask = data[0]; diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c index 1f993147ad91..19371c6048d3 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.c +++ b/drivers/staging/comedi/drivers/jr3_pci.c @@ -270,7 +270,7 @@ static six_axis_t get_max_full_scales(volatile jr3_channel_t * channel) } static int jr3_pci_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int result; jr3_pci_subdev_private *p; diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c index 5ee1cf51aa13..f3b4f74e873d 100644 --- a/drivers/staging/comedi/drivers/ke_counter.c +++ b/drivers/staging/comedi/drivers/ke_counter.c @@ -100,7 +100,7 @@ COMEDI_PCI_INITCLEANUP(cnt_driver, cnt_pci_table); /* This should be used only for resetting the counters; maybe it is better to make a special command 'reset'. */ static int cnt_winsn(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); @@ -120,7 +120,7 @@ static int cnt_winsn(struct comedi_device * dev, /*-- counter read -----------------------------------------------------------*/ static int cnt_rinsn(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { unsigned char a0, a1, a2, a3, a4; int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index 48802836346f..70c3cc2c307d 100644 --- a/drivers/staging/comedi/drivers/me4000.c +++ b/drivers/staging/comedi/drivers/me4000.c @@ -141,10 +141,10 @@ static int xilinx_download(struct comedi_device *dev); static int reset_board(struct comedi_device *dev); static int me4000_dio_insn_bits(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data); + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); static int me4000_dio_insn_config(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data); + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); static int cnt_reset(struct comedi_device *dev, unsigned int channel); @@ -152,16 +152,16 @@ static int cnt_config(struct comedi_device *dev, unsigned int channel, unsigned int mode); static int me4000_cnt_insn_config(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data); + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); static int me4000_cnt_insn_write(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data); + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); static int me4000_cnt_insn_read(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data); + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); static int me4000_ai_insn_read(struct comedi_device *dev, - struct comedi_subdevice *subdevice, comedi_insn *insn, unsigned int *data); + struct comedi_subdevice *subdevice, struct comedi_insn *insn, unsigned int *data); static int me4000_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s); @@ -191,10 +191,10 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev, static int me4000_ai_do_cmd(struct comedi_device *dev, struct comedi_subdevice *s); static int me4000_ao_insn_write(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data); + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); static int me4000_ao_insn_read(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data); + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); /*----------------------------------------------------------------------------- Meilhaus inline functions @@ -914,7 +914,7 @@ static int me4000_detach(struct comedi_device *dev) ===========================================================================*/ static int me4000_ai_insn_read(struct comedi_device *dev, - struct comedi_subdevice *subdevice, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *subdevice, struct comedi_insn *insn, unsigned int *data) { int chan = CR_CHAN(insn->chanspec); @@ -1904,7 +1904,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id PT_REGS_ARG) ===========================================================================*/ static int me4000_ao_insn_write(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { int chan = CR_CHAN(insn->chanspec); @@ -1962,7 +1962,7 @@ static int me4000_ao_insn_write(struct comedi_device *dev, } static int me4000_ao_insn_read(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { int chan = CR_CHAN(insn->chanspec); @@ -1983,7 +1983,7 @@ static int me4000_ao_insn_read(struct comedi_device *dev, ===========================================================================*/ static int me4000_dio_insn_bits(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { CALL_PDEBUG("In me4000_dio_insn_bits()\n"); @@ -2034,7 +2034,7 @@ static int me4000_dio_insn_bits(struct comedi_device *dev, } static int me4000_dio_insn_config(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { unsigned long tmp; int chan = CR_CHAN(insn->chanspec); @@ -2216,7 +2216,7 @@ static int cnt_config(struct comedi_device *dev, unsigned int channel, } static int me4000_cnt_insn_config(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { int err; @@ -2259,7 +2259,7 @@ static int me4000_cnt_insn_config(struct comedi_device *dev, } static int me4000_cnt_insn_read(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { unsigned short tmp; @@ -2306,7 +2306,7 @@ static int me4000_cnt_insn_read(struct comedi_device *dev, } static int me4000_cnt_insn_write(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { unsigned short tmp; diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c index 1c19358a0ad4..901e1d13fcf2 100644 --- a/drivers/staging/comedi/drivers/me_daq.c +++ b/drivers/staging/comedi/drivers/me_daq.c @@ -292,7 +292,7 @@ static inline void sleep(unsigned sec) * ------------------------------------------------------------------ */ static int me_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int bits; int mask = 1 << CR_CHAN(insn->chanspec); @@ -328,7 +328,7 @@ static int me_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice /* Digital instant input/outputs */ static int me_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { unsigned int mask = data[0]; s->state &= ~mask; @@ -364,7 +364,7 @@ static int me_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice * /* Analog instant input */ static int me_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *subdevice, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { unsigned short value; int chan = CR_CHAN((&insn->chanspec)[0]); @@ -471,7 +471,7 @@ static int me_ai_do_cmd(struct comedi_device *dev, struct comedi_subdevice *subd /* Analog instant output */ static int me_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int chan; int rang; @@ -521,7 +521,7 @@ static int me_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice * /* Analog output readback */ static int me_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int i; diff --git a/drivers/staging/comedi/drivers/mpc624.c b/drivers/staging/comedi/drivers/mpc624.c index 59c3c17b616c..59e8ecd66088 100644 --- a/drivers/staging/comedi/drivers/mpc624.c +++ b/drivers/staging/comedi/drivers/mpc624.c @@ -156,7 +156,7 @@ static struct comedi_driver driver_mpc624 = { //---------------------------------------------------------------------------- static int mpc624_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); //---------------------------------------------------------------------------- static int mpc624_attach(struct comedi_device * dev, comedi_devconfig * it) { @@ -269,7 +269,7 @@ static int mpc624_detach(struct comedi_device * dev) #define TIMEOUT 200 static int mpc624_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, i; unsigned long int data_in, data_out; diff --git a/drivers/staging/comedi/drivers/mpc8260cpm.c b/drivers/staging/comedi/drivers/mpc8260cpm.c index 9588f2652d22..645c47053242 100644 --- a/drivers/staging/comedi/drivers/mpc8260cpm.c +++ b/drivers/staging/comedi/drivers/mpc8260cpm.c @@ -56,9 +56,9 @@ static struct comedi_driver driver_mpc8260cpm = { COMEDI_INITCLEANUP(driver_mpc8260cpm); static int mpc8260cpm_dio_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int mpc8260cpm_dio_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int mpc8260cpm_attach(struct comedi_device * dev, comedi_devconfig * it) { @@ -113,7 +113,7 @@ static unsigned long *cpm_pdat(int port) } static int mpc8260cpm_dio_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; unsigned int d; @@ -156,7 +156,7 @@ static int mpc8260cpm_dio_config(struct comedi_device * dev, struct comedi_subde } static int mpc8260cpm_dio_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int port; unsigned long *p; diff --git a/drivers/staging/comedi/drivers/multiq3.c b/drivers/staging/comedi/drivers/multiq3.c index 186676e5f86d..1ff60fa53842 100644 --- a/drivers/staging/comedi/drivers/multiq3.c +++ b/drivers/staging/comedi/drivers/multiq3.c @@ -99,7 +99,7 @@ struct multiq3_private { #define devpriv ((struct multiq3_private *)dev->private) static int multiq3_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i, n; int chan; @@ -135,7 +135,7 @@ static int multiq3_ai_insn_read(struct comedi_device * dev, struct comedi_subdev } static int multiq3_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -148,7 +148,7 @@ static int multiq3_ao_insn_read(struct comedi_device * dev, struct comedi_subdev } static int multiq3_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -166,7 +166,7 @@ static int multiq3_ao_insn_write(struct comedi_device * dev, struct comedi_subde } static int multiq3_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -177,7 +177,7 @@ static int multiq3_di_insn_bits(struct comedi_device * dev, struct comedi_subdev } static int multiq3_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -192,7 +192,7 @@ static int multiq3_do_insn_bits(struct comedi_device * dev, struct comedi_subdev } static int multiq3_encoder_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c index f2ab049ee78c..52c35c4f0c03 100644 --- a/drivers/staging/comedi/drivers/ni_6527.c +++ b/drivers/staging/comedi/drivers/ni_6527.c @@ -120,7 +120,7 @@ typedef struct { static int ni6527_find_device(struct comedi_device * dev, int bus, int slot); static int ni6527_di_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); unsigned int interval; @@ -168,7 +168,7 @@ static int ni6527_di_insn_config(struct comedi_device * dev, struct comedi_subde } static int ni6527_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -181,7 +181,7 @@ static int ni6527_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi } static int ni6527_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -327,7 +327,7 @@ static int ni6527_intr_cancel(struct comedi_device * dev, struct comedi_subdevic } static int ni6527_intr_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n < 1) return -EINVAL; @@ -337,7 +337,7 @@ static int ni6527_intr_insn_bits(struct comedi_device * dev, struct comedi_subde } static int ni6527_intr_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n < 1) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c index 95159e411d3e..7b439972290b 100644 --- a/drivers/staging/comedi/drivers/ni_65xx.c +++ b/drivers/staging/comedi/drivers/ni_65xx.c @@ -311,7 +311,7 @@ static ni_65xx_subdevice_private *ni_65xx_alloc_subdevice_private(void) static int ni_65xx_find_device(struct comedi_device * dev, int bus, int slot); static int ni_65xx_config_filter(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { const unsigned chan = CR_CHAN(insn->chanspec); const unsigned port = @@ -350,7 +350,7 @@ static int ni_65xx_config_filter(struct comedi_device * dev, struct comedi_subde } static int ni_65xx_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned port; @@ -389,7 +389,7 @@ static int ni_65xx_dio_insn_config(struct comedi_device * dev, struct comedi_sub } static int ni_65xx_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned base_bitfield_channel; const unsigned max_ports_per_bitfield = 5; @@ -569,7 +569,7 @@ static int ni_65xx_intr_cancel(struct comedi_device * dev, struct comedi_subdevi } static int ni_65xx_intr_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n < 1) return -EINVAL; @@ -579,7 +579,7 @@ static int ni_65xx_intr_insn_bits(struct comedi_device * dev, struct comedi_subd } static int ni_65xx_intr_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n < 1) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c index c347c9b3c2fa..7760df604359 100644 --- a/drivers/staging/comedi/drivers/ni_660x.c +++ b/drivers/staging/comedi/drivers/ni_660x.c @@ -465,17 +465,17 @@ static int ni_660x_set_pfi_routing(struct comedi_device * dev, unsigned chan, /* Possible instructions for a GPCT */ static int ni_660x_GPCT_rinsn(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); static int ni_660x_GPCT_insn_config(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); static int ni_660x_GPCT_winsn(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); /* Possible instructions for Digital IO */ static int ni_660x_dio_insn_config(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); static int ni_660x_dio_insn_bits(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); static inline unsigned ni_660x_num_counters(struct comedi_device * dev) { @@ -1121,7 +1121,7 @@ static int ni_660x_detach(struct comedi_device * dev) static int ni_660x_GPCT_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { return ni_tio_rinsn(subdev_to_counter(s), insn, data); } @@ -1148,13 +1148,13 @@ static void init_tio_chip(struct comedi_device * dev, int chipset) static int ni_660x_GPCT_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { return ni_tio_insn_config(subdev_to_counter(s), insn, data); } static int ni_660x_GPCT_winsn(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { return ni_tio_winsn(subdev_to_counter(s), insn, data); } @@ -1187,7 +1187,7 @@ static int ni_660x_find_device(struct comedi_device * dev, int bus, int slot) } static int ni_660x_dio_insn_bits(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { unsigned base_bitfield_channel = CR_CHAN(insn->chanspec); @@ -1280,7 +1280,7 @@ static void ni660x_config_filter(struct comedi_device * dev, unsigned pfi_channe } static int ni_660x_dio_insn_config(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c index e66bde6dbf21..7c07ebbd2f07 100644 --- a/drivers/staging/comedi/drivers/ni_670x.c +++ b/drivers/staging/comedi/drivers/ni_670x.c @@ -125,13 +125,13 @@ static struct comedi_lrange range_0_20mA = { 1, {RANGE_mA(0, 20)} }; static int ni_670x_find_device(struct comedi_device * dev, int bus, int slot); static int ni_670x_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_670x_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_670x_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_670x_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_670x_attach(struct comedi_device * dev, comedi_devconfig * it) { @@ -219,7 +219,7 @@ static int ni_670x_detach(struct comedi_device * dev) } static int ni_670x_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -245,7 +245,7 @@ static int ni_670x_ao_winsn(struct comedi_device * dev, struct comedi_subdevice } static int ni_670x_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -257,7 +257,7 @@ static int ni_670x_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice } static int ni_670x_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -279,7 +279,7 @@ static int ni_670x_dio_insn_bits(struct comedi_device * dev, struct comedi_subde } static int ni_670x_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c index 8a13e8624b04..6f2f8d35dc11 100644 --- a/drivers/staging/comedi/drivers/ni_at_a2150.c +++ b/drivers/staging/comedi/drivers/ni_at_a2150.c @@ -183,7 +183,7 @@ static int a2150_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice struct comedi_cmd * cmd); static int a2150_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); static int a2150_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int a2150_get_timing(struct comedi_device * dev, unsigned int *period, int flags); static int a2150_probe(struct comedi_device * dev); @@ -727,7 +727,7 @@ static int a2150_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) } static int a2150_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int i, n; static const int timeout = 100000; diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c index 2176bb2d743d..c42d89d41e7a 100644 --- a/drivers/staging/comedi/drivers/ni_at_ao.c +++ b/drivers/staging/comedi/drivers/ni_at_ao.c @@ -195,17 +195,17 @@ COMEDI_INITCLEANUP(driver_atao); static void atao_reset(struct comedi_device * dev); static int atao_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int atao_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int atao_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int atao_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int atao_calib_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int atao_calib_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int atao_attach(struct comedi_device * dev, comedi_devconfig * it) { @@ -321,7 +321,7 @@ static void atao_reset(struct comedi_device * dev) } static int atao_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -345,7 +345,7 @@ static int atao_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s } static int atao_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -357,7 +357,7 @@ static int atao_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s } static int atao_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -374,7 +374,7 @@ static int atao_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevic } static int atao_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); unsigned int mask, bit; @@ -419,7 +419,7 @@ static int atao_dio_insn_config(struct comedi_device * dev, struct comedi_subdev * the caldacs, but we can guess. */ static int atao_calib_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; for (i = 0; i < insn->n; i++) { @@ -429,7 +429,7 @@ static int atao_calib_insn_read(struct comedi_device * dev, struct comedi_subdev } static int atao_calib_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int bitstring, bit; unsigned int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/ni_atmio16d.c b/drivers/staging/comedi/drivers/ni_atmio16d.c index 09cafa966747..4d3cb5fa48b0 100644 --- a/drivers/staging/comedi/drivers/ni_atmio16d.c +++ b/drivers/staging/comedi/drivers/ni_atmio16d.c @@ -526,7 +526,7 @@ static int atmio16d_ai_cancel(struct comedi_device * dev, struct comedi_subdevic /* Mode 0 is used to get a single conversion on demand */ static int atmio16d_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i, t; int chan; @@ -585,7 +585,7 @@ static int atmio16d_ai_insn_read(struct comedi_device * dev, struct comedi_subde } static int atmio16d_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; #ifdef DEBUG1 @@ -600,7 +600,7 @@ static int atmio16d_ao_insn_read(struct comedi_device * dev, struct comedi_subde } static int atmio16d_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan; @@ -635,7 +635,7 @@ static int atmio16d_ao_insn_write(struct comedi_device * dev, struct comedi_subd } static int atmio16d_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -651,7 +651,7 @@ static int atmio16d_dio_insn_bits(struct comedi_device * dev, struct comedi_subd } static int atmio16d_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int mask; diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index d592ab368ff5..a1a0663b82b3 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c @@ -154,7 +154,7 @@ static int subdev_700_cb(int dir, int port, int data, unsigned long arg) } static int subdev_700_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (data[0]) { s->state &= ~data[0]; @@ -172,7 +172,7 @@ static int subdev_700_insn(struct comedi_device * dev, struct comedi_subdevice * } static int subdev_700_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { switch (data[0]) { diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 2b3b4664bead..f6ab0fde2c11 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c @@ -174,19 +174,19 @@ static int labpc_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice struct comedi_cmd * cmd); static int labpc_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); static int labpc_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int labpc_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int labpc_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int labpc_calib_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int labpc_calib_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int labpc_eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int labpc_eeprom_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd); static void labpc_adc_timing(struct comedi_device * dev, struct comedi_cmd * cmd); #ifdef CONFIG_COMEDI_PCI @@ -1501,7 +1501,7 @@ static void labpc_drain_dregs(struct comedi_device * dev) } static int labpc_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i, n; int chan, range; @@ -1587,7 +1587,7 @@ static int labpc_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * // analog output insn static int labpc_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int channel, range; unsigned long flags; @@ -1628,7 +1628,7 @@ static int labpc_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * // analog output readback insn static int labpc_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = devpriv->ao_value[CR_CHAN(insn->chanspec)]; @@ -1636,7 +1636,7 @@ static int labpc_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * } static int labpc_calib_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = devpriv->caldac[CR_CHAN(insn->chanspec)]; @@ -1644,7 +1644,7 @@ static int labpc_calib_read_insn(struct comedi_device * dev, struct comedi_subde } static int labpc_calib_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int channel = CR_CHAN(insn->chanspec); @@ -1653,7 +1653,7 @@ static int labpc_calib_write_insn(struct comedi_device * dev, struct comedi_subd } static int labpc_eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = devpriv->eeprom_data[CR_CHAN(insn->chanspec)]; @@ -1661,7 +1661,7 @@ static int labpc_eeprom_read_insn(struct comedi_device * dev, struct comedi_subd } static int labpc_eeprom_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int channel = CR_CHAN(insn->chanspec); int ret; diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index a2988bdb2652..52984b0a1b7b 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -194,9 +194,9 @@ static const struct comedi_lrange *const ni_range_lkup[] = { }; static int ni_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_cdio_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, struct comedi_cmd * cmd); static int ni_cdio_cmd(struct comedi_device * dev, struct comedi_subdevice * s); @@ -206,33 +206,33 @@ static int ni_cdo_inttrig(struct comedi_device * dev, struct comedi_subdevice * unsigned int trignum); static int ni_serial_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_serial_hw_readwrite8(struct comedi_device * dev, struct comedi_subdevice * s, unsigned char data_out, unsigned char *data_in); static int ni_serial_sw_readwrite8(struct comedi_device * dev, struct comedi_subdevice * s, unsigned char data_out, unsigned char *data_in); static int ni_calib_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_calib_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_eeprom_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_m_series_eeprom_insn_read(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); static int ni_pfi_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_pfi_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static unsigned ni_old_get_pfi_routing(struct comedi_device * dev, unsigned chan); static void ni_rtsi_init(struct comedi_device * dev); static int ni_rtsi_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_rtsi_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static void caldac_setup(struct comedi_device * dev, struct comedi_subdevice * s); static int ni_read_eeprom(struct comedi_device * dev, int addr); @@ -268,11 +268,11 @@ static int ni_ao_reset(struct comedi_device * dev, struct comedi_subdevice * s); static int ni_8255_callback(int dir, int port, int data, unsigned long arg); static int ni_gpct_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_gpct_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_gpct_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_gpct_cmd(struct comedi_device * dev, struct comedi_subdevice * s); static int ni_gpct_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, struct comedi_cmd * cmd); @@ -283,7 +283,7 @@ static void handle_gpct_interrupt(struct comedi_device * dev, static int init_cs5529(struct comedi_device * dev); static int cs5529_do_conversion(struct comedi_device * dev, unsigned short *data); static int cs5529_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); #ifdef NI_CS5529_DEBUG static unsigned int cs5529_config_read(struct comedi_device * dev, unsigned int reg_select_bits); @@ -292,9 +292,9 @@ static void cs5529_config_write(struct comedi_device * dev, unsigned int value, unsigned int reg_select_bits); static int ni_m_series_pwm_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_6143_pwm_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_set_master_clock(struct comedi_device * dev, unsigned source, unsigned period_ns); @@ -1719,7 +1719,7 @@ static int ni_ai_poll(struct comedi_device * dev, struct comedi_subdevice * s) } static int ni_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i, n; const unsigned int mask = (1 << boardtype.adbits) - 1; @@ -2626,10 +2626,10 @@ static int ni_ai_inttrig(struct comedi_device * dev, struct comedi_subdevice * s } static int ni_ai_config_analog_trig(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ni_ai_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n < 1) return -EINVAL; @@ -2680,7 +2680,7 @@ static int ni_ai_insn_config(struct comedi_device * dev, struct comedi_subdevice } static int ni_ai_config_analog_trig(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int a, b, modebits; int err = 0; @@ -2922,7 +2922,7 @@ static int ni_ao_config_chanlist(struct comedi_device * dev, struct comedi_subde return ni_old_ao_config_chanlist(dev, s, chanspec, n_chans); } static int ni_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = devpriv->ao[CR_CHAN(insn->chanspec)]; @@ -2930,7 +2930,7 @@ static int ni_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * } static int ni_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int chan = CR_CHAN(insn->chanspec); unsigned int invert; @@ -2949,7 +2949,7 @@ static int ni_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice } static int ni_ao_insn_write_671x(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int chan = CR_CHAN(insn->chanspec); unsigned int invert; @@ -2966,7 +2966,7 @@ static int ni_ao_insn_write_671x(struct comedi_device * dev, struct comedi_subde } static int ni_ao_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { switch (data[0]) { case INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE: @@ -3437,7 +3437,7 @@ static int ni_ao_reset(struct comedi_device * dev, struct comedi_subdevice * s) // digital io static int ni_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { #ifdef DEBUG_DIO rt_printk("ni_dio_insn_config() chan=%d io=%d\n", @@ -3469,7 +3469,7 @@ static int ni_dio_insn_config(struct comedi_device * dev, struct comedi_subdevic } static int ni_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { #ifdef DEBUG_DIO rt_printk("ni_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0], data[1]); @@ -3496,7 +3496,7 @@ static int ni_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice } static int ni_m_series_dio_insn_config(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { #ifdef DEBUG_DIO rt_printk("ni_m_series_dio_insn_config() chan=%d io=%d\n", @@ -3526,7 +3526,7 @@ static int ni_m_series_dio_insn_config(struct comedi_device * dev, } static int ni_m_series_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { #ifdef DEBUG_DIO rt_printk("ni_m_series_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0], @@ -3791,7 +3791,7 @@ static void handle_cdio_interrupt(struct comedi_device * dev) } static int ni_serial_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int err = insn->n; unsigned char byte_out, byte_in = 0; @@ -4209,14 +4209,14 @@ static unsigned ni_gpct_read_register(struct ni_gpct *counter, } static int ni_freq_out_insn_read(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { data[0] = devpriv->clock_and_fout & FOUT_Divider_mask; return 1; } static int ni_freq_out_insn_write(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { devpriv->clock_and_fout &= ~FOUT_Enable; devpriv->stc_writew(dev, devpriv->clock_and_fout, @@ -4259,7 +4259,7 @@ static void ni_get_freq_out_clock(struct comedi_device * dev, unsigned int * clo } static int ni_freq_out_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { switch (data[0]) { case INSN_CONFIG_SET_CLOCK_SRC: @@ -4624,7 +4624,7 @@ static int ni_8255_callback(int dir, int port, int data, unsigned long arg) */ static int ni_eeprom_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = ni_read_eeprom(dev, CR_CHAN(insn->chanspec)); @@ -4660,7 +4660,7 @@ static int ni_read_eeprom(struct comedi_device * dev, int addr) } static int ni_m_series_eeprom_insn_read(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { data[0] = devpriv->eeprom_buffer[CR_CHAN(insn->chanspec)]; @@ -4675,7 +4675,7 @@ static int ni_get_pwm_config(struct comedi_device * dev, unsigned int * data) } static int ni_m_series_pwm_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned up_count, down_count; switch (data[0]) { @@ -4740,7 +4740,7 @@ static int ni_m_series_pwm_config(struct comedi_device * dev, struct comedi_subd } static int ni_6143_pwm_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned up_count, down_count; switch (data[0]) { @@ -4807,7 +4807,7 @@ static void ni_write_caldac(struct comedi_device * dev, int addr, int val); calibration subdevice */ static int ni_calib_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { ni_write_caldac(dev, CR_CHAN(insn->chanspec), data[0]); @@ -4815,7 +4815,7 @@ static int ni_calib_insn_write(struct comedi_device * dev, struct comedi_subdevi } static int ni_calib_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { data[0] = devpriv->caldacs[CR_CHAN(insn->chanspec)]; @@ -5071,21 +5071,21 @@ static void GPCT_Reset(struct comedi_device * dev, int chan) #endif static int ni_gpct_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { struct ni_gpct *counter = s->private; return ni_tio_insn_config(counter, insn, data); } static int ni_gpct_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { struct ni_gpct *counter = s->private; return ni_tio_rinsn(counter, insn, data); } static int ni_gpct_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { struct ni_gpct *counter = s->private; return ni_tio_winsn(counter, insn, data); @@ -5254,7 +5254,7 @@ static int ni_config_filter(struct comedi_device * dev, unsigned pfi_channel, } static int ni_pfi_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if ((boardtype.reg_type & ni_reg_m_series_mask) == 0) { return -ENOTSUPP; @@ -5269,7 +5269,7 @@ static int ni_pfi_insn_bits(struct comedi_device * dev, struct comedi_subdevice } static int ni_pfi_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int chan; @@ -5346,7 +5346,7 @@ static void ni_rtsi_init(struct comedi_device * dev) } static int ni_rtsi_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -5627,7 +5627,7 @@ static unsigned ni_get_rtsi_routing(struct comedi_device * dev, unsigned chan) } static int ni_rtsi_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int chan = CR_CHAN(insn->chanspec); switch (data[0]) { @@ -5806,7 +5806,7 @@ static int cs5529_do_conversion(struct comedi_device * dev, unsigned short *data } static int cs5529_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, retval; unsigned short sample; diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c index 9787a6e9f951..d7cdb38d5097 100644 --- a/drivers/staging/comedi/drivers/ni_pcidio.c +++ b/drivers/staging/comedi/drivers/ni_pcidio.c @@ -703,7 +703,7 @@ static void debug_int(struct comedi_device * dev) #endif static int ni_pcidio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 1) return -EINVAL; @@ -730,7 +730,7 @@ static int ni_pcidio_insn_config(struct comedi_device * dev, struct comedi_subde } static int ni_pcidio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c index f5385b903d41..05a957540398 100644 --- a/drivers/staging/comedi/drivers/ni_tio.c +++ b/drivers/staging/comedi/drivers/ni_tio.c @@ -1534,7 +1534,7 @@ static int ni_tio_get_gate_src(struct ni_gpct *counter, unsigned gate_index, } int ni_tio_insn_config(struct ni_gpct *counter, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { switch (data[0]) { case INSN_CONFIG_SET_COUNTER_MODE: @@ -1578,7 +1578,7 @@ int ni_tio_insn_config(struct ni_gpct *counter, return -EINVAL; } -int ni_tio_rinsn(struct ni_gpct *counter, comedi_insn * insn, unsigned int * data) +int ni_tio_rinsn(struct ni_gpct *counter, struct comedi_insn * insn, unsigned int * data) { struct ni_gpct_device *counter_dev = counter->counter_dev; const unsigned channel = CR_CHAN(insn->chanspec); @@ -1642,7 +1642,7 @@ static unsigned ni_tio_next_load_register(struct ni_gpct *counter) } } -int ni_tio_winsn(struct ni_gpct *counter, comedi_insn * insn, unsigned int * data) +int ni_tio_winsn(struct ni_gpct *counter, struct comedi_insn * insn, unsigned int * data) { struct ni_gpct_device *counter_dev = counter->counter_dev; const unsigned channel = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/ni_tio.h b/drivers/staging/comedi/drivers/ni_tio.h index de68c8694dfa..0729d60b01cc 100644 --- a/drivers/staging/comedi/drivers/ni_tio.h +++ b/drivers/staging/comedi/drivers/ni_tio.h @@ -140,11 +140,11 @@ extern struct ni_gpct_device *ni_gpct_device_construct(struct comedi_device * de extern void ni_gpct_device_destroy(struct ni_gpct_device *counter_dev); extern void ni_tio_init_counter(struct ni_gpct *counter); extern int ni_tio_rinsn(struct ni_gpct *counter, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); extern int ni_tio_insn_config(struct ni_gpct *counter, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); extern int ni_tio_winsn(struct ni_gpct *counter, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); extern int ni_tio_cmd(struct ni_gpct *counter, struct comedi_async *async); extern int ni_tio_cmdtest(struct ni_gpct *counter, struct comedi_cmd * cmd); extern int ni_tio_cancel(struct ni_gpct *counter); diff --git a/drivers/staging/comedi/drivers/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c index 68bd7e963db4..01ea3eb7554a 100644 --- a/drivers/staging/comedi/drivers/pcl711.c +++ b/drivers/staging/comedi/drivers/pcl711.c @@ -241,7 +241,7 @@ static void pcl711_set_changain(struct comedi_device * dev, int chan) } static int pcl711_ai_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i, n; int hi, lo; @@ -428,7 +428,7 @@ static int pcl711_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s analog output */ static int pcl711_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int chan = CR_CHAN(insn->chanspec); @@ -446,7 +446,7 @@ static int pcl711_ao_insn(struct comedi_device * dev, struct comedi_subdevice * } static int pcl711_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int chan = CR_CHAN(insn->chanspec); @@ -461,7 +461,7 @@ static int pcl711_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi /* Digital port read - Untested on 8112 */ static int pcl711_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -474,7 +474,7 @@ static int pcl711_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi /* Digital port write - Untested on 8112 */ static int pcl711_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/pcl724.c b/drivers/staging/comedi/drivers/pcl724.c index b9af0c045e7c..455117d043b5 100644 --- a/drivers/staging/comedi/drivers/pcl724.c +++ b/drivers/staging/comedi/drivers/pcl724.c @@ -36,7 +36,7 @@ See the source for configuration details. */ /* * check_driver overrides: - * comedi_insn + * struct comedi_insn */ #include "../comedidev.h" diff --git a/drivers/staging/comedi/drivers/pcl725.c b/drivers/staging/comedi/drivers/pcl725.c index 570193598d98..d9f7c24bbdb0 100644 --- a/drivers/staging/comedi/drivers/pcl725.c +++ b/drivers/staging/comedi/drivers/pcl725.c @@ -32,7 +32,7 @@ static struct comedi_driver driver_pcl725 = { COMEDI_INITCLEANUP(driver_pcl725); static int pcl725_do_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -49,7 +49,7 @@ static int pcl725_do_insn(struct comedi_device * dev, struct comedi_subdevice * } static int pcl725_di_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/pcl726.c b/drivers/staging/comedi/drivers/pcl726.c index a76cf622aef5..f0c8b0af8d56 100644 --- a/drivers/staging/comedi/drivers/pcl726.c +++ b/drivers/staging/comedi/drivers/pcl726.c @@ -169,7 +169,7 @@ typedef struct { #define devpriv ((pcl726_private *)dev->private) static int pcl726_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int hi, lo; int n; @@ -194,7 +194,7 @@ static int pcl726_ao_insn(struct comedi_device * dev, struct comedi_subdevice * } static int pcl726_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); int n; @@ -206,7 +206,7 @@ static int pcl726_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi } static int pcl726_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -218,7 +218,7 @@ static int pcl726_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi } static int pcl726_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/pcl730.c b/drivers/staging/comedi/drivers/pcl730.c index 63b4a35159a8..05d9f76e9336 100644 --- a/drivers/staging/comedi/drivers/pcl730.c +++ b/drivers/staging/comedi/drivers/pcl730.c @@ -56,7 +56,7 @@ static struct comedi_driver driver_pcl730 = { COMEDI_INITCLEANUP(driver_pcl730); static int pcl730_do_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -78,7 +78,7 @@ static int pcl730_do_insn(struct comedi_device * dev, struct comedi_subdevice * } static int pcl730_di_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c index c554ed583eed..7b0a95c0e983 100644 --- a/drivers/staging/comedi/drivers/pcl812.c +++ b/drivers/staging/comedi/drivers/pcl812.c @@ -434,7 +434,7 @@ static int pcl812_ai_cancel(struct comedi_device * dev, struct comedi_subdevice ============================================================================== */ static int pcl812_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int timeout, hi; @@ -468,7 +468,7 @@ static int pcl812_ai_insn_read(struct comedi_device * dev, struct comedi_subdevi ============================================================================== */ static int acl8216_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int timeout; @@ -504,7 +504,7 @@ static int acl8216_ai_insn_read(struct comedi_device * dev, struct comedi_subdev ============================================================================== */ static int pcl812_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); int i; @@ -524,7 +524,7 @@ static int pcl812_ao_insn_write(struct comedi_device * dev, struct comedi_subdev ============================================================================== */ static int pcl812_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); int i; @@ -540,7 +540,7 @@ static int pcl812_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi ============================================================================== */ static int pcl812_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -555,7 +555,7 @@ static int pcl812_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi ============================================================================== */ static int pcl812_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c index 60d7a2c1d190..9542d0e8e5fb 100644 --- a/drivers/staging/comedi/drivers/pcl816.c +++ b/drivers/staging/comedi/drivers/pcl816.c @@ -227,7 +227,7 @@ static int pcl816_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s ANALOG INPUT MODE0, 816 cards, slow version */ static int pcl816_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int timeout; diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c index 9eaabfb18042..4b315c090baf 100644 --- a/drivers/staging/comedi/drivers/pcl818.c +++ b/drivers/staging/comedi/drivers/pcl818.c @@ -388,7 +388,7 @@ static int rtc_setfreq_irq(int freq); ANALOG INPUT MODE0, 818 cards, slow version */ static int pcl818_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int timeout; @@ -435,7 +435,7 @@ static int pcl818_ai_insn_read(struct comedi_device * dev, struct comedi_subdevi only one sample per call is supported */ static int pcl818_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int chan = CR_CHAN(insn->chanspec); @@ -448,7 +448,7 @@ static int pcl818_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi } static int pcl818_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int chan = CR_CHAN(insn->chanspec); @@ -471,7 +471,7 @@ static int pcl818_ao_insn_write(struct comedi_device * dev, struct comedi_subdev only one sample per call is supported */ static int pcl818_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -489,7 +489,7 @@ static int pcl818_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi only one sample per call is supported */ static int pcl818_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/pcm3724.c b/drivers/staging/comedi/drivers/pcm3724.c index 5d965466f0f2..08a63ebfa62e 100644 --- a/drivers/staging/comedi/drivers/pcm3724.c +++ b/drivers/staging/comedi/drivers/pcm3724.c @@ -25,7 +25,7 @@ Copy/pasted/hacked from pcm724.c */ /* * check_driver overrides: - * comedi_insn + * struct comedi_insn */ #include "../comedidev.h" @@ -215,7 +215,7 @@ static void enable_chan(struct comedi_device * dev, struct comedi_subdevice * s, /* overriding the 8255 insn config */ static int subdev_3724_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unsigned int mask; unsigned int bits; diff --git a/drivers/staging/comedi/drivers/pcm3730.c b/drivers/staging/comedi/drivers/pcm3730.c index b505a015be06..63b961b32e2b 100644 --- a/drivers/staging/comedi/drivers/pcm3730.c +++ b/drivers/staging/comedi/drivers/pcm3730.c @@ -40,7 +40,7 @@ static struct comedi_driver driver_pcm3730 = { COMEDI_INITCLEANUP(driver_pcm3730); static int pcm3730_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -55,7 +55,7 @@ static int pcm3730_do_insn_bits(struct comedi_device * dev, struct comedi_subdev } static int pcm3730_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c index b129a473587b..fe3990983aeb 100644 --- a/drivers/staging/comedi/drivers/pcmad.c +++ b/drivers/staging/comedi/drivers/pcmad.c @@ -93,7 +93,7 @@ COMEDI_INITCLEANUP(driver_pcmad); #define TIMEOUT 100 static int pcmad_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan; diff --git a/drivers/staging/comedi/drivers/pcmda12.c b/drivers/staging/comedi/drivers/pcmda12.c index 9442eed9271d..d9f0b03486d0 100644 --- a/drivers/staging/comedi/drivers/pcmda12.c +++ b/drivers/staging/comedi/drivers/pcmda12.c @@ -139,9 +139,9 @@ static struct comedi_driver driver = { }; static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); /* * Attach is called by the Comedi core to configure the driver @@ -240,7 +240,7 @@ static void zero_chans(struct comedi_device * dev) } static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -282,7 +282,7 @@ static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, This is useful for some control applications, I would imagine. */ static int ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c index f428f6923f59..e44dee964aaa 100644 --- a/drivers/staging/comedi/drivers/pcmmio.c +++ b/drivers/staging/comedi/drivers/pcmmio.c @@ -140,13 +140,13 @@ Configuration Options: #define PAGE_INT_ID 3 typedef int (*comedi_insn_fn_t) (struct comedi_device *, struct comedi_subdevice *, - comedi_insn *, unsigned int *); + struct comedi_insn *, unsigned int *); -static int ai_rinsn(struct comedi_device *, struct comedi_subdevice *, comedi_insn *, +static int ai_rinsn(struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *, unsigned int *); -static int ao_rinsn(struct comedi_device *, struct comedi_subdevice *, comedi_insn *, +static int ao_rinsn(struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *, unsigned int *); -static int ao_winsn(struct comedi_device *, struct comedi_subdevice *, comedi_insn *, +static int ao_winsn(struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *, unsigned int *); /* @@ -296,9 +296,9 @@ static struct comedi_driver driver = { }; static int pcmmio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int pcmmio_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static irqreturn_t interrupt_pcmmio(int irq, void *d PT_REGS_ARG); static void pcmmio_stop_intr(struct comedi_device *, struct comedi_subdevice *); @@ -551,7 +551,7 @@ static int pcmmio_detach(struct comedi_device * dev) * This allows packed reading/writing of the DIO channels. The * comedi core can convert between insn_bits and insn_read/write */ static int pcmmio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int byte_no; if (insn->n != 2) @@ -625,7 +625,7 @@ static int pcmmio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdev * contains the channel to be changed, and data[0] contains the * value COMEDI_INPUT or COMEDI_OUTPUT. */ static int pcmmio_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec), byte_no = chan / 8, bit_no = chan % 8; @@ -1195,7 +1195,7 @@ static int adc_wait_ready(unsigned long iobase) /* All this is for AI and AO */ static int ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; unsigned long iobase = subpriv->iobase; @@ -1259,7 +1259,7 @@ static int ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, } static int ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; for (n = 0; n < insn->n; n++) { @@ -1289,7 +1289,7 @@ static int wait_dac_ready(unsigned long iobase) } static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; unsigned iobase = subpriv->iobase, iooffset = 0; diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c index 2c460cf67c89..fca574b60436 100644 --- a/drivers/staging/comedi/drivers/pcmuio.c +++ b/drivers/staging/comedi/drivers/pcmuio.c @@ -254,9 +254,9 @@ static struct comedi_driver driver = { }; static int pcmuio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int pcmuio_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static irqreturn_t interrupt_pcmuio(int irq, void *d PT_REGS_ARG); static void pcmuio_stop_intr(struct comedi_device *, struct comedi_subdevice *); @@ -475,7 +475,7 @@ static int pcmuio_detach(struct comedi_device * dev) * This allows packed reading/writing of the DIO channels. The * comedi core can convert between insn_bits and insn_read/write */ static int pcmuio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int byte_no; if (insn->n != 2) @@ -549,7 +549,7 @@ static int pcmuio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdev * contains the channel to be changed, and data[0] contains the * value COMEDI_INPUT or COMEDI_OUTPUT. */ static int pcmuio_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec), byte_no = chan / 8, bit_no = chan % 8; diff --git a/drivers/staging/comedi/drivers/poc.c b/drivers/staging/comedi/drivers/poc.c index b1b1138c4d50..39a6f94f2e1e 100644 --- a/drivers/staging/comedi/drivers/poc.c +++ b/drivers/staging/comedi/drivers/poc.c @@ -44,14 +44,14 @@ Configuration options: static int poc_attach(struct comedi_device * dev, comedi_devconfig * it); static int poc_detach(struct comedi_device * dev); static int readback_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int dac02_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int pcl733_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int pcl734_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); struct boarddef_struct { const char *name; @@ -60,11 +60,11 @@ struct boarddef_struct { int type; int n_chan; int n_bits; - int (*winsn) (struct comedi_device *, struct comedi_subdevice *, comedi_insn *, + int (*winsn) (struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *, unsigned int *); - int (*rinsn) (struct comedi_device *, struct comedi_subdevice *, comedi_insn *, + int (*rinsn) (struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *, unsigned int *); - int (*insnbits) (struct comedi_device *, struct comedi_subdevice *, comedi_insn *, + int (*insnbits) (struct comedi_device *, struct comedi_subdevice *, struct comedi_insn *, unsigned int *); const struct comedi_lrange *range; }; @@ -171,7 +171,7 @@ static int poc_detach(struct comedi_device * dev) } static int readback_insn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan; @@ -186,7 +186,7 @@ static int readback_insn(struct comedi_device * dev, struct comedi_subdevice * s #define DAC02_MSB(a) (2 * a + 1) static int dac02_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int temp; int chan; @@ -209,7 +209,7 @@ static int dac02_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * } static int pcl733_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -223,7 +223,7 @@ static int pcl733_insn_bits(struct comedi_device * dev, struct comedi_subdevice } static int pcl734_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 9a188d44551f..6494312cb169 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -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(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct 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(struct comedi_device * dev, struct comedi_subdevice * s) /* Single-shot analog output routine */ static int daqp_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct 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(struct comedi_device * dev, struct comedi_subdevic /* Digital input routine */ static int daqp_di_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct 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(struct comedi_device * dev, struct comedi_subdevice /* Digital output routine */ static int daqp_do_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { local_info_t *local = (local_info_t *) s->private; diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index 6ce02fa6082d..c919b8efdb3e 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c @@ -691,15 +691,15 @@ static struct comedi_driver rtd520Driver = { }; static int rtd_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int rtd_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int rtd_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int rtd_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int rtd_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int rtd_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd); static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s); @@ -1255,7 +1255,7 @@ static int rtd520_probe_fifo_depth(struct comedi_device *dev) select, delay, then read. */ static int rtd_ai_rinsn(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { int n, ii; int stat; @@ -2136,7 +2136,7 @@ static int rtd_ns_to_timer(unsigned int *ns, int round_mode) Output one (or more) analog values to a single port as fast as possible. */ static int rtd_ao_winsn(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -2191,7 +2191,7 @@ static int rtd_ao_winsn(struct comedi_device *dev, /* AO subdevices should have a read insn as well as a write insn. * Usually this means copying a value stored in devpriv. */ static int rtd_ao_rinsn(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -2214,7 +2214,7 @@ static int rtd_ao_rinsn(struct comedi_device *dev, * comedi core can convert between insn_bits and insn_read/write */ static int rtd_dio_insn_bits(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { if (insn->n != 2) return -EINVAL; @@ -2241,7 +2241,7 @@ static int rtd_dio_insn_bits(struct comedi_device *dev, Configure one bit on a IO port as Input or Output (hence the name :-). */ static int rtd_dio_insn_config(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c index 463ef4841f0d..a93f5705bf19 100644 --- a/drivers/staging/comedi/drivers/rti800.c +++ b/drivers/staging/comedi/drivers/rti800.c @@ -179,7 +179,7 @@ static irqreturn_t rti800_interrupt(int irq, void *dev PT_REGS_ARG) static const int gaindelay[] = { 10, 20, 40, 80 }; static int rti800_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i, t; int status; @@ -232,7 +232,7 @@ static int rti800_ai_insn_read(struct comedi_device * dev, struct comedi_subdevi } static int rti800_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -244,7 +244,7 @@ static int rti800_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi } static int rti800_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); int d; @@ -264,7 +264,7 @@ static int rti800_ao_insn_write(struct comedi_device * dev, struct comedi_subdev } static int rti800_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -273,7 +273,7 @@ static int rti800_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi } static int rti800_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; diff --git a/drivers/staging/comedi/drivers/rti802.c b/drivers/staging/comedi/drivers/rti802.c index 44bf3451d730..3249d08c3cea 100644 --- a/drivers/staging/comedi/drivers/rti802.c +++ b/drivers/staging/comedi/drivers/rti802.c @@ -69,7 +69,7 @@ typedef struct { #define devpriv ((rti802_private *)dev->private) static int rti802_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; @@ -80,7 +80,7 @@ static int rti802_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi } static int rti802_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i, d; int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c index d3881498e164..b9b48b2f222d 100644 --- a/drivers/staging/comedi/drivers/s526.c +++ b/drivers/staging/comedi/drivers/s526.c @@ -246,23 +246,23 @@ static struct comedi_driver driver_s526 = { }; static int s526_gpct_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int s526_gpct_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int s526_gpct_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int s526_ai_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int s526_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int s526_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int s526_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int s526_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int s526_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); /* * Attach is called by the Comedi core to configure the driver @@ -477,7 +477,7 @@ static int s526_detach(struct comedi_device * dev) } static int s526_gpct_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; // counts the Data int counter_channel = CR_CHAN(insn->chanspec); @@ -501,7 +501,7 @@ static int s526_gpct_rinsn(struct comedi_device * dev, struct comedi_subdevice * } static int s526_gpct_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int subdev_channel = CR_CHAN(insn->chanspec); // Unpack chanspec int i; @@ -726,7 +726,7 @@ static int s526_gpct_insn_config(struct comedi_device * dev, struct comedi_subde } static int s526_gpct_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int subdev_channel = CR_CHAN(insn->chanspec); // Unpack chanspec short value; @@ -785,7 +785,7 @@ static int s526_gpct_winsn(struct comedi_device * dev, struct comedi_subdevice * #define ISR_ADC_DONE 0x4 static int s526_ai_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int result = -EINVAL; @@ -818,7 +818,7 @@ static int s526_ai_insn_config(struct comedi_device * dev, struct comedi_subdevi * mode. */ static int s526_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, i; int chan = CR_CHAN(insn->chanspec); @@ -868,7 +868,7 @@ static int s526_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s } static int s526_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -897,7 +897,7 @@ static int s526_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s /* AO subdevices should have a read insn as well as a write insn. * Usually this means copying a value stored in devpriv. */ static int s526_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -914,7 +914,7 @@ static int s526_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s * This allows packed reading/writing of the DIO channels. The * comedi core can convert between insn_bits and insn_read/write */ static int s526_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -939,7 +939,7 @@ static int s526_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevic } static int s526_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); short value; diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index 80fedbb47b76..7385031f2b8b 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -223,32 +223,32 @@ COMEDI_PCI_INITCLEANUP_NOMODULE(driver_s626, s626_pci_table); /* ioctl routines */ static int s626_ai_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); -/* static int s626_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data); */ + struct comedi_insn *insn, unsigned int *data); +/* static int s626_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data); */ static int s626_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s); static int s626_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd); static int s626_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s); static int s626_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int s626_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int s626_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int s626_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int s626_dio_set_irq(struct comedi_device *dev, unsigned int chan); static int s626_dio_reset_irq(struct comedi_device *dev, unsigned int gruop, unsigned int mask); static int s626_dio_clear_irq(struct comedi_device *dev); static int s626_enc_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int s626_enc_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int s626_enc_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data); + struct comedi_insn *insn, unsigned int *data); static int s626_ns_to_timer(int *nanosec, int round_mode); static int s626_ai_load_polllist(uint8_t *ppl, struct comedi_cmd *cmd); static int s626_ai_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, @@ -1504,13 +1504,13 @@ void ResetADC(struct comedi_device *dev, uint8_t *ppl) /* TO COMPLETE, IF NECESSARY */ static int s626_ai_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { return -EINVAL; } -/* static int s626_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) */ +/* static int s626_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) */ /* { */ /* register uint8_t i; */ /* register int32_t *readaddr; */ @@ -1541,7 +1541,7 @@ static int s626_ai_insn_config(struct comedi_device *dev, struct comedi_subdevic /* } */ static int s626_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { uint16_t chan = CR_CHAN(insn->chanspec); uint16_t range = CR_RANGE(insn->chanspec); @@ -2046,7 +2046,7 @@ static int s626_ns_to_timer(int *nanosec, int round_mode) } static int s626_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int i; @@ -2065,7 +2065,7 @@ static int s626_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, } static int s626_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int i; @@ -2111,7 +2111,7 @@ static void s626_dio_init(struct comedi_device *dev) * core can convert between insn_bits and insn_read/write */ static int s626_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { /* Length of data must be 2 (mask and new data, see below) */ @@ -2147,7 +2147,7 @@ static int s626_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice } static int s626_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { switch (data[0]) { @@ -2252,7 +2252,7 @@ static int s626_dio_clear_irq(struct comedi_device *dev) and set the subdevice. To complete with trigger and interrupt configuration */ static int s626_enc_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { uint16_t Setup = (LOADSRC_INDX << BF_LOADSRC) | /* Preload upon */ /* index. */ @@ -2282,7 +2282,7 @@ static int s626_enc_insn_config(struct comedi_device *dev, struct comedi_subdevi } static int s626_enc_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int n; @@ -2300,7 +2300,7 @@ static int s626_enc_insn_read(struct comedi_device *dev, struct comedi_subdevice } static int s626_enc_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { struct enc_private *k = &encpriv[CR_CHAN(insn->chanspec)]; diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c index 61cf19ebc278..2271bd45fc0f 100644 --- a/drivers/staging/comedi/drivers/serial2002.c +++ b/drivers/staging/comedi/drivers/serial2002.c @@ -98,15 +98,15 @@ struct comedi_driver driver_serial2002 = { }; static int serial2002_di_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int serial2002_do_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int serial2002_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int serial2002_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int serial2002_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); struct serial_data { enum { is_invalid, is_digital, is_channel } kind; @@ -661,7 +661,7 @@ static void serial_2002_close(struct comedi_device * dev) } static int serial2002_di_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int chan; @@ -683,7 +683,7 @@ static int serial2002_di_rinsn(struct comedi_device * dev, struct comedi_subdevi } static int serial2002_do_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int chan; @@ -701,7 +701,7 @@ static int serial2002_do_winsn(struct comedi_device * dev, struct comedi_subdevi } static int serial2002_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int chan; @@ -723,7 +723,7 @@ static int serial2002_ai_rinsn(struct comedi_device * dev, struct comedi_subdevi } static int serial2002_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int chan; @@ -742,7 +742,7 @@ static int serial2002_ao_winsn(struct comedi_device * dev, struct comedi_subdevi } static int serial2002_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int chan = CR_CHAN(insn->chanspec); @@ -755,7 +755,7 @@ static int serial2002_ao_rinsn(struct comedi_device * dev, struct comedi_subdevi } static int serial2002_ei_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n; int chan; diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c index 511c4e32479c..2d25354b9acb 100644 --- a/drivers/staging/comedi/drivers/skel.c +++ b/drivers/staging/comedi/drivers/skel.c @@ -182,15 +182,15 @@ static struct comedi_driver driver_skel = { }; static int skel_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int skel_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int skel_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int skel_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int skel_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int skel_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, struct comedi_cmd * cmd); static int skel_ns_to_timer(unsigned int *ns, int round); @@ -299,7 +299,7 @@ static int skel_detach(struct comedi_device * dev) * mode. */ static int skel_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int n, i; unsigned int d; @@ -516,7 +516,7 @@ static int skel_ns_to_timer(unsigned int *ns, int round) } static int skel_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -537,7 +537,7 @@ static int skel_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s /* AO subdevices should have a read insn as well as a write insn. * Usually this means copying a value stored in devpriv. */ static int skel_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -554,7 +554,7 @@ static int skel_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s * This allows packed reading/writing of the DIO channels. The * comedi core can convert between insn_bits and insn_read/write */ static int skel_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) return -EINVAL; @@ -579,7 +579,7 @@ static int skel_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevic } static int skel_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int chan = CR_CHAN(insn->chanspec); diff --git a/drivers/staging/comedi/drivers/ssv_dnp.c b/drivers/staging/comedi/drivers/ssv_dnp.c index a5fda67f4a6a..cf3adf77ea12 100644 --- a/drivers/staging/comedi/drivers/ssv_dnp.c +++ b/drivers/staging/comedi/drivers/ssv_dnp.c @@ -104,10 +104,10 @@ static struct comedi_driver driver_dnp = { COMEDI_INITCLEANUP(driver_dnp); static int dnp_dio_insn_bits(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); static int dnp_dio_insn_config(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); /* ------------------------------------------------------------------------- */ /* Attach is called by comedi core to configure the driver for a particular */ @@ -201,7 +201,7 @@ static int dnp_detach(struct comedi_device * dev) /* ------------------------------------------------------------------------- */ static int dnp_dio_insn_bits(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { if (insn->n != 2) @@ -251,7 +251,7 @@ static int dnp_dio_insn_bits(struct comedi_device * dev, /* ------------------------------------------------------------------------- */ static int dnp_dio_insn_config(struct comedi_device * dev, - struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data) + struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) { u8 register_buffer; diff --git a/drivers/staging/comedi/drivers/unioxx5.c b/drivers/staging/comedi/drivers/unioxx5.c index bc5511d03ced..04b7ec65b63f 100644 --- a/drivers/staging/comedi/drivers/unioxx5.c +++ b/drivers/staging/comedi/drivers/unioxx5.c @@ -82,11 +82,11 @@ typedef struct unioxx5_subd_priv { static int unioxx5_attach(struct comedi_device * dev, comedi_devconfig * it); static int unioxx5_subdev_write(struct comedi_device * dev, struct comedi_subdevice * subdev, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int unioxx5_subdev_read(struct comedi_device * dev, struct comedi_subdevice * subdev, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int unioxx5_insn_config(struct comedi_device * dev, struct comedi_subdevice * subdev, - comedi_insn * insn, unsigned int * data); + struct comedi_insn * insn, unsigned int * data); static int unioxx5_detach(struct comedi_device * dev); static int __unioxx5_subdev_init(struct comedi_subdevice * subdev, int subdev_iobase, int minor); @@ -157,7 +157,7 @@ static int unioxx5_attach(struct comedi_device * dev, comedi_devconfig * it) } static int unioxx5_subdev_read(struct comedi_device * dev, struct comedi_subdevice * subdev, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unioxx5_subd_priv *usp = subdev->private; int channel, type; @@ -177,7 +177,7 @@ static int unioxx5_subdev_read(struct comedi_device * dev, struct comedi_subdevi } static int unioxx5_subdev_write(struct comedi_device * dev, struct comedi_subdevice * subdev, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { unioxx5_subd_priv *usp = subdev->private; int channel, type; @@ -198,7 +198,7 @@ static int unioxx5_subdev_write(struct comedi_device * dev, struct comedi_subdev /* for digital modules only */ static int unioxx5_insn_config(struct comedi_device * dev, struct comedi_subdevice * subdev, - comedi_insn * insn, unsigned int * data) + struct comedi_insn * insn, unsigned int * data) { int channel_offset, flags, channel = CR_CHAN(insn->chanspec), type; unioxx5_subd_priv *usp = subdev->private; diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c index 7ec175aadbef..692df7a0e5eb 100644 --- a/drivers/staging/comedi/drivers/usbdux.c +++ b/drivers/staging/comedi/drivers/usbdux.c @@ -1277,7 +1277,7 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) /* Mode 0 is used to get a single conversion on demand */ static int usbdux_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int i; unsigned int one = 0; @@ -1338,7 +1338,7 @@ static int usbdux_ai_insn_read(struct comedi_device *dev, struct comedi_subdevic /* analog out */ static int usbdux_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int i; int chan = CR_CHAN(insn->chanspec); @@ -1360,7 +1360,7 @@ static int usbdux_ao_insn_read(struct comedi_device *dev, struct comedi_subdevic } static int usbdux_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int i, err; int chan = CR_CHAN(insn->chanspec); @@ -1698,7 +1698,7 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) } static int usbdux_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { int chan = CR_CHAN(insn->chanspec); @@ -1729,7 +1729,7 @@ static int usbdux_dio_insn_config(struct comedi_device *dev, struct comedi_subde } static int usbdux_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { struct usbduxsub *this_usbduxsub = dev->private; @@ -1776,7 +1776,7 @@ static int usbdux_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevi /* reads the 4 counters, only two are used just now */ static int usbdux_counter_read(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { struct usbduxsub *this_usbduxsub = dev->private; int chan = insn->chanspec; @@ -1810,7 +1810,7 @@ static int usbdux_counter_read(struct comedi_device *dev, struct comedi_subdevic } static int usbdux_counter_write(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { struct usbduxsub *this_usbduxsub = dev->private; int err; @@ -1840,7 +1840,7 @@ static int usbdux_counter_write(struct comedi_device *dev, struct comedi_subdevi } static int usbdux_counter_config(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { /* nothing to do so far */ return 2; @@ -2098,7 +2098,7 @@ static int usbdux_pwm_pattern(struct comedi_device *dev, struct comedi_subdevice } static int usbdux_pwm_write(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { struct usbduxsub *this_usbduxsub = dev->private; @@ -2123,7 +2123,7 @@ static int usbdux_pwm_write(struct comedi_device *dev, struct comedi_subdevice * } static int usbdux_pwm_read(struct comedi_device *x1, struct comedi_subdevice *x2, - comedi_insn *x3, unsigned int *x4) + struct comedi_insn *x3, unsigned int *x4) { /* not needed */ return -EINVAL; @@ -2131,7 +2131,7 @@ static int usbdux_pwm_read(struct comedi_device *x1, struct comedi_subdevice *x2 /* switches on/off PWM */ static int usbdux_pwm_config(struct comedi_device *dev, struct comedi_subdevice *s, - comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, unsigned int *data) { struct usbduxsub *this_usbduxsub = dev->private; switch (data[0]) { diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c index bbd552f2a500..d1ea6ed934ef 100644 --- a/drivers/staging/comedi/drivers/usbduxfast.c +++ b/drivers/staging/comedi/drivers/usbduxfast.c @@ -1231,7 +1231,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev, struct comedi_subdevice * Mode 0 is used to get a single conversion on demand. */ static int usbduxfast_ai_insn_read(struct comedi_device *dev, - struct comedi_subdevice *s, comedi_insn *insn, unsigned int *data) + struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { int i, j, n, actual_length; int chan, range, rngmask; diff --git a/drivers/staging/comedi/kcomedilib/data.c b/drivers/staging/comedi/kcomedilib/data.c index 53f20476e99b..9797e13e3774 100644 --- a/drivers/staging/comedi/kcomedilib/data.c +++ b/drivers/staging/comedi/kcomedilib/data.c @@ -30,7 +30,7 @@ int comedi_data_write(void *dev, unsigned int subdev, unsigned int chan, unsigned int range, unsigned int aref, unsigned int data) { - comedi_insn insn; + struct comedi_insn insn; memset(&insn, 0, sizeof(insn)); insn.insn = INSN_WRITE; @@ -45,7 +45,7 @@ int comedi_data_write(void *dev, unsigned int subdev, unsigned int chan, int comedi_data_read(void *dev, unsigned int subdev, unsigned int chan, unsigned int range, unsigned int aref, unsigned int *data) { - comedi_insn insn; + struct comedi_insn insn; memset(&insn, 0, sizeof(insn)); insn.insn = INSN_READ; @@ -60,7 +60,7 @@ int comedi_data_read(void *dev, unsigned int subdev, unsigned int chan, int comedi_data_read_hint(void *dev, unsigned int subdev, unsigned int chan, unsigned int range, unsigned int aref) { - comedi_insn insn; + struct comedi_insn insn; unsigned int dummy_data; memset(&insn, 0, sizeof(insn)); diff --git a/drivers/staging/comedi/kcomedilib/dio.c b/drivers/staging/comedi/kcomedilib/dio.c index 1a76ef57537c..8595567e48fb 100644 --- a/drivers/staging/comedi/kcomedilib/dio.c +++ b/drivers/staging/comedi/kcomedilib/dio.c @@ -29,7 +29,7 @@ int comedi_dio_config(void *dev, unsigned int subdev, unsigned int chan, unsigned int io) { - comedi_insn insn; + struct comedi_insn insn; memset(&insn, 0, sizeof(insn)); insn.insn = INSN_CONFIG; @@ -44,7 +44,7 @@ int comedi_dio_config(void *dev, unsigned int subdev, unsigned int chan, int comedi_dio_read(void *dev, unsigned int subdev, unsigned int chan, unsigned int *val) { - comedi_insn insn; + struct comedi_insn insn; memset(&insn, 0, sizeof(insn)); insn.insn = INSN_READ; @@ -59,7 +59,7 @@ int comedi_dio_read(void *dev, unsigned int subdev, unsigned int chan, int comedi_dio_write(void *dev, unsigned int subdev, unsigned int chan, unsigned int val) { - comedi_insn insn; + struct comedi_insn insn; memset(&insn, 0, sizeof(insn)); insn.insn = INSN_WRITE; @@ -74,7 +74,7 @@ int comedi_dio_write(void *dev, unsigned int subdev, unsigned int chan, int comedi_dio_bitfield(void *dev, unsigned int subdev, unsigned int mask, unsigned int *bits) { - comedi_insn insn; + struct comedi_insn insn; unsigned int data[2]; int ret; diff --git a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c index 43dae3e40379..a4fa9571c58f 100644 --- a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c +++ b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c @@ -183,7 +183,7 @@ int comedi_command_test(void *d, struct comedi_cmd *cmd) * COMEDI_INSN * perform an instruction */ -int comedi_do_insn(void *d, comedi_insn *insn) +int comedi_do_insn(void *d, struct comedi_insn *insn) { struct comedi_device *dev = (struct comedi_device *) d; struct comedi_subdevice *s; |