diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2009-04-09 16:07:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 14:00:31 -0400 |
commit | da91b2692e0939b307f9047192d2b9fe07793e7a (patch) | |
tree | 0bd8c369fd48eeb6964ffe8b91c85579ce03c57b /drivers/staging/comedi | |
parent | 9096a4eaf4a608d9465f993f48ad9d6c38144b8e (diff) |
Staging: comedi: fix "foo * bar" should be "foo *bar"
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi')
130 files changed, 2577 insertions, 2577 deletions
diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c index 0369c7c84ac..63fc08a3ad7 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) | |||
144 | } | 144 | } |
145 | 145 | ||
146 | static int subdev_8255_insn(struct comedi_device *dev, struct comedi_subdevice * s, | 146 | static int subdev_8255_insn(struct comedi_device *dev, struct comedi_subdevice * s, |
147 | struct comedi_insn * insn, unsigned int * data) | 147 | struct comedi_insn *insn, unsigned int *data) |
148 | { | 148 | { |
149 | if (data[0]) { | 149 | if (data[0]) { |
150 | s->state &= ~data[0]; | 150 | s->state &= ~data[0]; |
@@ -169,7 +169,7 @@ static int subdev_8255_insn(struct comedi_device *dev, struct comedi_subdevice * | |||
169 | } | 169 | } |
170 | 170 | ||
171 | static int subdev_8255_insn_config(struct comedi_device *dev, struct comedi_subdevice * s, | 171 | static int subdev_8255_insn_config(struct comedi_device *dev, struct comedi_subdevice * s, |
172 | struct comedi_insn * insn, unsigned int * data) | 172 | struct comedi_insn *insn, unsigned int *data) |
173 | { | 173 | { |
174 | unsigned int mask; | 174 | unsigned int mask; |
175 | unsigned int bits; | 175 | unsigned int bits; |
@@ -223,7 +223,7 @@ static void do_config(struct comedi_device *dev, struct comedi_subdevice * s) | |||
223 | } | 223 | } |
224 | 224 | ||
225 | static int subdev_8255_cmdtest(struct comedi_device *dev, struct comedi_subdevice * s, | 225 | static int subdev_8255_cmdtest(struct comedi_device *dev, struct comedi_subdevice * s, |
226 | struct comedi_cmd * cmd) | 226 | struct comedi_cmd *cmd) |
227 | { | 227 | { |
228 | int err = 0; | 228 | int err = 0; |
229 | unsigned int tmp; | 229 | unsigned int tmp; |
diff --git a/drivers/staging/comedi/drivers/8255.h b/drivers/staging/comedi/drivers/8255.h index 979311b9927..5457c6b2d22 100644 --- a/drivers/staging/comedi/drivers/8255.h +++ b/drivers/staging/comedi/drivers/8255.h | |||
@@ -28,16 +28,16 @@ | |||
28 | 28 | ||
29 | #if defined(CONFIG_COMEDI_8255) || defined(CONFIG_COMEDI_8255_MODULE) | 29 | #if defined(CONFIG_COMEDI_8255) || defined(CONFIG_COMEDI_8255_MODULE) |
30 | 30 | ||
31 | int subdev_8255_init(struct comedi_device * dev, struct comedi_subdevice * s, | 31 | int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice *s, |
32 | int (*cb) (int, int, int, unsigned long), unsigned long arg); | 32 | int (*cb) (int, int, int, unsigned long), unsigned long arg); |
33 | int subdev_8255_init_irq(struct comedi_device * dev, struct comedi_subdevice * s, | 33 | int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice *s, |
34 | int (*cb) (int, int, int, unsigned long), unsigned long arg); | 34 | int (*cb) (int, int, int, unsigned long), unsigned long arg); |
35 | void subdev_8255_cleanup(struct comedi_device * dev, struct comedi_subdevice * s); | 35 | void subdev_8255_cleanup(struct comedi_device *dev, struct comedi_subdevice *s); |
36 | void subdev_8255_interrupt(struct comedi_device * dev, struct comedi_subdevice * s); | 36 | void subdev_8255_interrupt(struct comedi_device *dev, struct comedi_subdevice *s); |
37 | 37 | ||
38 | #else | 38 | #else |
39 | 39 | ||
40 | static inline int subdev_8255_init(struct comedi_device * dev, struct comedi_subdevice * s, | 40 | static inline int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice *s, |
41 | void *x, unsigned long y) | 41 | void *x, unsigned long y) |
42 | { | 42 | { |
43 | printk("8255 support not configured -- disabling subdevice\n"); | 43 | printk("8255 support not configured -- disabling subdevice\n"); |
@@ -47,8 +47,8 @@ static inline int subdev_8255_init(struct comedi_device * dev, struct comedi_sub | |||
47 | return 0; | 47 | return 0; |
48 | } | 48 | } |
49 | 49 | ||
50 | static inline void subdev_8255_cleanup(struct comedi_device * dev, | 50 | static inline void subdev_8255_cleanup(struct comedi_device *dev, |
51 | struct comedi_subdevice * s) | 51 | struct comedi_subdevice *s) |
52 | { | 52 | { |
53 | } | 53 | } |
54 | 54 | ||
diff --git a/drivers/staging/comedi/drivers/acl7225b.c b/drivers/staging/comedi/drivers/acl7225b.c index 05775399132..067ad7523d9 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 = { | |||
51 | COMEDI_INITCLEANUP(driver_acl7225b); | 51 | COMEDI_INITCLEANUP(driver_acl7225b); |
52 | 52 | ||
53 | static int acl7225b_do_insn(struct comedi_device *dev, struct comedi_subdevice * s, | 53 | static int acl7225b_do_insn(struct comedi_device *dev, struct comedi_subdevice * s, |
54 | struct comedi_insn * insn, unsigned int * data) | 54 | struct comedi_insn *insn, unsigned int *data) |
55 | { | 55 | { |
56 | if (insn->n != 2) | 56 | if (insn->n != 2) |
57 | return -EINVAL; | 57 | return -EINVAL; |
@@ -72,7 +72,7 @@ static int acl7225b_do_insn(struct comedi_device *dev, struct comedi_subdevice * | |||
72 | } | 72 | } |
73 | 73 | ||
74 | static int acl7225b_di_insn(struct comedi_device *dev, struct comedi_subdevice * s, | 74 | static int acl7225b_di_insn(struct comedi_device *dev, struct comedi_subdevice * s, |
75 | struct comedi_insn * insn, unsigned int * data) | 75 | struct comedi_insn *insn, unsigned int *data) |
76 | { | 76 | { |
77 | if (insn->n != 2) | 77 | if (insn->n != 2) |
78 | return -EINVAL; | 78 | 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 b3ee729c50c..cd41e39bbce 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c | |||
@@ -219,8 +219,8 @@ int i_InsnConfig_InitTimer(struct comedi_device *dev,struct comedi_subdevice *s, | |||
219 | +----------------------------------------------------------------------------+ | 219 | +----------------------------------------------------------------------------+ |
220 | */ | 220 | */ |
221 | 221 | ||
222 | int i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, struct comedi_subdevice * s, | 222 | int i_APCI1710_InsnConfigInitTimer(struct comedi_device *dev, struct comedi_subdevice *s, |
223 | struct comedi_insn * insn, unsigned int * data) | 223 | struct comedi_insn *insn, unsigned int *data) |
224 | { | 224 | { |
225 | 225 | ||
226 | int i_ReturnValue = 0; | 226 | int i_ReturnValue = 0; |
@@ -448,9 +448,9 @@ i_ReturnValue=insn->n; | |||
448 | +----------------------------------------------------------------------------+ | 448 | +----------------------------------------------------------------------------+ |
449 | */ | 449 | */ |
450 | 450 | ||
451 | int i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev, | 451 | int i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev, |
452 | struct comedi_subdevice * s, | 452 | struct comedi_subdevice *s, |
453 | struct comedi_insn * insn, unsigned int * data) | 453 | struct comedi_insn *insn, unsigned int *data) |
454 | { | 454 | { |
455 | int i_ReturnValue = 0; | 455 | int i_ReturnValue = 0; |
456 | unsigned int dw_DummyRead; | 456 | unsigned int dw_DummyRead; |
@@ -595,7 +595,7 @@ int i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_su | |||
595 | { | 595 | { |
596 | int i_ReturnValue = 0; | 596 | int i_ReturnValue = 0; |
597 | unsigned char b_ModulNbr, b_ReadType; | 597 | unsigned char b_ModulNbr, b_ReadType; |
598 | unsigned int * pul_TimerValueArray; | 598 | unsigned int *pul_TimerValueArray; |
599 | 599 | ||
600 | b_ModulNbr = CR_AREF(insn->chanspec); | 600 | b_ModulNbr = CR_AREF(insn->chanspec); |
601 | b_ReadType = CR_CHAN(insn->chanspec); | 601 | b_ReadType = CR_CHAN(insn->chanspec); |
@@ -681,8 +681,8 @@ struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | |||
681 | +----------------------------------------------------------------------------+ | 681 | +----------------------------------------------------------------------------+ |
682 | */ | 682 | */ |
683 | 683 | ||
684 | int i_APCI1710_InsnBitsTimer(struct comedi_device * dev, struct comedi_subdevice * s, | 684 | int i_APCI1710_InsnBitsTimer(struct comedi_device *dev, struct comedi_subdevice *s, |
685 | struct comedi_insn * insn, unsigned int * data) | 685 | struct comedi_insn *insn, unsigned int *data) |
686 | { | 686 | { |
687 | unsigned char b_BitsType; | 687 | unsigned char b_BitsType; |
688 | int i_ReturnValue = 0; | 688 | int i_ReturnValue = 0; |
@@ -760,9 +760,9 @@ int i_APCI1710_InsnBitsTimer(struct comedi_device * dev, struct comedi_subdevice | |||
760 | +----------------------------------------------------------------------------+ | 760 | +----------------------------------------------------------------------------+ |
761 | */ | 761 | */ |
762 | 762 | ||
763 | int i_APCI1710_ReadTimerValue(struct comedi_device * dev, | 763 | int i_APCI1710_ReadTimerValue(struct comedi_device *dev, |
764 | unsigned char b_ModulNbr, unsigned char b_TimerNbr, | 764 | unsigned char b_ModulNbr, unsigned char b_TimerNbr, |
765 | unsigned int * pul_TimerValue) | 765 | unsigned int *pul_TimerValue) |
766 | { | 766 | { |
767 | int i_ReturnValue = 0; | 767 | int i_ReturnValue = 0; |
768 | 768 | ||
@@ -848,9 +848,9 @@ int i_APCI1710_ReadTimerValue(struct comedi_device * dev, | |||
848 | +----------------------------------------------------------------------------+ | 848 | +----------------------------------------------------------------------------+ |
849 | */ | 849 | */ |
850 | 850 | ||
851 | int i_APCI1710_GetTimerOutputLevel(struct comedi_device * dev, | 851 | int i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev, |
852 | unsigned char b_ModulNbr, unsigned char b_TimerNbr, | 852 | unsigned char b_ModulNbr, unsigned char b_TimerNbr, |
853 | unsigned char * pb_OutputLevel) | 853 | unsigned char *pb_OutputLevel) |
854 | { | 854 | { |
855 | int i_ReturnValue = 0; | 855 | int i_ReturnValue = 0; |
856 | unsigned int dw_TimerStatus; | 856 | unsigned int dw_TimerStatus; |
@@ -929,7 +929,7 @@ int i_APCI1710_GetTimerOutputLevel(struct comedi_device * dev, | |||
929 | 929 | ||
930 | int i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev, | 930 | int i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev, |
931 | unsigned char b_ModulNbr, unsigned char b_TimerNbr, | 931 | unsigned char b_ModulNbr, unsigned char b_TimerNbr, |
932 | unsigned char * pb_TimerStatus) | 932 | unsigned char *pb_TimerStatus) |
933 | { | 933 | { |
934 | int i_ReturnValue = 0; | 934 | int i_ReturnValue = 0; |
935 | unsigned int dw_TimerStatus; | 935 | unsigned int dw_TimerStatus; |
@@ -1006,7 +1006,7 @@ int i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev, | |||
1006 | +----------------------------------------------------------------------------+ | 1006 | +----------------------------------------------------------------------------+ |
1007 | */ | 1007 | */ |
1008 | 1008 | ||
1009 | int i_APCI1710_WriteTimerValue(struct comedi_device * dev, | 1009 | int i_APCI1710_WriteTimerValue(struct comedi_device *dev, |
1010 | unsigned char b_ModulNbr, unsigned char b_TimerNbr, | 1010 | unsigned char b_ModulNbr, unsigned char b_TimerNbr, |
1011 | unsigned int ul_WriteValue) | 1011 | unsigned int ul_WriteValue) |
1012 | { | 1012 | { |
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h index cf6de0912a2..9698ae13509 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h | |||
@@ -55,15 +55,15 @@ int i_APCI1710_InsnBitsTimer(struct comedi_device *dev, struct comedi_subdevice | |||
55 | */ | 55 | */ |
56 | int i_APCI1710_ReadTimerValue(struct comedi_device *dev, | 56 | int i_APCI1710_ReadTimerValue(struct comedi_device *dev, |
57 | unsigned char b_ModulNbr, unsigned char b_TimerNbr, | 57 | unsigned char b_ModulNbr, unsigned char b_TimerNbr, |
58 | unsigned int * pul_TimerValue); | 58 | unsigned int *pul_TimerValue); |
59 | 59 | ||
60 | int i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev, | 60 | int i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev, |
61 | unsigned char b_ModulNbr, unsigned char b_TimerNbr, | 61 | unsigned char b_ModulNbr, unsigned char b_TimerNbr, |
62 | unsigned char * pb_OutputLevel); | 62 | unsigned char *pb_OutputLevel); |
63 | 63 | ||
64 | int i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev, | 64 | int i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev, |
65 | unsigned char b_ModulNbr, unsigned char b_TimerNbr, | 65 | unsigned char b_ModulNbr, unsigned char b_TimerNbr, |
66 | unsigned char * pb_TimerStatus); | 66 | unsigned char *pb_TimerStatus); |
67 | 67 | ||
68 | /* | 68 | /* |
69 | * 82X54 WRITE FUNCTION | 69 | * 82X54 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 6c3be314303..3bbf7d7da63 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c | |||
@@ -131,8 +131,8 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | |||
131 | +----------------------------------------------------------------------------+ | 131 | +----------------------------------------------------------------------------+ |
132 | */ | 132 | */ |
133 | 133 | ||
134 | int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_subdevice * s, | 134 | int i_APCI1710_InsnConfigInitChrono(struct comedi_device *dev, struct comedi_subdevice *s, |
135 | struct comedi_insn * insn, unsigned int * data) | 135 | struct comedi_insn *insn, unsigned int *data) |
136 | { | 136 | { |
137 | int i_ReturnValue = 0; | 137 | int i_ReturnValue = 0; |
138 | unsigned int ul_TimerValue = 0; | 138 | unsigned int ul_TimerValue = 0; |
@@ -840,8 +840,8 @@ struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | | |||
840 | +----------------------------------------------------------------------------+ | 840 | +----------------------------------------------------------------------------+ |
841 | */ | 841 | */ |
842 | 842 | ||
843 | int i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device * dev, | 843 | int i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev, |
844 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 844 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
845 | { | 845 | { |
846 | int i_ReturnValue = 0; | 846 | int i_ReturnValue = 0; |
847 | unsigned char b_ModulNbr, b_CycleMode, b_InterruptEnable, b_Action; | 847 | unsigned char b_ModulNbr, b_CycleMode, b_InterruptEnable, b_Action; |
@@ -1090,8 +1090,8 @@ struct comedi_insn *insn,unsigned int *data) | | |||
1090 | +----------------------------------------------------------------------------+ | 1090 | +----------------------------------------------------------------------------+ |
1091 | */ | 1091 | */ |
1092 | 1092 | ||
1093 | int i_APCI1710_InsnReadChrono(struct comedi_device * dev, struct comedi_subdevice * s, | 1093 | int i_APCI1710_InsnReadChrono(struct comedi_device *dev, struct comedi_subdevice *s, |
1094 | struct comedi_insn * insn, unsigned int * data) | 1094 | struct comedi_insn *insn, unsigned int *data) |
1095 | { | 1095 | { |
1096 | unsigned char b_ReadType; | 1096 | unsigned char b_ReadType; |
1097 | int i_ReturnValue = insn->n; | 1097 | int i_ReturnValue = insn->n; |
@@ -1194,8 +1194,8 @@ int i_APCI1710_InsnReadChrono(struct comedi_device * dev, struct comedi_subdevic | |||
1194 | +----------------------------------------------------------------------------+ | 1194 | +----------------------------------------------------------------------------+ |
1195 | */ | 1195 | */ |
1196 | 1196 | ||
1197 | int i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev, | 1197 | int i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev, |
1198 | unsigned char b_ModulNbr, unsigned char * pb_ChronoStatus) | 1198 | unsigned char b_ModulNbr, unsigned char *pb_ChronoStatus) |
1199 | { | 1199 | { |
1200 | int i_ReturnValue = 0; | 1200 | int i_ReturnValue = 0; |
1201 | unsigned int dw_Status; | 1201 | unsigned int dw_Status; |
@@ -1355,9 +1355,9 @@ int i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev, | |||
1355 | +----------------------------------------------------------------------------+ | 1355 | +----------------------------------------------------------------------------+ |
1356 | */ | 1356 | */ |
1357 | 1357 | ||
1358 | int i_APCI1710_ReadChronoValue(struct comedi_device * dev, | 1358 | int i_APCI1710_ReadChronoValue(struct comedi_device *dev, |
1359 | unsigned char b_ModulNbr, | 1359 | unsigned char b_ModulNbr, |
1360 | unsigned int ui_TimeOut, unsigned char * pb_ChronoStatus, unsigned int * pul_ChronoValue) | 1360 | unsigned int ui_TimeOut, unsigned char *pb_ChronoStatus, unsigned int *pul_ChronoValue) |
1361 | { | 1361 | { |
1362 | int i_ReturnValue = 0; | 1362 | int i_ReturnValue = 0; |
1363 | unsigned int dw_Status; | 1363 | unsigned int dw_Status; |
@@ -1619,13 +1619,13 @@ int i_APCI1710_ReadChronoValue(struct comedi_device * dev, | |||
1619 | +----------------------------------------------------------------------------+ | 1619 | +----------------------------------------------------------------------------+ |
1620 | */ | 1620 | */ |
1621 | 1621 | ||
1622 | int i_APCI1710_ConvertChronoValue(struct comedi_device * dev, | 1622 | int i_APCI1710_ConvertChronoValue(struct comedi_device *dev, |
1623 | unsigned char b_ModulNbr, | 1623 | unsigned char b_ModulNbr, |
1624 | unsigned int ul_ChronoValue, | 1624 | unsigned int ul_ChronoValue, |
1625 | unsigned int * pul_Hour, | 1625 | unsigned int *pul_Hour, |
1626 | unsigned char * pb_Minute, | 1626 | unsigned char *pb_Minute, |
1627 | unsigned char * pb_Second, | 1627 | unsigned char *pb_Second, |
1628 | unsigned int * pui_MilliSecond, unsigned int * pui_MicroSecond, unsigned int * pui_NanoSecond) | 1628 | unsigned int *pui_MilliSecond, unsigned int *pui_MicroSecond, unsigned int *pui_NanoSecond) |
1629 | { | 1629 | { |
1630 | int i_ReturnValue = 0; | 1630 | int i_ReturnValue = 0; |
1631 | double d_Hour; | 1631 | double d_Hour; |
@@ -1876,14 +1876,14 @@ int i_APCI1710_ConvertChronoValue(struct comedi_device * dev, | |||
1876 | +----------------------------------------------------------------------------+ | 1876 | +----------------------------------------------------------------------------+ |
1877 | */ | 1877 | */ |
1878 | 1878 | ||
1879 | int i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device * dev, | 1879 | int i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev, |
1880 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1880 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1881 | { | 1881 | { |
1882 | int i_ReturnValue = 0; | 1882 | int i_ReturnValue = 0; |
1883 | unsigned char b_ModulNbr, b_OutputChannel, b_InputChannel, b_IOType; | 1883 | unsigned char b_ModulNbr, b_OutputChannel, b_InputChannel, b_IOType; |
1884 | unsigned int dw_Status; | 1884 | unsigned int dw_Status; |
1885 | unsigned char * pb_ChannelStatus; | 1885 | unsigned char *pb_ChannelStatus; |
1886 | unsigned char * pb_PortValue; | 1886 | unsigned char *pb_PortValue; |
1887 | 1887 | ||
1888 | b_ModulNbr = CR_AREF(insn->chanspec); | 1888 | b_ModulNbr = CR_AREF(insn->chanspec); |
1889 | i_ReturnValue = insn->n; | 1889 | i_ReturnValue = insn->n; |
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h index 16c6aff8859..29bad1d144a 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h | |||
@@ -50,21 +50,21 @@ int i_APCI1710_InsnReadChrono(struct comedi_device *dev, struct comedi_subdevice | |||
50 | struct comedi_insn *insn, unsigned int *data); | 50 | struct comedi_insn *insn, unsigned int *data); |
51 | 51 | ||
52 | int i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev, | 52 | int i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev, |
53 | unsigned char b_ModulNbr, unsigned char * pb_ChronoStatus); | 53 | unsigned char b_ModulNbr, unsigned char *pb_ChronoStatus); |
54 | 54 | ||
55 | int i_APCI1710_ReadChronoValue(struct comedi_device *dev, | 55 | int i_APCI1710_ReadChronoValue(struct comedi_device *dev, |
56 | unsigned char b_ModulNbr, | 56 | unsigned char b_ModulNbr, |
57 | unsigned int ui_TimeOut, unsigned char * pb_ChronoStatus, | 57 | unsigned int ui_TimeOut, unsigned char *pb_ChronoStatus, |
58 | unsigned int * pul_ChronoValue); | 58 | unsigned int *pul_ChronoValue); |
59 | 59 | ||
60 | int i_APCI1710_ConvertChronoValue(struct comedi_device *dev, | 60 | int i_APCI1710_ConvertChronoValue(struct comedi_device *dev, |
61 | unsigned char b_ModulNbr, | 61 | unsigned char b_ModulNbr, |
62 | unsigned int ul_ChronoValue, | 62 | unsigned int ul_ChronoValue, |
63 | unsigned int * pul_Hour, | 63 | unsigned int *pul_Hour, |
64 | unsigned char * pb_Minute, | 64 | unsigned char *pb_Minute, |
65 | unsigned char * pb_Second, | 65 | unsigned char *pb_Second, |
66 | unsigned int * pui_MilliSecond, unsigned int * pui_MicroSecond, | 66 | unsigned int *pui_MilliSecond, unsigned int *pui_MicroSecond, |
67 | unsigned int * pui_NanoSecond); | 67 | unsigned int *pui_NanoSecond); |
68 | 68 | ||
69 | /* | 69 | /* |
70 | * CHRONOMETER DIGITAL INPUT OUTPUT FUNCTION | 70 | * CHRONOMETER DIGITAL INPUT OUTPUT FUNCTION |
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 a3266ba9284..aad76fb8ea4 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c | |||
@@ -99,8 +99,8 @@ Activates and deactivates the digital output memory. | |||
99 | +----------------------------------------------------------------------------+ | 99 | +----------------------------------------------------------------------------+ |
100 | */ | 100 | */ |
101 | 101 | ||
102 | int i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_subdevice * s, | 102 | int i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, struct comedi_subdevice *s, |
103 | struct comedi_insn * insn, unsigned int * data) | 103 | struct comedi_insn *insn, unsigned int *data) |
104 | { | 104 | { |
105 | unsigned char b_ModulNbr, b_ChannelAMode, b_ChannelBMode; | 105 | unsigned char b_ModulNbr, b_ChannelAMode, b_ChannelBMode; |
106 | unsigned char b_MemoryOnOff, b_ConfigType; | 106 | unsigned char b_MemoryOnOff, b_ConfigType; |
@@ -293,13 +293,13 @@ int i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_sub | |||
293 | * unsigned char_ b_ModulNbr, unsigned char_ b_InputChannel, | 293 | * unsigned char_ b_ModulNbr, unsigned char_ b_InputChannel, |
294 | * unsigned char *_ pb_ChannelStatus) | 294 | * unsigned char *_ pb_ChannelStatus) |
295 | */ | 295 | */ |
296 | int i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev, | 296 | int i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev, |
297 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 297 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
298 | { | 298 | { |
299 | int i_ReturnValue = 0; | 299 | int i_ReturnValue = 0; |
300 | unsigned int dw_StatusReg; | 300 | unsigned int dw_StatusReg; |
301 | unsigned char b_ModulNbr, b_InputChannel; | 301 | unsigned char b_ModulNbr, b_InputChannel; |
302 | unsigned char * pb_ChannelStatus; | 302 | unsigned char *pb_ChannelStatus; |
303 | b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec); | 303 | b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec); |
304 | b_InputChannel = (unsigned char) CR_CHAN(insn->chanspec); | 304 | b_InputChannel = (unsigned char) CR_CHAN(insn->chanspec); |
305 | data[0] = 0; | 305 | data[0] = 0; |
@@ -481,8 +481,8 @@ int i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev, | |||
481 | * _INT_ i_APCI1710_SetDigitalIOChlOn (unsigned char_ b_BoardHandle, | 481 | * _INT_ i_APCI1710_SetDigitalIOChlOn (unsigned char_ b_BoardHandle, |
482 | * unsigned char_ b_ModulNbr, unsigned char_ b_OutputChannel) | 482 | * unsigned char_ b_ModulNbr, unsigned char_ b_OutputChannel) |
483 | */ | 483 | */ |
484 | int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev, | 484 | int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev, |
485 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 485 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
486 | { | 486 | { |
487 | int i_ReturnValue = 0; | 487 | int i_ReturnValue = 0; |
488 | unsigned int dw_WriteValue = 0; | 488 | unsigned int dw_WriteValue = 0; |
@@ -731,8 +731,8 @@ int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev, | |||
731 | * b_BoardHandle, unsigned char_ b_ModulNbr, unsigned char_ | 731 | * b_BoardHandle, unsigned char_ b_ModulNbr, unsigned char_ |
732 | * b_PortValue) | 732 | * b_PortValue) |
733 | */ | 733 | */ |
734 | int i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device * dev, | 734 | int i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device *dev, |
735 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 735 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
736 | { | 736 | { |
737 | int i_ReturnValue = 0; | 737 | int i_ReturnValue = 0; |
738 | unsigned int dw_WriteValue = 0; | 738 | unsigned int dw_WriteValue = 0; |
@@ -740,7 +740,7 @@ int i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device * dev, | |||
740 | unsigned char b_ModulNbr, b_PortValue; | 740 | unsigned char b_ModulNbr, b_PortValue; |
741 | unsigned char b_PortOperation, b_PortOnOFF; | 741 | unsigned char b_PortOperation, b_PortOnOFF; |
742 | 742 | ||
743 | unsigned char * pb_PortValue; | 743 | unsigned char *pb_PortValue; |
744 | 744 | ||
745 | b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec); | 745 | b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec); |
746 | b_PortOperation = (unsigned char) data[0]; /* Input or output */ | 746 | b_PortOperation = (unsigned char) data[0]; /* Input or output */ |
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c index 821edbae3f2..29ba78f0939 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c | |||
@@ -75,8 +75,8 @@ struct comedi_insn *insn,unsigned int *data) | |||
75 | +----------------------------------------------------------------------------+ | 75 | +----------------------------------------------------------------------------+ |
76 | */ | 76 | */ |
77 | 77 | ||
78 | int i_APCI1710_InsnConfigINCCPT(struct comedi_device * dev, struct comedi_subdevice * s, | 78 | int i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev, struct comedi_subdevice *s, |
79 | struct comedi_insn * insn, unsigned int * data) | 79 | struct comedi_insn *insn, unsigned int *data) |
80 | { | 80 | { |
81 | unsigned int ui_ConfigType; | 81 | unsigned int ui_ConfigType; |
82 | int i_ReturnValue = 0; | 82 | int i_ReturnValue = 0; |
@@ -299,7 +299,7 @@ int i_APCI1710_InsnConfigINCCPT(struct comedi_device * dev, struct comedi_subdev | |||
299 | +----------------------------------------------------------------------------+ | 299 | +----------------------------------------------------------------------------+ |
300 | */ | 300 | */ |
301 | 301 | ||
302 | int i_APCI1710_InitCounter(struct comedi_device * dev, | 302 | int i_APCI1710_InitCounter(struct comedi_device *dev, |
303 | unsigned char b_ModulNbr, | 303 | unsigned char b_ModulNbr, |
304 | unsigned char b_CounterRange, | 304 | unsigned char b_CounterRange, |
305 | unsigned char b_FirstCounterModus, | 305 | unsigned char b_FirstCounterModus, |
@@ -545,7 +545,7 @@ int i_APCI1710_InitCounter(struct comedi_device * dev, | |||
545 | +----------------------------------------------------------------------------+ | 545 | +----------------------------------------------------------------------------+ |
546 | */ | 546 | */ |
547 | 547 | ||
548 | int i_APCI1710_CounterAutoTest(struct comedi_device * dev, unsigned char * pb_TestStatus) | 548 | int i_APCI1710_CounterAutoTest(struct comedi_device *dev, unsigned char *pb_TestStatus) |
549 | { | 549 | { |
550 | unsigned char b_ModulCpt = 0; | 550 | unsigned char b_ModulCpt = 0; |
551 | int i_ReturnValue = 0; | 551 | int i_ReturnValue = 0; |
@@ -708,7 +708,7 @@ int i_APCI1710_CounterAutoTest(struct comedi_device * dev, unsigned char * pb_Te | |||
708 | +----------------------------------------------------------------------------+ | 708 | +----------------------------------------------------------------------------+ |
709 | */ | 709 | */ |
710 | 710 | ||
711 | int i_APCI1710_InitIndex(struct comedi_device * dev, | 711 | int i_APCI1710_InitIndex(struct comedi_device *dev, |
712 | unsigned char b_ModulNbr, | 712 | unsigned char b_ModulNbr, |
713 | unsigned char b_ReferenceAction, | 713 | unsigned char b_ReferenceAction, |
714 | unsigned char b_IndexOperation, unsigned char b_AutoMode, unsigned char b_InterruptEnable) | 714 | unsigned char b_IndexOperation, unsigned char b_AutoMode, unsigned char b_InterruptEnable) |
@@ -1152,7 +1152,7 @@ int i_APCI1710_InitIndex(struct comedi_device * dev, | |||
1152 | +----------------------------------------------------------------------------+ | 1152 | +----------------------------------------------------------------------------+ |
1153 | */ | 1153 | */ |
1154 | 1154 | ||
1155 | int i_APCI1710_InitReference(struct comedi_device * dev, | 1155 | int i_APCI1710_InitReference(struct comedi_device *dev, |
1156 | unsigned char b_ModulNbr, unsigned char b_ReferenceLevel) | 1156 | unsigned char b_ModulNbr, unsigned char b_ReferenceLevel) |
1157 | { | 1157 | { |
1158 | int i_ReturnValue = 0; | 1158 | int i_ReturnValue = 0; |
@@ -1277,7 +1277,7 @@ int i_APCI1710_InitReference(struct comedi_device * dev, | |||
1277 | +----------------------------------------------------------------------------+ | 1277 | +----------------------------------------------------------------------------+ |
1278 | */ | 1278 | */ |
1279 | 1279 | ||
1280 | int i_APCI1710_InitExternalStrobe(struct comedi_device * dev, | 1280 | int i_APCI1710_InitExternalStrobe(struct comedi_device *dev, |
1281 | unsigned char b_ModulNbr, unsigned char b_ExternalStrobe, unsigned char b_ExternalStrobeLevel) | 1281 | unsigned char b_ModulNbr, unsigned char b_ExternalStrobe, unsigned char b_ExternalStrobeLevel) |
1282 | { | 1282 | { |
1283 | int i_ReturnValue = 0; | 1283 | int i_ReturnValue = 0; |
@@ -1391,7 +1391,7 @@ int i_APCI1710_InitExternalStrobe(struct comedi_device * dev, | |||
1391 | +----------------------------------------------------------------------------+ | 1391 | +----------------------------------------------------------------------------+ |
1392 | */ | 1392 | */ |
1393 | 1393 | ||
1394 | int i_APCI1710_InitCompareLogic(struct comedi_device * dev, | 1394 | int i_APCI1710_InitCompareLogic(struct comedi_device *dev, |
1395 | unsigned char b_ModulNbr, unsigned int ui_CompareValue) | 1395 | unsigned char b_ModulNbr, unsigned int ui_CompareValue) |
1396 | { | 1396 | { |
1397 | int i_ReturnValue = 0; | 1397 | int i_ReturnValue = 0; |
@@ -1487,11 +1487,11 @@ int i_APCI1710_InitCompareLogic(struct comedi_device * dev, | |||
1487 | +----------------------------------------------------------------------------+ | 1487 | +----------------------------------------------------------------------------+ |
1488 | */ | 1488 | */ |
1489 | 1489 | ||
1490 | int i_APCI1710_InitFrequencyMeasurement(struct comedi_device * dev, | 1490 | int i_APCI1710_InitFrequencyMeasurement(struct comedi_device *dev, |
1491 | unsigned char b_ModulNbr, | 1491 | unsigned char b_ModulNbr, |
1492 | unsigned char b_PCIInputClock, | 1492 | unsigned char b_PCIInputClock, |
1493 | unsigned char b_TimingUnity, | 1493 | unsigned char b_TimingUnity, |
1494 | unsigned int ul_TimingInterval, unsigned int * pul_RealTimingInterval) | 1494 | unsigned int ul_TimingInterval, unsigned int *pul_RealTimingInterval) |
1495 | { | 1495 | { |
1496 | int i_ReturnValue = 0; | 1496 | int i_ReturnValue = 0; |
1497 | unsigned int ul_TimerValue = 0; | 1497 | unsigned int ul_TimerValue = 0; |
@@ -2015,8 +2015,8 @@ struct comedi_insn *insn,unsigned int *data) | | |||
2015 | +----------------------------------------------------------------------------+ | 2015 | +----------------------------------------------------------------------------+ |
2016 | */ | 2016 | */ |
2017 | 2017 | ||
2018 | int i_APCI1710_InsnBitsINCCPT(struct comedi_device * dev, struct comedi_subdevice * s, | 2018 | int i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev, struct comedi_subdevice *s, |
2019 | struct comedi_insn * insn, unsigned int * data) | 2019 | struct comedi_insn *insn, unsigned int *data) |
2020 | { | 2020 | { |
2021 | unsigned int ui_BitsType; | 2021 | unsigned int ui_BitsType; |
2022 | int i_ReturnValue = 0; | 2022 | int i_ReturnValue = 0; |
@@ -2091,7 +2091,7 @@ int i_APCI1710_InsnBitsINCCPT(struct comedi_device * dev, struct comedi_subdevic | |||
2091 | +----------------------------------------------------------------------------+ | 2091 | +----------------------------------------------------------------------------+ |
2092 | */ | 2092 | */ |
2093 | 2093 | ||
2094 | int i_APCI1710_ClearCounterValue(struct comedi_device * dev, unsigned char b_ModulNbr) | 2094 | int i_APCI1710_ClearCounterValue(struct comedi_device *dev, unsigned char b_ModulNbr) |
2095 | { | 2095 | { |
2096 | int i_ReturnValue = 0; | 2096 | int i_ReturnValue = 0; |
2097 | 2097 | ||
@@ -2151,7 +2151,7 @@ int i_APCI1710_ClearCounterValue(struct comedi_device * dev, unsigned char b_Mod | |||
2151 | +----------------------------------------------------------------------------+ | 2151 | +----------------------------------------------------------------------------+ |
2152 | */ | 2152 | */ |
2153 | 2153 | ||
2154 | int i_APCI1710_ClearAllCounterValue(struct comedi_device * dev) | 2154 | int i_APCI1710_ClearAllCounterValue(struct comedi_device *dev) |
2155 | { | 2155 | { |
2156 | unsigned char b_ModulCpt = 0; | 2156 | unsigned char b_ModulCpt = 0; |
2157 | int i_ReturnValue = 0; | 2157 | int i_ReturnValue = 0; |
@@ -2297,7 +2297,7 @@ int i_APCI1710_ClearAllCounterValue(struct comedi_device * dev) | |||
2297 | +----------------------------------------------------------------------------+ | 2297 | +----------------------------------------------------------------------------+ |
2298 | */ | 2298 | */ |
2299 | 2299 | ||
2300 | int i_APCI1710_SetInputFilter(struct comedi_device * dev, | 2300 | int i_APCI1710_SetInputFilter(struct comedi_device *dev, |
2301 | unsigned char b_ModulNbr, unsigned char b_PCIInputClock, unsigned char b_Filter) | 2301 | unsigned char b_ModulNbr, unsigned char b_PCIInputClock, unsigned char b_Filter) |
2302 | { | 2302 | { |
2303 | int i_ReturnValue = 0; | 2303 | int i_ReturnValue = 0; |
@@ -2561,7 +2561,7 @@ int i_APCI1710_SetInputFilter(struct comedi_device * dev, | |||
2561 | +----------------------------------------------------------------------------+ | 2561 | +----------------------------------------------------------------------------+ |
2562 | */ | 2562 | */ |
2563 | 2563 | ||
2564 | int i_APCI1710_LatchCounter(struct comedi_device * dev, | 2564 | int i_APCI1710_LatchCounter(struct comedi_device *dev, |
2565 | unsigned char b_ModulNbr, unsigned char b_LatchReg) | 2565 | unsigned char b_ModulNbr, unsigned char b_LatchReg) |
2566 | { | 2566 | { |
2567 | int i_ReturnValue = 0; | 2567 | int i_ReturnValue = 0; |
@@ -2658,7 +2658,7 @@ int i_APCI1710_LatchCounter(struct comedi_device * dev, | |||
2658 | +----------------------------------------------------------------------------+ | 2658 | +----------------------------------------------------------------------------+ |
2659 | */ | 2659 | */ |
2660 | 2660 | ||
2661 | int i_APCI1710_SetIndexAndReferenceSource(struct comedi_device * dev, | 2661 | int i_APCI1710_SetIndexAndReferenceSource(struct comedi_device *dev, |
2662 | unsigned char b_ModulNbr, unsigned char b_SourceSelection) | 2662 | unsigned char b_ModulNbr, unsigned char b_SourceSelection) |
2663 | { | 2663 | { |
2664 | int i_ReturnValue = 0; | 2664 | int i_ReturnValue = 0; |
@@ -2795,7 +2795,7 @@ int i_APCI1710_SetIndexAndReferenceSource(struct comedi_device * dev, | |||
2795 | +----------------------------------------------------------------------------+ | 2795 | +----------------------------------------------------------------------------+ |
2796 | */ | 2796 | */ |
2797 | 2797 | ||
2798 | int i_APCI1710_SetDigitalChlOn(struct comedi_device * dev, unsigned char b_ModulNbr) | 2798 | int i_APCI1710_SetDigitalChlOn(struct comedi_device *dev, unsigned char b_ModulNbr) |
2799 | { | 2799 | { |
2800 | int i_ReturnValue = 0; | 2800 | int i_ReturnValue = 0; |
2801 | 2801 | ||
@@ -2875,7 +2875,7 @@ int i_APCI1710_SetDigitalChlOn(struct comedi_device * dev, unsigned char b_Modul | |||
2875 | +----------------------------------------------------------------------------+ | 2875 | +----------------------------------------------------------------------------+ |
2876 | */ | 2876 | */ |
2877 | 2877 | ||
2878 | int i_APCI1710_SetDigitalChlOff(struct comedi_device * dev, unsigned char b_ModulNbr) | 2878 | int i_APCI1710_SetDigitalChlOff(struct comedi_device *dev, unsigned char b_ModulNbr) |
2879 | { | 2879 | { |
2880 | int i_ReturnValue = 0; | 2880 | int i_ReturnValue = 0; |
2881 | 2881 | ||
@@ -2951,8 +2951,8 @@ struct comedi_insn *insn,unsigned int *data) | | |||
2951 | | Return Value : | 2951 | | Return Value : |
2952 | +----------------------------------------------------------------------------+ | 2952 | +----------------------------------------------------------------------------+ |
2953 | */ | 2953 | */ |
2954 | int i_APCI1710_InsnWriteINCCPT(struct comedi_device * dev, struct comedi_subdevice * s, | 2954 | int i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev, struct comedi_subdevice *s, |
2955 | struct comedi_insn * insn, unsigned int * data) | 2955 | struct comedi_insn *insn, unsigned int *data) |
2956 | { | 2956 | { |
2957 | unsigned int ui_WriteType; | 2957 | unsigned int ui_WriteType; |
2958 | int i_ReturnValue = 0; | 2958 | int i_ReturnValue = 0; |
@@ -3047,7 +3047,7 @@ int i_APCI1710_InsnWriteINCCPT(struct comedi_device * dev, struct comedi_subdevi | |||
3047 | +----------------------------------------------------------------------------+ | 3047 | +----------------------------------------------------------------------------+ |
3048 | */ | 3048 | */ |
3049 | 3049 | ||
3050 | int i_APCI1710_EnableLatchInterrupt(struct comedi_device * dev, unsigned char b_ModulNbr) | 3050 | int i_APCI1710_EnableLatchInterrupt(struct comedi_device *dev, unsigned char b_ModulNbr) |
3051 | { | 3051 | { |
3052 | int i_ReturnValue = 0; | 3052 | int i_ReturnValue = 0; |
3053 | 3053 | ||
@@ -3133,7 +3133,7 @@ int i_APCI1710_EnableLatchInterrupt(struct comedi_device * dev, unsigned char b_ | |||
3133 | +----------------------------------------------------------------------------+ | 3133 | +----------------------------------------------------------------------------+ |
3134 | */ | 3134 | */ |
3135 | 3135 | ||
3136 | int i_APCI1710_DisableLatchInterrupt(struct comedi_device * dev, unsigned char b_ModulNbr) | 3136 | int i_APCI1710_DisableLatchInterrupt(struct comedi_device *dev, unsigned char b_ModulNbr) |
3137 | { | 3137 | { |
3138 | int i_ReturnValue = 0; | 3138 | int i_ReturnValue = 0; |
3139 | 3139 | ||
@@ -3231,7 +3231,7 @@ int i_APCI1710_DisableLatchInterrupt(struct comedi_device * dev, unsigned char b | |||
3231 | +----------------------------------------------------------------------------+ | 3231 | +----------------------------------------------------------------------------+ |
3232 | */ | 3232 | */ |
3233 | 3233 | ||
3234 | int i_APCI1710_Write16BitCounterValue(struct comedi_device * dev, | 3234 | int i_APCI1710_Write16BitCounterValue(struct comedi_device *dev, |
3235 | unsigned char b_ModulNbr, unsigned char b_SelectedCounter, unsigned int ui_WriteValue) | 3235 | unsigned char b_ModulNbr, unsigned char b_SelectedCounter, unsigned int ui_WriteValue) |
3236 | { | 3236 | { |
3237 | int i_ReturnValue = 0; | 3237 | int i_ReturnValue = 0; |
@@ -3316,7 +3316,7 @@ int i_APCI1710_Write16BitCounterValue(struct comedi_device * dev, | |||
3316 | +----------------------------------------------------------------------------+ | 3316 | +----------------------------------------------------------------------------+ |
3317 | */ | 3317 | */ |
3318 | 3318 | ||
3319 | int i_APCI1710_Write32BitCounterValue(struct comedi_device * dev, | 3319 | int i_APCI1710_Write32BitCounterValue(struct comedi_device *dev, |
3320 | unsigned char b_ModulNbr, unsigned int ul_WriteValue) | 3320 | unsigned char b_ModulNbr, unsigned int ul_WriteValue) |
3321 | { | 3321 | { |
3322 | int i_ReturnValue = 0; | 3322 | int i_ReturnValue = 0; |
@@ -3383,7 +3383,7 @@ int i_APCI1710_Write32BitCounterValue(struct comedi_device * dev, | |||
3383 | +----------------------------------------------------------------------------+ | 3383 | +----------------------------------------------------------------------------+ |
3384 | */ | 3384 | */ |
3385 | 3385 | ||
3386 | int i_APCI1710_EnableIndex(struct comedi_device * dev, unsigned char b_ModulNbr) | 3386 | int i_APCI1710_EnableIndex(struct comedi_device *dev, unsigned char b_ModulNbr) |
3387 | { | 3387 | { |
3388 | int i_ReturnValue = 0; | 3388 | int i_ReturnValue = 0; |
3389 | unsigned int ul_InterruptLatchReg; | 3389 | unsigned int ul_InterruptLatchReg; |
@@ -3481,7 +3481,7 @@ int i_APCI1710_EnableIndex(struct comedi_device * dev, unsigned char b_ModulNbr) | |||
3481 | +----------------------------------------------------------------------------+ | 3481 | +----------------------------------------------------------------------------+ |
3482 | */ | 3482 | */ |
3483 | 3483 | ||
3484 | int i_APCI1710_DisableIndex(struct comedi_device * dev, unsigned char b_ModulNbr) | 3484 | int i_APCI1710_DisableIndex(struct comedi_device *dev, unsigned char b_ModulNbr) |
3485 | { | 3485 | { |
3486 | int i_ReturnValue = 0; | 3486 | int i_ReturnValue = 0; |
3487 | 3487 | ||
@@ -3580,7 +3580,7 @@ int i_APCI1710_DisableIndex(struct comedi_device * dev, unsigned char b_ModulNbr | |||
3580 | +----------------------------------------------------------------------------+ | 3580 | +----------------------------------------------------------------------------+ |
3581 | */ | 3581 | */ |
3582 | 3582 | ||
3583 | int i_APCI1710_EnableCompareLogic(struct comedi_device * dev, unsigned char b_ModulNbr) | 3583 | int i_APCI1710_EnableCompareLogic(struct comedi_device *dev, unsigned char b_ModulNbr) |
3584 | { | 3584 | { |
3585 | int i_ReturnValue = 0; | 3585 | int i_ReturnValue = 0; |
3586 | 3586 | ||
@@ -3680,7 +3680,7 @@ int i_APCI1710_EnableCompareLogic(struct comedi_device * dev, unsigned char b_Mo | |||
3680 | +----------------------------------------------------------------------------+ | 3680 | +----------------------------------------------------------------------------+ |
3681 | */ | 3681 | */ |
3682 | 3682 | ||
3683 | int i_APCI1710_DisableCompareLogic(struct comedi_device * dev, unsigned char b_ModulNbr) | 3683 | int i_APCI1710_DisableCompareLogic(struct comedi_device *dev, unsigned char b_ModulNbr) |
3684 | { | 3684 | { |
3685 | int i_ReturnValue = 0; | 3685 | int i_ReturnValue = 0; |
3686 | 3686 | ||
@@ -3789,7 +3789,7 @@ int i_APCI1710_DisableCompareLogic(struct comedi_device * dev, unsigned char b_M | |||
3789 | +----------------------------------------------------------------------------+ | 3789 | +----------------------------------------------------------------------------+ |
3790 | */ | 3790 | */ |
3791 | 3791 | ||
3792 | int i_APCI1710_EnableFrequencyMeasurement(struct comedi_device * dev, | 3792 | int i_APCI1710_EnableFrequencyMeasurement(struct comedi_device *dev, |
3793 | unsigned char b_ModulNbr, unsigned char b_InterruptEnable) | 3793 | unsigned char b_ModulNbr, unsigned char b_InterruptEnable) |
3794 | { | 3794 | { |
3795 | int i_ReturnValue = 0; | 3795 | int i_ReturnValue = 0; |
@@ -3936,7 +3936,7 @@ int i_APCI1710_EnableFrequencyMeasurement(struct comedi_device * dev, | |||
3936 | +----------------------------------------------------------------------------+ | 3936 | +----------------------------------------------------------------------------+ |
3937 | */ | 3937 | */ |
3938 | 3938 | ||
3939 | int i_APCI1710_DisableFrequencyMeasurement(struct comedi_device * dev, unsigned char b_ModulNbr) | 3939 | int i_APCI1710_DisableFrequencyMeasurement(struct comedi_device *dev, unsigned char b_ModulNbr) |
3940 | { | 3940 | { |
3941 | int i_ReturnValue = 0; | 3941 | int i_ReturnValue = 0; |
3942 | 3942 | ||
@@ -4049,8 +4049,8 @@ struct comedi_insn *insn,unsigned int *data) | | |||
4049 | | Return Value : | 4049 | | Return Value : |
4050 | +----------------------------------------------------------------------------+ | 4050 | +----------------------------------------------------------------------------+ |
4051 | */ | 4051 | */ |
4052 | int i_APCI1710_InsnReadINCCPT(struct comedi_device * dev, struct comedi_subdevice * s, | 4052 | int i_APCI1710_InsnReadINCCPT(struct comedi_device *dev, struct comedi_subdevice *s, |
4053 | struct comedi_insn * insn, unsigned int * data) | 4053 | struct comedi_insn *insn, unsigned int *data) |
4054 | { | 4054 | { |
4055 | unsigned int ui_ReadType; | 4055 | unsigned int ui_ReadType; |
4056 | int i_ReturnValue = 0; | 4056 | int i_ReturnValue = 0; |
@@ -4193,8 +4193,8 @@ int i_APCI1710_InsnReadINCCPT(struct comedi_device * dev, struct comedi_subdevic | |||
4193 | +----------------------------------------------------------------------------+ | 4193 | +----------------------------------------------------------------------------+ |
4194 | */ | 4194 | */ |
4195 | 4195 | ||
4196 | int i_APCI1710_ReadLatchRegisterStatus(struct comedi_device * dev, | 4196 | int i_APCI1710_ReadLatchRegisterStatus(struct comedi_device *dev, |
4197 | unsigned char b_ModulNbr, unsigned char b_LatchReg, unsigned char * pb_LatchStatus) | 4197 | unsigned char b_ModulNbr, unsigned char b_LatchReg, unsigned char *pb_LatchStatus) |
4198 | { | 4198 | { |
4199 | int i_ReturnValue = 0; | 4199 | int i_ReturnValue = 0; |
4200 | unsigned int dw_LatchReg; | 4200 | unsigned int dw_LatchReg; |
@@ -4280,8 +4280,8 @@ int i_APCI1710_ReadLatchRegisterStatus(struct comedi_device * dev, | |||
4280 | +----------------------------------------------------------------------------+ | 4280 | +----------------------------------------------------------------------------+ |
4281 | */ | 4281 | */ |
4282 | 4282 | ||
4283 | int i_APCI1710_ReadLatchRegisterValue(struct comedi_device * dev, | 4283 | int i_APCI1710_ReadLatchRegisterValue(struct comedi_device *dev, |
4284 | unsigned char b_ModulNbr, unsigned char b_LatchReg, unsigned int * pul_LatchValue) | 4284 | unsigned char b_ModulNbr, unsigned char b_LatchReg, unsigned int *pul_LatchValue) |
4285 | { | 4285 | { |
4286 | int i_ReturnValue = 0; | 4286 | int i_ReturnValue = 0; |
4287 | 4287 | ||
@@ -4364,8 +4364,8 @@ int i_APCI1710_ReadLatchRegisterValue(struct comedi_device * dev, | |||
4364 | +----------------------------------------------------------------------------+ | 4364 | +----------------------------------------------------------------------------+ |
4365 | */ | 4365 | */ |
4366 | 4366 | ||
4367 | int i_APCI1710_Read16BitCounterValue(struct comedi_device * dev, | 4367 | int i_APCI1710_Read16BitCounterValue(struct comedi_device *dev, |
4368 | unsigned char b_ModulNbr, unsigned char b_SelectedCounter, unsigned int * pui_CounterValue) | 4368 | unsigned char b_ModulNbr, unsigned char b_SelectedCounter, unsigned int *pui_CounterValue) |
4369 | { | 4369 | { |
4370 | int i_ReturnValue = 0; | 4370 | int i_ReturnValue = 0; |
4371 | unsigned int dw_LathchValue = 0; | 4371 | unsigned int dw_LathchValue = 0; |
@@ -4459,8 +4459,8 @@ int i_APCI1710_Read16BitCounterValue(struct comedi_device * dev, | |||
4459 | +----------------------------------------------------------------------------+ | 4459 | +----------------------------------------------------------------------------+ |
4460 | */ | 4460 | */ |
4461 | 4461 | ||
4462 | int i_APCI1710_Read32BitCounterValue(struct comedi_device * dev, | 4462 | int i_APCI1710_Read32BitCounterValue(struct comedi_device *dev, |
4463 | unsigned char b_ModulNbr, unsigned int * pul_CounterValue) | 4463 | unsigned char b_ModulNbr, unsigned int *pul_CounterValue) |
4464 | { | 4464 | { |
4465 | int i_ReturnValue = 0; | 4465 | int i_ReturnValue = 0; |
4466 | 4466 | ||
@@ -4535,8 +4535,8 @@ int i_APCI1710_Read32BitCounterValue(struct comedi_device * dev, | |||
4535 | +----------------------------------------------------------------------------+ | 4535 | +----------------------------------------------------------------------------+ |
4536 | */ | 4536 | */ |
4537 | 4537 | ||
4538 | int i_APCI1710_GetIndexStatus(struct comedi_device * dev, | 4538 | int i_APCI1710_GetIndexStatus(struct comedi_device *dev, |
4539 | unsigned char b_ModulNbr, unsigned char * pb_IndexStatus) | 4539 | unsigned char b_ModulNbr, unsigned char *pb_IndexStatus) |
4540 | { | 4540 | { |
4541 | int i_ReturnValue = 0; | 4541 | int i_ReturnValue = 0; |
4542 | unsigned int dw_StatusReg = 0; | 4542 | unsigned int dw_StatusReg = 0; |
@@ -4619,8 +4619,8 @@ int i_APCI1710_GetIndexStatus(struct comedi_device * dev, | |||
4619 | +----------------------------------------------------------------------------+ | 4619 | +----------------------------------------------------------------------------+ |
4620 | */ | 4620 | */ |
4621 | 4621 | ||
4622 | int i_APCI1710_GetReferenceStatus(struct comedi_device * dev, | 4622 | int i_APCI1710_GetReferenceStatus(struct comedi_device *dev, |
4623 | unsigned char b_ModulNbr, unsigned char * pb_ReferenceStatus) | 4623 | unsigned char b_ModulNbr, unsigned char *pb_ReferenceStatus) |
4624 | { | 4624 | { |
4625 | int i_ReturnValue = 0; | 4625 | int i_ReturnValue = 0; |
4626 | unsigned int dw_StatusReg = 0; | 4626 | unsigned int dw_StatusReg = 0; |
@@ -4703,8 +4703,8 @@ int i_APCI1710_GetReferenceStatus(struct comedi_device * dev, | |||
4703 | +----------------------------------------------------------------------------+ | 4703 | +----------------------------------------------------------------------------+ |
4704 | */ | 4704 | */ |
4705 | 4705 | ||
4706 | int i_APCI1710_GetUASStatus(struct comedi_device * dev, | 4706 | int i_APCI1710_GetUASStatus(struct comedi_device *dev, |
4707 | unsigned char b_ModulNbr, unsigned char * pb_UASStatus) | 4707 | unsigned char b_ModulNbr, unsigned char *pb_UASStatus) |
4708 | { | 4708 | { |
4709 | int i_ReturnValue = 0; | 4709 | int i_ReturnValue = 0; |
4710 | unsigned int dw_StatusReg = 0; | 4710 | unsigned int dw_StatusReg = 0; |
@@ -4771,8 +4771,8 @@ int i_APCI1710_GetUASStatus(struct comedi_device * dev, | |||
4771 | +----------------------------------------------------------------------------+ | 4771 | +----------------------------------------------------------------------------+ |
4772 | */ | 4772 | */ |
4773 | 4773 | ||
4774 | int i_APCI1710_GetCBStatus(struct comedi_device * dev, | 4774 | int i_APCI1710_GetCBStatus(struct comedi_device *dev, |
4775 | unsigned char b_ModulNbr, unsigned char * pb_CBStatus) | 4775 | unsigned char b_ModulNbr, unsigned char *pb_CBStatus) |
4776 | { | 4776 | { |
4777 | int i_ReturnValue = 0; | 4777 | int i_ReturnValue = 0; |
4778 | unsigned int dw_StatusReg = 0; | 4778 | unsigned int dw_StatusReg = 0; |
@@ -4853,8 +4853,8 @@ int i_APCI1710_GetCBStatus(struct comedi_device * dev, | |||
4853 | +----------------------------------------------------------------------------+ | 4853 | +----------------------------------------------------------------------------+ |
4854 | */ | 4854 | */ |
4855 | 4855 | ||
4856 | int i_APCI1710_Get16BitCBStatus(struct comedi_device * dev, | 4856 | int i_APCI1710_Get16BitCBStatus(struct comedi_device *dev, |
4857 | unsigned char b_ModulNbr, unsigned char * pb_CBStatusCounter0, unsigned char * pb_CBStatusCounter1) | 4857 | unsigned char b_ModulNbr, unsigned char *pb_CBStatusCounter0, unsigned char *pb_CBStatusCounter1) |
4858 | { | 4858 | { |
4859 | int i_ReturnValue = 0; | 4859 | int i_ReturnValue = 0; |
4860 | unsigned int dw_StatusReg = 0; | 4860 | unsigned int dw_StatusReg = 0; |
@@ -4966,8 +4966,8 @@ int i_APCI1710_Get16BitCBStatus(struct comedi_device * dev, | |||
4966 | +----------------------------------------------------------------------------+ | 4966 | +----------------------------------------------------------------------------+ |
4967 | */ | 4967 | */ |
4968 | 4968 | ||
4969 | int i_APCI1710_GetUDStatus(struct comedi_device * dev, | 4969 | int i_APCI1710_GetUDStatus(struct comedi_device *dev, |
4970 | unsigned char b_ModulNbr, unsigned char * pb_UDStatus) | 4970 | unsigned char b_ModulNbr, unsigned char *pb_UDStatus) |
4971 | { | 4971 | { |
4972 | int i_ReturnValue = 0; | 4972 | int i_ReturnValue = 0; |
4973 | unsigned int dw_StatusReg = 0; | 4973 | unsigned int dw_StatusReg = 0; |
@@ -5040,8 +5040,8 @@ int i_APCI1710_GetUDStatus(struct comedi_device * dev, | |||
5040 | +----------------------------------------------------------------------------+ | 5040 | +----------------------------------------------------------------------------+ |
5041 | */ | 5041 | */ |
5042 | 5042 | ||
5043 | int i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device * dev, | 5043 | int i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device *dev, |
5044 | unsigned char b_ModulNbr, unsigned char * pb_UDStatus) | 5044 | unsigned char b_ModulNbr, unsigned char *pb_UDStatus) |
5045 | { | 5045 | { |
5046 | int i_ReturnValue = 0; | 5046 | int i_ReturnValue = 0; |
5047 | unsigned int dw_StatusReg = 0; | 5047 | unsigned int dw_StatusReg = 0; |
@@ -5145,9 +5145,9 @@ int i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device * dev, | |||
5145 | +----------------------------------------------------------------------------+ | 5145 | +----------------------------------------------------------------------------+ |
5146 | */ | 5146 | */ |
5147 | 5147 | ||
5148 | int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device * dev, | 5148 | int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device *dev, |
5149 | unsigned char b_ModulNbr, | 5149 | unsigned char b_ModulNbr, |
5150 | unsigned char * pb_Status, unsigned char * pb_UDStatus, unsigned int * pul_ReadValue) | 5150 | unsigned char *pb_Status, unsigned char *pb_UDStatus, unsigned int *pul_ReadValue) |
5151 | { | 5151 | { |
5152 | int i_ReturnValue = 0; | 5152 | int i_ReturnValue = 0; |
5153 | unsigned int ui_16BitValue; | 5153 | unsigned int ui_16BitValue; |
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h index 51c759bdc3b..7b481107fe1 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h | |||
@@ -178,7 +178,7 @@ int i_APCI1710_InitFrequencyMeasurement(struct comedi_device *dev, | |||
178 | unsigned char b_PCIInputClock, | 178 | unsigned char b_PCIInputClock, |
179 | unsigned char b_TimingUnity, | 179 | unsigned char b_TimingUnity, |
180 | unsigned int ul_TimingInterval, | 180 | unsigned int ul_TimingInterval, |
181 | unsigned int * pul_RealTimingInterval); | 181 | unsigned int *pul_RealTimingInterval); |
182 | 182 | ||
183 | /* INSN BITS */ | 183 | /* INSN BITS */ |
184 | int i_APCI1710_ClearCounterValue(struct comedi_device *dev, unsigned char b_ModulNbr); | 184 | int i_APCI1710_ClearCounterValue(struct comedi_device *dev, unsigned char b_ModulNbr); |
@@ -230,42 +230,42 @@ int i_APCI1710_DisableFrequencyMeasurement(struct comedi_device *dev, | |||
230 | /* INSN READ */ | 230 | /* INSN READ */ |
231 | int i_APCI1710_ReadLatchRegisterStatus(struct comedi_device *dev, | 231 | int i_APCI1710_ReadLatchRegisterStatus(struct comedi_device *dev, |
232 | unsigned char b_ModulNbr, unsigned char b_LatchReg, | 232 | unsigned char b_ModulNbr, unsigned char b_LatchReg, |
233 | unsigned char * pb_LatchStatus); | 233 | unsigned char *pb_LatchStatus); |
234 | 234 | ||
235 | int i_APCI1710_ReadLatchRegisterValue(struct comedi_device *dev, | 235 | int i_APCI1710_ReadLatchRegisterValue(struct comedi_device *dev, |
236 | unsigned char b_ModulNbr, unsigned char b_LatchReg, | 236 | unsigned char b_ModulNbr, unsigned char b_LatchReg, |
237 | unsigned int * pul_LatchValue); | 237 | unsigned int *pul_LatchValue); |
238 | 238 | ||
239 | int i_APCI1710_Read16BitCounterValue(struct comedi_device *dev, | 239 | int i_APCI1710_Read16BitCounterValue(struct comedi_device *dev, |
240 | unsigned char b_ModulNbr, unsigned char b_SelectedCounter, | 240 | unsigned char b_ModulNbr, unsigned char b_SelectedCounter, |
241 | unsigned int * pui_CounterValue); | 241 | unsigned int *pui_CounterValue); |
242 | 242 | ||
243 | int i_APCI1710_Read32BitCounterValue(struct comedi_device *dev, | 243 | int i_APCI1710_Read32BitCounterValue(struct comedi_device *dev, |
244 | unsigned char b_ModulNbr, unsigned int * pul_CounterValue); | 244 | unsigned char b_ModulNbr, unsigned int *pul_CounterValue); |
245 | 245 | ||
246 | int i_APCI1710_GetIndexStatus(struct comedi_device *dev, | 246 | int i_APCI1710_GetIndexStatus(struct comedi_device *dev, |
247 | unsigned char b_ModulNbr, unsigned char * pb_IndexStatus); | 247 | unsigned char b_ModulNbr, unsigned char *pb_IndexStatus); |
248 | 248 | ||
249 | int i_APCI1710_GetReferenceStatus(struct comedi_device *dev, | 249 | int i_APCI1710_GetReferenceStatus(struct comedi_device *dev, |
250 | unsigned char b_ModulNbr, unsigned char * pb_ReferenceStatus); | 250 | unsigned char b_ModulNbr, unsigned char *pb_ReferenceStatus); |
251 | 251 | ||
252 | int i_APCI1710_GetUASStatus(struct comedi_device *dev, | 252 | int i_APCI1710_GetUASStatus(struct comedi_device *dev, |
253 | unsigned char b_ModulNbr, unsigned char * pb_UASStatus); | 253 | unsigned char b_ModulNbr, unsigned char *pb_UASStatus); |
254 | 254 | ||
255 | int i_APCI1710_GetCBStatus(struct comedi_device *dev, | 255 | int i_APCI1710_GetCBStatus(struct comedi_device *dev, |
256 | unsigned char b_ModulNbr, unsigned char * pb_CBStatus); | 256 | unsigned char b_ModulNbr, unsigned char *pb_CBStatus); |
257 | 257 | ||
258 | int i_APCI1710_Get16BitCBStatus(struct comedi_device *dev, | 258 | int i_APCI1710_Get16BitCBStatus(struct comedi_device *dev, |
259 | unsigned char b_ModulNbr, unsigned char * pb_CBStatusCounter0, | 259 | unsigned char b_ModulNbr, unsigned char *pb_CBStatusCounter0, |
260 | unsigned char * pb_CBStatusCounter1); | 260 | unsigned char *pb_CBStatusCounter1); |
261 | 261 | ||
262 | int i_APCI1710_GetUDStatus(struct comedi_device *dev, | 262 | int i_APCI1710_GetUDStatus(struct comedi_device *dev, |
263 | unsigned char b_ModulNbr, unsigned char * pb_UDStatus); | 263 | unsigned char b_ModulNbr, unsigned char *pb_UDStatus); |
264 | 264 | ||
265 | int i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device *dev, | 265 | int i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device *dev, |
266 | unsigned char b_ModulNbr, unsigned char * pb_UDStatus); | 266 | unsigned char b_ModulNbr, unsigned char *pb_UDStatus); |
267 | 267 | ||
268 | int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device *dev, | 268 | int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device *dev, |
269 | unsigned char b_ModulNbr, | 269 | unsigned char b_ModulNbr, |
270 | unsigned char * pb_Status, unsigned char * pb_UDStatus, | 270 | unsigned char *pb_Status, unsigned char *pb_UDStatus, |
271 | unsigned int * pul_ReadValue); | 271 | unsigned int *pul_ReadValue); |
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 966aba855d0..b815d0a0e8a 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c | |||
@@ -123,8 +123,8 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | |||
123 | +----------------------------------------------------------------------------+ | 123 | +----------------------------------------------------------------------------+ |
124 | */ | 124 | */ |
125 | 125 | ||
126 | int i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev, | 126 | int i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device *dev, |
127 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 127 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
128 | { | 128 | { |
129 | int i_ReturnValue = 0; | 129 | int i_ReturnValue = 0; |
130 | unsigned int dw_IntRegister; | 130 | unsigned int dw_IntRegister; |
@@ -414,8 +414,8 @@ int i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev, | |||
414 | +----------------------------------------------------------------------------+ | 414 | +----------------------------------------------------------------------------+ |
415 | */ | 415 | */ |
416 | 416 | ||
417 | int i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device * dev, | 417 | int i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev, |
418 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 418 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
419 | { | 419 | { |
420 | int i_ReturnValue = 0; | 420 | int i_ReturnValue = 0; |
421 | unsigned char b_ModulNbr; | 421 | unsigned char b_ModulNbr; |
@@ -708,16 +708,16 @@ int i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device * dev, | |||
708 | 708 | ||
709 | unsigned char *_ pb_Status) | 709 | unsigned char *_ pb_Status) |
710 | */ | 710 | */ |
711 | int i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device * dev, | 711 | int i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device *dev, |
712 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 712 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
713 | { | 713 | { |
714 | int i_ReturnValue = 0; | 714 | int i_ReturnValue = 0; |
715 | unsigned int dw_StatusRegister; | 715 | unsigned int dw_StatusRegister; |
716 | unsigned char b_ModulNbr; | 716 | unsigned char b_ModulNbr; |
717 | unsigned char b_PulseEncoderNbr; | 717 | unsigned char b_PulseEncoderNbr; |
718 | unsigned char * pb_Status; | 718 | unsigned char *pb_Status; |
719 | unsigned char b_Type; | 719 | unsigned char b_Type; |
720 | unsigned int * pul_ReadValue; | 720 | unsigned int *pul_ReadValue; |
721 | unsigned int ul_WriteValue; | 721 | unsigned int ul_WriteValue; |
722 | 722 | ||
723 | i_ReturnValue = insn->n; | 723 | i_ReturnValue = insn->n; |
@@ -834,8 +834,8 @@ int i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device * dev, | |||
834 | return (i_ReturnValue); | 834 | return (i_ReturnValue); |
835 | } | 835 | } |
836 | 836 | ||
837 | int i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device * dev, | 837 | int i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev, |
838 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 838 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
839 | { | 839 | { |
840 | 840 | ||
841 | data[0] = devpriv->s_InterruptParameters. | 841 | data[0] = devpriv->s_InterruptParameters. |
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c index 976fe5863e4..9eb2b8349c2 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c | |||
@@ -70,8 +70,8 @@ struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | |||
70 | +----------------------------------------------------------------------------+ | 70 | +----------------------------------------------------------------------------+ |
71 | */ | 71 | */ |
72 | 72 | ||
73 | int i_APCI1710_InsnConfigPWM(struct comedi_device * dev, struct comedi_subdevice * s, | 73 | int i_APCI1710_InsnConfigPWM(struct comedi_device *dev, struct comedi_subdevice *s, |
74 | struct comedi_insn * insn, unsigned int * data) | 74 | struct comedi_insn *insn, unsigned int *data) |
75 | { | 75 | { |
76 | unsigned char b_ConfigType; | 76 | unsigned char b_ConfigType; |
77 | int i_ReturnValue = 0; | 77 | int i_ReturnValue = 0; |
@@ -179,14 +179,14 @@ int i_APCI1710_InsnConfigPWM(struct comedi_device * dev, struct comedi_subdevice | |||
179 | +----------------------------------------------------------------------------+ | 179 | +----------------------------------------------------------------------------+ |
180 | */ | 180 | */ |
181 | 181 | ||
182 | int i_APCI1710_InitPWM(struct comedi_device * dev, | 182 | int i_APCI1710_InitPWM(struct comedi_device *dev, |
183 | unsigned char b_ModulNbr, | 183 | unsigned char b_ModulNbr, |
184 | unsigned char b_PWM, | 184 | unsigned char b_PWM, |
185 | unsigned char b_ClockSelection, | 185 | unsigned char b_ClockSelection, |
186 | unsigned char b_TimingUnit, | 186 | unsigned char b_TimingUnit, |
187 | unsigned int ul_LowTiming, | 187 | unsigned int ul_LowTiming, |
188 | unsigned int ul_HighTiming, | 188 | unsigned int ul_HighTiming, |
189 | unsigned int * pul_RealLowTiming, unsigned int * pul_RealHighTiming) | 189 | unsigned int *pul_RealLowTiming, unsigned int *pul_RealHighTiming) |
190 | { | 190 | { |
191 | int i_ReturnValue = 0; | 191 | int i_ReturnValue = 0; |
192 | unsigned int ul_LowTimerValue = 0; | 192 | unsigned int ul_LowTimerValue = 0; |
@@ -1534,16 +1534,16 @@ int i_APCI1710_InitPWM(struct comedi_device * dev, | |||
1534 | +----------------------------------------------------------------------------+ | 1534 | +----------------------------------------------------------------------------+ |
1535 | */ | 1535 | */ |
1536 | 1536 | ||
1537 | int i_APCI1710_GetPWMInitialisation(struct comedi_device * dev, | 1537 | int i_APCI1710_GetPWMInitialisation(struct comedi_device *dev, |
1538 | unsigned char b_ModulNbr, | 1538 | unsigned char b_ModulNbr, |
1539 | unsigned char b_PWM, | 1539 | unsigned char b_PWM, |
1540 | unsigned char * pb_TimingUnit, | 1540 | unsigned char *pb_TimingUnit, |
1541 | unsigned int * pul_LowTiming, | 1541 | unsigned int *pul_LowTiming, |
1542 | unsigned int * pul_HighTiming, | 1542 | unsigned int *pul_HighTiming, |
1543 | unsigned char * pb_StartLevel, | 1543 | unsigned char *pb_StartLevel, |
1544 | unsigned char * pb_StopMode, | 1544 | unsigned char *pb_StopMode, |
1545 | unsigned char * pb_StopLevel, | 1545 | unsigned char *pb_StopLevel, |
1546 | unsigned char * pb_ExternGate, unsigned char * pb_InterruptEnable, unsigned char * pb_Enable) | 1546 | unsigned char *pb_ExternGate, unsigned char *pb_InterruptEnable, unsigned char *pb_Enable) |
1547 | { | 1547 | { |
1548 | int i_ReturnValue = 0; | 1548 | int i_ReturnValue = 0; |
1549 | unsigned int dw_Status; | 1549 | unsigned int dw_Status; |
@@ -1683,8 +1683,8 @@ struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | |||
1683 | +----------------------------------------------------------------------------+ | 1683 | +----------------------------------------------------------------------------+ |
1684 | */ | 1684 | */ |
1685 | 1685 | ||
1686 | int i_APCI1710_InsnWritePWM(struct comedi_device * dev, struct comedi_subdevice * s, | 1686 | int i_APCI1710_InsnWritePWM(struct comedi_device *dev, struct comedi_subdevice *s, |
1687 | struct comedi_insn * insn, unsigned int * data) | 1687 | struct comedi_insn *insn, unsigned int *data) |
1688 | { | 1688 | { |
1689 | unsigned char b_WriteType; | 1689 | unsigned char b_WriteType; |
1690 | int i_ReturnValue = 0; | 1690 | int i_ReturnValue = 0; |
@@ -1806,7 +1806,7 @@ int i_APCI1710_InsnWritePWM(struct comedi_device * dev, struct comedi_subdevice | |||
1806 | +----------------------------------------------------------------------------+ | 1806 | +----------------------------------------------------------------------------+ |
1807 | */ | 1807 | */ |
1808 | 1808 | ||
1809 | int i_APCI1710_EnablePWM(struct comedi_device * dev, | 1809 | int i_APCI1710_EnablePWM(struct comedi_device *dev, |
1810 | unsigned char b_ModulNbr, | 1810 | unsigned char b_ModulNbr, |
1811 | unsigned char b_PWM, | 1811 | unsigned char b_PWM, |
1812 | unsigned char b_StartLevel, | 1812 | unsigned char b_StartLevel, |
@@ -2062,7 +2062,7 @@ int i_APCI1710_EnablePWM(struct comedi_device * dev, | |||
2062 | +----------------------------------------------------------------------------+ | 2062 | +----------------------------------------------------------------------------+ |
2063 | */ | 2063 | */ |
2064 | 2064 | ||
2065 | int i_APCI1710_DisablePWM(struct comedi_device * dev, unsigned char b_ModulNbr, unsigned char b_PWM) | 2065 | int i_APCI1710_DisablePWM(struct comedi_device *dev, unsigned char b_ModulNbr, unsigned char b_PWM) |
2066 | { | 2066 | { |
2067 | int i_ReturnValue = 0; | 2067 | int i_ReturnValue = 0; |
2068 | unsigned int dw_Status; | 2068 | unsigned int dw_Status; |
@@ -2189,7 +2189,7 @@ int i_APCI1710_DisablePWM(struct comedi_device * dev, unsigned char b_ModulNbr, | |||
2189 | +----------------------------------------------------------------------------+ | 2189 | +----------------------------------------------------------------------------+ |
2190 | */ | 2190 | */ |
2191 | 2191 | ||
2192 | int i_APCI1710_SetNewPWMTiming(struct comedi_device * dev, | 2192 | int i_APCI1710_SetNewPWMTiming(struct comedi_device *dev, |
2193 | unsigned char b_ModulNbr, | 2193 | unsigned char b_ModulNbr, |
2194 | unsigned char b_PWM, unsigned char b_TimingUnit, unsigned int ul_LowTiming, unsigned int ul_HighTiming) | 2194 | unsigned char b_PWM, unsigned char b_TimingUnit, unsigned int ul_LowTiming, unsigned int ul_HighTiming) |
2195 | { | 2195 | { |
@@ -3460,16 +3460,16 @@ int i_APCI1710_SetNewPWMTiming(struct comedi_device * dev, | |||
3460 | +----------------------------------------------------------------------------+ | 3460 | +----------------------------------------------------------------------------+ |
3461 | */ | 3461 | */ |
3462 | 3462 | ||
3463 | int i_APCI1710_InsnReadGetPWMStatus(struct comedi_device * dev, struct comedi_subdevice * s, | 3463 | int i_APCI1710_InsnReadGetPWMStatus(struct comedi_device *dev, struct comedi_subdevice *s, |
3464 | struct comedi_insn * insn, unsigned int * data) | 3464 | struct comedi_insn *insn, unsigned int *data) |
3465 | { | 3465 | { |
3466 | int i_ReturnValue = 0; | 3466 | int i_ReturnValue = 0; |
3467 | unsigned int dw_Status; | 3467 | unsigned int dw_Status; |
3468 | 3468 | ||
3469 | unsigned char b_ModulNbr; | 3469 | unsigned char b_ModulNbr; |
3470 | unsigned char b_PWM; | 3470 | unsigned char b_PWM; |
3471 | unsigned char * pb_PWMOutputStatus; | 3471 | unsigned char *pb_PWMOutputStatus; |
3472 | unsigned char * pb_ExternGateStatus; | 3472 | unsigned char *pb_ExternGateStatus; |
3473 | 3473 | ||
3474 | i_ReturnValue = insn->n; | 3474 | i_ReturnValue = insn->n; |
3475 | b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec); | 3475 | b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec); |
@@ -3561,8 +3561,8 @@ int i_APCI1710_InsnReadGetPWMStatus(struct comedi_device * dev, struct comedi_su | |||
3561 | return (i_ReturnValue); | 3561 | return (i_ReturnValue); |
3562 | } | 3562 | } |
3563 | 3563 | ||
3564 | int i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device * dev, | 3564 | int i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device *dev, |
3565 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 3565 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
3566 | { | 3566 | { |
3567 | data[0] = devpriv->s_InterruptParameters. | 3567 | data[0] = devpriv->s_InterruptParameters. |
3568 | s_FIFOInterruptParameters[devpriv-> | 3568 | 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 07abf9126f7..bf1b4c39a1c 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h | |||
@@ -36,19 +36,19 @@ int i_APCI1710_InitPWM(struct comedi_device *dev, | |||
36 | unsigned char b_TimingUnit, | 36 | unsigned char b_TimingUnit, |
37 | unsigned int ul_LowTiming, | 37 | unsigned int ul_LowTiming, |
38 | unsigned int ul_HighTiming, | 38 | unsigned int ul_HighTiming, |
39 | unsigned int * pul_RealLowTiming, unsigned int * pul_RealHighTiming); | 39 | unsigned int *pul_RealLowTiming, unsigned int *pul_RealHighTiming); |
40 | 40 | ||
41 | int i_APCI1710_GetPWMInitialisation(struct comedi_device *dev, | 41 | int i_APCI1710_GetPWMInitialisation(struct comedi_device *dev, |
42 | unsigned char b_ModulNbr, | 42 | unsigned char b_ModulNbr, |
43 | unsigned char b_PWM, | 43 | unsigned char b_PWM, |
44 | unsigned char * pb_TimingUnit, | 44 | unsigned char *pb_TimingUnit, |
45 | unsigned int * pul_LowTiming, | 45 | unsigned int *pul_LowTiming, |
46 | unsigned int * pul_HighTiming, | 46 | unsigned int *pul_HighTiming, |
47 | unsigned char * pb_StartLevel, | 47 | unsigned char *pb_StartLevel, |
48 | unsigned char * pb_StopMode, | 48 | unsigned char *pb_StopMode, |
49 | unsigned char * pb_StopLevel, | 49 | unsigned char *pb_StopLevel, |
50 | unsigned char * pb_ExternGate, | 50 | unsigned char *pb_ExternGate, |
51 | unsigned char * pb_InterruptEnable, unsigned char * pb_Enable); | 51 | unsigned char *pb_InterruptEnable, unsigned char *pb_Enable); |
52 | 52 | ||
53 | int i_APCI1710_InsnWritePWM(struct comedi_device *dev, struct comedi_subdevice *s, | 53 | int i_APCI1710_InsnWritePWM(struct comedi_device *dev, struct comedi_subdevice *s, |
54 | struct comedi_insn *insn, unsigned int *data); | 54 | 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 238fcc88b15..5edae81763a 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c | |||
@@ -133,8 +133,8 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | |||
133 | +----------------------------------------------------------------------------+ | 133 | +----------------------------------------------------------------------------+ |
134 | */ | 134 | */ |
135 | 135 | ||
136 | int i_APCI1710_InsnConfigInitSSI(struct comedi_device * dev, struct comedi_subdevice * s, | 136 | int i_APCI1710_InsnConfigInitSSI(struct comedi_device *dev, struct comedi_subdevice *s, |
137 | struct comedi_insn * insn, unsigned int * data) | 137 | struct comedi_insn *insn, unsigned int *data) |
138 | { | 138 | { |
139 | int i_ReturnValue = 0; | 139 | int i_ReturnValue = 0; |
140 | unsigned int ui_TimerValue; | 140 | unsigned int ui_TimerValue; |
@@ -400,8 +400,8 @@ pul_Position = (unsigned int *) &data[0]; | |||
400 | +----------------------------------------------------------------------------+ | 400 | +----------------------------------------------------------------------------+ |
401 | */ | 401 | */ |
402 | 402 | ||
403 | int i_APCI1710_InsnReadSSIValue(struct comedi_device * dev, struct comedi_subdevice * s, | 403 | int i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, struct comedi_subdevice *s, |
404 | struct comedi_insn * insn, unsigned int * data) | 404 | struct comedi_insn *insn, unsigned int *data) |
405 | { | 405 | { |
406 | int i_ReturnValue = 0; | 406 | int i_ReturnValue = 0; |
407 | unsigned char b_Cpt; | 407 | unsigned char b_Cpt; |
@@ -416,10 +416,10 @@ int i_APCI1710_InsnReadSSIValue(struct comedi_device * dev, struct comedi_subdev | |||
416 | unsigned char b_ModulNbr; | 416 | unsigned char b_ModulNbr; |
417 | unsigned char b_SelectedSSI; | 417 | unsigned char b_SelectedSSI; |
418 | unsigned char b_ReadType; | 418 | unsigned char b_ReadType; |
419 | unsigned int * pul_Position; | 419 | unsigned int *pul_Position; |
420 | unsigned int * pul_TurnCpt; | 420 | unsigned int *pul_TurnCpt; |
421 | unsigned int * pul_Position1; | 421 | unsigned int *pul_Position1; |
422 | unsigned int * pul_TurnCpt1; | 422 | unsigned int *pul_TurnCpt1; |
423 | 423 | ||
424 | i_ReturnValue = insn->n; | 424 | i_ReturnValue = insn->n; |
425 | pul_Position1 = (unsigned int *) & data[0]; | 425 | pul_Position1 = (unsigned int *) & data[0]; |
@@ -735,15 +735,15 @@ int i_APCI1710_InsnReadSSIValue(struct comedi_device * dev, struct comedi_subdev | |||
735 | +----------------------------------------------------------------------------+ | 735 | +----------------------------------------------------------------------------+ |
736 | */ | 736 | */ |
737 | 737 | ||
738 | int i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device * dev, struct comedi_subdevice * s, | 738 | int i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device *dev, struct comedi_subdevice *s, |
739 | struct comedi_insn * insn, unsigned int * data) | 739 | struct comedi_insn *insn, unsigned int *data) |
740 | { | 740 | { |
741 | int i_ReturnValue = 0; | 741 | int i_ReturnValue = 0; |
742 | unsigned int dw_StatusReg; | 742 | unsigned int dw_StatusReg; |
743 | unsigned char b_ModulNbr; | 743 | unsigned char b_ModulNbr; |
744 | unsigned char b_InputChannel; | 744 | unsigned char b_InputChannel; |
745 | unsigned char * pb_ChannelStatus; | 745 | unsigned char *pb_ChannelStatus; |
746 | unsigned char * pb_InputStatus; | 746 | unsigned char *pb_InputStatus; |
747 | unsigned char b_IOType; | 747 | unsigned char b_IOType; |
748 | i_ReturnValue = insn->n; | 748 | i_ReturnValue = insn->n; |
749 | b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec); | 749 | b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec); |
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c index dc35124a758..0170d36ac28 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c | |||
@@ -130,8 +130,8 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | |||
130 | +----------------------------------------------------------------------------+ | 130 | +----------------------------------------------------------------------------+ |
131 | */ | 131 | */ |
132 | 132 | ||
133 | int i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev, | 133 | int i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev, |
134 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 134 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
135 | { | 135 | { |
136 | int i_ReturnValue = 0; | 136 | int i_ReturnValue = 0; |
137 | unsigned int ul_TimerValue = 0; | 137 | unsigned int ul_TimerValue = 0; |
@@ -987,8 +987,8 @@ int i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev, | |||
987 | +----------------------------------------------------------------------------+ | 987 | +----------------------------------------------------------------------------+ |
988 | */ | 988 | */ |
989 | 989 | ||
990 | int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device * dev, | 990 | int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev, |
991 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 991 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
992 | { | 992 | { |
993 | int i_ReturnValue = 0; | 993 | int i_ReturnValue = 0; |
994 | unsigned int dw_Status; | 994 | unsigned int dw_Status; |
@@ -1460,20 +1460,20 @@ int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device * dev, | |||
1460 | +----------------------------------------------------------------------------+ | 1460 | +----------------------------------------------------------------------------+ |
1461 | */ | 1461 | */ |
1462 | 1462 | ||
1463 | int i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev, | 1463 | int i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev, |
1464 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1464 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1465 | { | 1465 | { |
1466 | int i_ReturnValue = 0; | 1466 | int i_ReturnValue = 0; |
1467 | unsigned int dw_Status; | 1467 | unsigned int dw_Status; |
1468 | unsigned char b_ModulNbr; | 1468 | unsigned char b_ModulNbr; |
1469 | unsigned char b_TorCounter; | 1469 | unsigned char b_TorCounter; |
1470 | unsigned char * pb_TimingUnit; | 1470 | unsigned char *pb_TimingUnit; |
1471 | unsigned int * pul_TimingInterval; | 1471 | unsigned int *pul_TimingInterval; |
1472 | unsigned char * pb_InputMode; | 1472 | unsigned char *pb_InputMode; |
1473 | unsigned char * pb_ExternGate; | 1473 | unsigned char *pb_ExternGate; |
1474 | unsigned char * pb_CycleMode; | 1474 | unsigned char *pb_CycleMode; |
1475 | unsigned char * pb_Enable; | 1475 | unsigned char *pb_Enable; |
1476 | unsigned char * pb_InterruptEnable; | 1476 | unsigned char *pb_InterruptEnable; |
1477 | 1477 | ||
1478 | i_ReturnValue = insn->n; | 1478 | i_ReturnValue = insn->n; |
1479 | b_ModulNbr = CR_AREF(insn->chanspec); | 1479 | b_ModulNbr = CR_AREF(insn->chanspec); |
@@ -1700,8 +1700,8 @@ int i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev, | |||
1700 | +----------------------------------------------------------------------------+ | 1700 | +----------------------------------------------------------------------------+ |
1701 | */ | 1701 | */ |
1702 | 1702 | ||
1703 | int i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device * dev, | 1703 | int i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device *dev, |
1704 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1704 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1705 | { | 1705 | { |
1706 | int i_ReturnValue = 0; | 1706 | int i_ReturnValue = 0; |
1707 | unsigned int dw_Status; | 1707 | unsigned int dw_Status; |
@@ -1711,8 +1711,8 @@ int i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device | |||
1711 | unsigned char b_TorCounter; | 1711 | unsigned char b_TorCounter; |
1712 | unsigned char b_ReadType; | 1712 | unsigned char b_ReadType; |
1713 | unsigned int ui_TimeOut; | 1713 | unsigned int ui_TimeOut; |
1714 | unsigned char * pb_TorCounterStatus; | 1714 | unsigned char *pb_TorCounterStatus; |
1715 | unsigned int * pul_TorCounterValue; | 1715 | unsigned int *pul_TorCounterValue; |
1716 | 1716 | ||
1717 | i_ReturnValue = insn->n; | 1717 | i_ReturnValue = insn->n; |
1718 | b_ModulNbr = CR_AREF(insn->chanspec); | 1718 | b_ModulNbr = CR_AREF(insn->chanspec); |
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c index 1b8f5dfdd4c..c7680fe3f6c 100644 --- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c +++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c | |||
@@ -100,8 +100,8 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | |||
100 | +----------------------------------------------------------------------------+ | 100 | +----------------------------------------------------------------------------+ |
101 | */ | 101 | */ |
102 | 102 | ||
103 | int i_APCI1710_InsnConfigInitTTLIO(struct comedi_device * dev, struct comedi_subdevice * s, | 103 | int i_APCI1710_InsnConfigInitTTLIO(struct comedi_device *dev, struct comedi_subdevice *s, |
104 | struct comedi_insn * insn, unsigned int * data) | 104 | struct comedi_insn *insn, unsigned int *data) |
105 | { | 105 | { |
106 | int i_ReturnValue = 0; | 106 | int i_ReturnValue = 0; |
107 | unsigned char b_ModulNbr; | 107 | unsigned char b_ModulNbr; |
@@ -406,8 +406,8 @@ APCI1710_TTL_READCHANNEL | |||
406 | +----------------------------------------------------------------------------+ | 406 | +----------------------------------------------------------------------------+ |
407 | */ | 407 | */ |
408 | 408 | ||
409 | int i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, struct comedi_subdevice * s, | 409 | int i_APCI1710_InsnBitsReadTTLIO(struct comedi_device *dev, struct comedi_subdevice *s, |
410 | struct comedi_insn * insn, unsigned int * data) | 410 | struct comedi_insn *insn, unsigned int *data) |
411 | { | 411 | { |
412 | int i_ReturnValue = 0; | 412 | int i_ReturnValue = 0; |
413 | unsigned int dw_StatusReg; | 413 | unsigned int dw_StatusReg; |
@@ -415,8 +415,8 @@ int i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, struct comedi_subde | |||
415 | unsigned char b_SelectedPort; | 415 | unsigned char b_SelectedPort; |
416 | unsigned char b_InputChannel; | 416 | unsigned char b_InputChannel; |
417 | unsigned char b_ReadType; | 417 | unsigned char b_ReadType; |
418 | unsigned char * pb_ChannelStatus; | 418 | unsigned char *pb_ChannelStatus; |
419 | unsigned char * pb_PortValue; | 419 | unsigned char *pb_PortValue; |
420 | 420 | ||
421 | i_ReturnValue = insn->n; | 421 | i_ReturnValue = insn->n; |
422 | b_ReadType = (unsigned char) data[0]; | 422 | b_ReadType = (unsigned char) data[0]; |
@@ -655,13 +655,13 @@ int i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, struct comedi_subde | |||
655 | +----------------------------------------------------------------------------+ | 655 | +----------------------------------------------------------------------------+ |
656 | */ | 656 | */ |
657 | 657 | ||
658 | int i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device * dev, | 658 | int i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device *dev, |
659 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 659 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
660 | { | 660 | { |
661 | int i_ReturnValue = 0; | 661 | int i_ReturnValue = 0; |
662 | unsigned int dw_StatusReg; | 662 | unsigned int dw_StatusReg; |
663 | unsigned char b_ModulNbr; | 663 | unsigned char b_ModulNbr; |
664 | unsigned int * pul_PortValue; | 664 | unsigned int *pul_PortValue; |
665 | 665 | ||
666 | b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec); | 666 | b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec); |
667 | i_ReturnValue = insn->n; | 667 | i_ReturnValue = insn->n; |
@@ -825,8 +825,8 @@ int i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,struct comedi | |||
825 | +----------------------------------------------------------------------------+ | 825 | +----------------------------------------------------------------------------+ |
826 | */ | 826 | */ |
827 | 827 | ||
828 | int i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device * dev, | 828 | int i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev, |
829 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 829 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
830 | { | 830 | { |
831 | int i_ReturnValue = 0; | 831 | int i_ReturnValue = 0; |
832 | unsigned int dw_StatusReg = 0; | 832 | unsigned int dw_StatusReg = 0; |
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c b/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c index fe7c8e1d058..090084556a9 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c | |||
@@ -68,7 +68,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | |||
68 | 68 | ||
69 | int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, | 69 | int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, |
70 | unsigned int dw_PCIBoardEepromAddress, | 70 | unsigned int dw_PCIBoardEepromAddress, |
71 | unsigned short w_EepromStartAddress, unsigned short * pw_DataRead) | 71 | unsigned short w_EepromStartAddress, unsigned short *pw_DataRead) |
72 | { | 72 | { |
73 | unsigned int dw_eeprom_busy = 0; | 73 | unsigned int dw_eeprom_busy = 0; |
74 | int i_Counter = 0; | 74 | int i_Counter = 0; |
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h b/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h index 1e5ddd4516a..622a4ac2b79 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h | |||
@@ -24,4 +24,4 @@ | |||
24 | 24 | ||
25 | int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, | 25 | int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, |
26 | unsigned int dw_PCIBoardEepromAddress, | 26 | unsigned int dw_PCIBoardEepromAddress, |
27 | unsigned short w_EepromStartAddress, unsigned short * pw_DataRead); | 27 | unsigned short w_EepromStartAddress, unsigned short *pw_DataRead); |
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c index 38cd7cf79b7..a35f299f2a2 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c | |||
@@ -2559,7 +2559,7 @@ COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl); | |||
2559 | +----------------------------------------------------------------------------+ | 2559 | +----------------------------------------------------------------------------+ |
2560 | */ | 2560 | */ |
2561 | 2561 | ||
2562 | static int i_ADDI_Attach(struct comedi_device * dev, struct comedi_devconfig * it) | 2562 | static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it) |
2563 | { | 2563 | { |
2564 | struct comedi_subdevice *s; | 2564 | struct comedi_subdevice *s; |
2565 | int ret, pages, i, n_subdevices; | 2565 | int ret, pages, i, n_subdevices; |
@@ -2926,7 +2926,7 @@ static int i_ADDI_Attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
2926 | +----------------------------------------------------------------------------+ | 2926 | +----------------------------------------------------------------------------+ |
2927 | */ | 2927 | */ |
2928 | 2928 | ||
2929 | static int i_ADDI_Detach(struct comedi_device * dev) | 2929 | static int i_ADDI_Detach(struct comedi_device *dev) |
2930 | { | 2930 | { |
2931 | 2931 | ||
2932 | if (dev->private) { | 2932 | if (dev->private) { |
@@ -2992,7 +2992,7 @@ static int i_ADDI_Detach(struct comedi_device * dev) | |||
2992 | +----------------------------------------------------------------------------+ | 2992 | +----------------------------------------------------------------------------+ |
2993 | */ | 2993 | */ |
2994 | 2994 | ||
2995 | static int i_ADDI_Reset(struct comedi_device * dev) | 2995 | static int i_ADDI_Reset(struct comedi_device *dev) |
2996 | { | 2996 | { |
2997 | 2997 | ||
2998 | this_board->i_hwdrv_Reset(dev); | 2998 | this_board->i_hwdrv_Reset(dev); |
@@ -3046,8 +3046,8 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d) | |||
3046 | +----------------------------------------------------------------------------+ | 3046 | +----------------------------------------------------------------------------+ |
3047 | */ | 3047 | */ |
3048 | 3048 | ||
3049 | static int i_ADDIDATA_InsnReadEeprom(struct comedi_device * dev, struct comedi_subdevice * s, | 3049 | static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev, struct comedi_subdevice *s, |
3050 | struct comedi_insn * insn, unsigned int * data) | 3050 | struct comedi_insn *insn, unsigned int *data) |
3051 | { | 3051 | { |
3052 | unsigned short w_Data; | 3052 | unsigned short w_Data; |
3053 | unsigned short w_Address; | 3053 | unsigned short 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 0640a05339a..edd657b902a 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h | |||
@@ -362,7 +362,7 @@ struct addi_private { | |||
362 | unsigned int ui_AiNbrofChannels; /* how many channels is measured */ | 362 | unsigned int ui_AiNbrofChannels; /* how many channels is measured */ |
363 | unsigned int ui_AiScanLength; /* Length of actual scanlist */ | 363 | unsigned int ui_AiScanLength; /* Length of actual scanlist */ |
364 | unsigned int ui_AiActualScanPosition; /* position in actual scan */ | 364 | unsigned int ui_AiActualScanPosition; /* position in actual scan */ |
365 | unsigned int * pui_AiChannelList; /* actual chanlist */ | 365 | unsigned int *pui_AiChannelList; /* actual chanlist */ |
366 | unsigned int ui_AiChannelList[32]; /* actual chanlist */ | 366 | unsigned int ui_AiChannelList[32]; /* actual chanlist */ |
367 | unsigned char b_AiChannelConfiguration[32]; /* actual chanlist */ | 367 | unsigned char b_AiChannelConfiguration[32]; /* actual chanlist */ |
368 | unsigned int ui_AiReadData[32]; | 368 | unsigned int ui_AiReadData[32]; |
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c index 1de29175073..3aa20928e67 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c | |||
@@ -152,7 +152,7 @@ void v_EepromClock76(unsigned int dw_Address, unsigned int dw_RegisterValue); | |||
152 | void v_EepromWaitBusy(unsigned short w_PCIBoardEepromAddress); | 152 | void v_EepromWaitBusy(unsigned short w_PCIBoardEepromAddress); |
153 | void v_EepromSendCommand76(unsigned int dw_Address, unsigned int dw_EepromCommand, | 153 | void v_EepromSendCommand76(unsigned int dw_Address, unsigned int dw_EepromCommand, |
154 | unsigned char b_DataLengthInBits); | 154 | unsigned char b_DataLengthInBits); |
155 | void v_EepromCs76Read(unsigned int dw_Address, unsigned short w_offset, unsigned short * pw_Value); | 155 | void v_EepromCs76Read(unsigned int dw_Address, unsigned short w_offset, unsigned short *pw_Value); |
156 | 156 | ||
157 | /* | 157 | /* |
158 | +----------------------------------------------------------------------------+ | 158 | +----------------------------------------------------------------------------+ |
@@ -652,7 +652,7 @@ void v_EepromSendCommand76(unsigned int dw_Address, unsigned int dw_EepromComman | |||
652 | 652 | ||
653 | */ | 653 | */ |
654 | 654 | ||
655 | void v_EepromCs76Read(unsigned int dw_Address, unsigned short w_offset, unsigned short * pw_Value) | 655 | void v_EepromCs76Read(unsigned int dw_Address, unsigned short w_offset, unsigned short *pw_Value) |
656 | { | 656 | { |
657 | 657 | ||
658 | char c_BitPos = 0; | 658 | char c_BitPos = 0; |
@@ -985,7 +985,7 @@ int i_EepromReadDigitalInputHeader(unsigned short w_PCIBoardEepromAddress, | |||
985 | */ | 985 | */ |
986 | int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress, | 986 | int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress, |
987 | char *pc_PCIChipInformation, unsigned short w_Address, | 987 | char *pc_PCIChipInformation, unsigned short w_Address, |
988 | struct str_DigitalOutputHeader * s_Header) | 988 | struct str_DigitalOutputHeader *s_Header) |
989 | { | 989 | { |
990 | /* Read Nbr channels */ | 990 | /* Read Nbr channels */ |
991 | s_Header->w_Nchannel = | 991 | s_Header->w_Nchannel = |
@@ -1016,7 +1016,7 @@ int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress, | |||
1016 | */ | 1016 | */ |
1017 | int i_EepromReadTimerHeader(unsigned short w_PCIBoardEepromAddress, | 1017 | int i_EepromReadTimerHeader(unsigned short w_PCIBoardEepromAddress, |
1018 | char *pc_PCIChipInformation, unsigned short w_Address, | 1018 | char *pc_PCIChipInformation, unsigned short w_Address, |
1019 | struct str_TimerMainHeader * s_Header) | 1019 | struct str_TimerMainHeader *s_Header) |
1020 | { | 1020 | { |
1021 | 1021 | ||
1022 | unsigned short i, w_Size = 0, w_Temp; | 1022 | unsigned short i, w_Size = 0, w_Temp; |
@@ -1120,7 +1120,7 @@ int i_EepromReadAnlogOutputHeader(unsigned short w_PCIBoardEepromAddress, | |||
1120 | /* Reads only for ONE hardware component */ | 1120 | /* Reads only for ONE hardware component */ |
1121 | int i_EepromReadAnlogInputHeader(unsigned short w_PCIBoardEepromAddress, | 1121 | int i_EepromReadAnlogInputHeader(unsigned short w_PCIBoardEepromAddress, |
1122 | char *pc_PCIChipInformation, unsigned short w_Address, | 1122 | char *pc_PCIChipInformation, unsigned short w_Address, |
1123 | struct str_AnalogInputHeader * s_Header) | 1123 | struct str_AnalogInputHeader *s_Header) |
1124 | { | 1124 | { |
1125 | unsigned short w_Temp, w_Offset; | 1125 | unsigned short w_Temp, w_Offset; |
1126 | w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress, | 1126 | w_Temp = w_EepromReadWord(w_PCIBoardEepromAddress, |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c index 502aaeaa802..176bd868a2b 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c | |||
@@ -56,7 +56,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | |||
56 | #include "APCI1710_Pwm.c" | 56 | #include "APCI1710_Pwm.c" |
57 | #include "APCI1710_INCCPT.c" | 57 | #include "APCI1710_INCCPT.c" |
58 | 58 | ||
59 | void i_ADDI_AttachPCI1710(struct comedi_device * dev) | 59 | void i_ADDI_AttachPCI1710(struct comedi_device *dev) |
60 | { | 60 | { |
61 | struct comedi_subdevice *s; | 61 | struct comedi_subdevice *s; |
62 | int ret = 0; | 62 | int ret = 0; |
@@ -195,11 +195,11 @@ void i_ADDI_AttachPCI1710(struct comedi_device * dev) | |||
195 | s->insn_bits = i_APCI1710_InsnBitsINCCPT; | 195 | s->insn_bits = i_APCI1710_InsnBitsINCCPT; |
196 | } | 196 | } |
197 | 197 | ||
198 | int i_APCI1710_Reset(struct comedi_device * dev); | 198 | int i_APCI1710_Reset(struct comedi_device *dev); |
199 | void v_APCI1710_Interrupt(int irq, void *d); | 199 | void v_APCI1710_Interrupt(int irq, void *d); |
200 | /* for 1710 */ | 200 | /* for 1710 */ |
201 | 201 | ||
202 | int i_APCI1710_Reset(struct comedi_device * dev) | 202 | int i_APCI1710_Reset(struct comedi_device *dev) |
203 | { | 203 | { |
204 | int ret; | 204 | int ret; |
205 | unsigned int dw_Dummy; | 205 | unsigned int dw_Dummy; |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c index e9c7a3c1c39..ea4cac504b5 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c | |||
@@ -109,8 +109,8 @@ int i_Flag = 1; | |||
109 | | | | 109 | | | |
110 | +----------------------------------------------------------------------------+ | 110 | +----------------------------------------------------------------------------+ |
111 | */ | 111 | */ |
112 | int i_APCI035_ConfigTimerWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, | 112 | int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, |
113 | struct comedi_insn * insn, unsigned int * data) | 113 | struct comedi_insn *insn, unsigned int *data) |
114 | { | 114 | { |
115 | unsigned int ui_Status = 0; | 115 | unsigned int ui_Status = 0; |
116 | unsigned int ui_Command = 0; | 116 | unsigned int ui_Command = 0; |
@@ -278,8 +278,8 @@ int i_APCI035_ConfigTimerWatchdog(struct comedi_device * dev, struct comedi_subd | |||
278 | | | | 278 | | | |
279 | +----------------------------------------------------------------------------+ | 279 | +----------------------------------------------------------------------------+ |
280 | */ | 280 | */ |
281 | int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device * dev, | 281 | int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev, |
282 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 282 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
283 | { | 283 | { |
284 | unsigned int ui_Command = 0; | 284 | unsigned int ui_Command = 0; |
285 | int i_Count = 0; | 285 | int i_Count = 0; |
@@ -393,8 +393,8 @@ int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device * dev, | |||
393 | | | | 393 | | | |
394 | +----------------------------------------------------------------------------+ | 394 | +----------------------------------------------------------------------------+ |
395 | */ | 395 | */ |
396 | int i_APCI035_ReadTimerWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, | 396 | int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, |
397 | struct comedi_insn * insn, unsigned int * data) | 397 | struct comedi_insn *insn, unsigned int *data) |
398 | { | 398 | { |
399 | unsigned int ui_Status = 0; /* Status register */ | 399 | unsigned int ui_Status = 0; /* Status register */ |
400 | i_WatchdogNbr = insn->unused[0]; | 400 | i_WatchdogNbr = insn->unused[0]; |
@@ -449,8 +449,8 @@ int i_APCI035_ReadTimerWatchdog(struct comedi_device * dev, struct comedi_subdev | |||
449 | | | | 449 | | | |
450 | +----------------------------------------------------------------------------+ | 450 | +----------------------------------------------------------------------------+ |
451 | */ | 451 | */ |
452 | int i_APCI035_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s, | 452 | int i_APCI035_ConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, |
453 | struct comedi_insn * insn, unsigned int * data) | 453 | struct comedi_insn *insn, unsigned int *data) |
454 | { | 454 | { |
455 | devpriv->tsk_Current = current; | 455 | devpriv->tsk_Current = current; |
456 | outl(0x200 | 0, devpriv->iobase + 128 + 0x4); | 456 | outl(0x200 | 0, devpriv->iobase + 128 + 0x4); |
@@ -486,8 +486,8 @@ int i_APCI035_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subdev | |||
486 | | | | 486 | | | |
487 | +----------------------------------------------------------------------------+ | 487 | +----------------------------------------------------------------------------+ |
488 | */ | 488 | */ |
489 | int i_APCI035_ReadAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s, | 489 | int i_APCI035_ReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, |
490 | struct comedi_insn * insn, unsigned int * data) | 490 | struct comedi_insn *insn, unsigned int *data) |
491 | { | 491 | { |
492 | unsigned int ui_CommandRegister = 0; | 492 | unsigned int ui_CommandRegister = 0; |
493 | /******************/ | 493 | /******************/ |
@@ -521,7 +521,7 @@ int i_APCI035_ReadAnalogInput(struct comedi_device * dev, struct comedi_subdevic | |||
521 | | | | 521 | | | |
522 | +----------------------------------------------------------------------------+ | 522 | +----------------------------------------------------------------------------+ |
523 | */ | 523 | */ |
524 | int i_APCI035_Reset(struct comedi_device * dev) | 524 | int i_APCI035_Reset(struct comedi_device *dev) |
525 | { | 525 | { |
526 | int i_Count = 0; | 526 | int i_Count = 0; |
527 | for (i_Count = 1; i_Count <= 4; i_Count++) { | 527 | for (i_Count = 1; i_Count <= 4; i_Count++) { |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c index 0966ad6214a..4df4812e70b 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c | |||
@@ -84,8 +84,8 @@ unsigned int ui_InterruptStatus = 0; | |||
84 | +----------------------------------------------------------------------------+ | 84 | +----------------------------------------------------------------------------+ |
85 | */ | 85 | */ |
86 | 86 | ||
87 | int i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, | 87 | int i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, |
88 | struct comedi_insn * insn, unsigned int * data) | 88 | struct comedi_insn *insn, unsigned int *data) |
89 | { | 89 | { |
90 | unsigned int ui_TmpValue; | 90 | unsigned int ui_TmpValue; |
91 | 91 | ||
@@ -144,8 +144,8 @@ int i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subd | |||
144 | | | | 144 | | | |
145 | +----------------------------------------------------------------------------+ | 145 | +----------------------------------------------------------------------------+ |
146 | */ | 146 | */ |
147 | int i_APCI1032_Read1DigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, | 147 | int i_APCI1032_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, |
148 | struct comedi_insn * insn, unsigned int * data) | 148 | struct comedi_insn *insn, unsigned int *data) |
149 | { | 149 | { |
150 | unsigned int ui_TmpValue = 0; | 150 | unsigned int ui_TmpValue = 0; |
151 | unsigned int ui_Channel; | 151 | unsigned int ui_Channel; |
@@ -185,8 +185,8 @@ int i_APCI1032_Read1DigitalInput(struct comedi_device * dev, struct comedi_subde | |||
185 | +----------------------------------------------------------------------------+ | 185 | +----------------------------------------------------------------------------+ |
186 | */ | 186 | */ |
187 | 187 | ||
188 | int i_APCI1032_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, | 188 | int i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, |
189 | struct comedi_insn * insn, unsigned int * data) | 189 | struct comedi_insn *insn, unsigned int *data) |
190 | { | 190 | { |
191 | unsigned int ui_PortValue = data[0]; | 191 | unsigned int ui_PortValue = data[0]; |
192 | unsigned int ui_Mask = 0; | 192 | unsigned int ui_Mask = 0; |
@@ -277,7 +277,7 @@ static void v_APCI1032_Interrupt(int irq, void *d) | |||
277 | +----------------------------------------------------------------------------+ | 277 | +----------------------------------------------------------------------------+ |
278 | */ | 278 | */ |
279 | 279 | ||
280 | int i_APCI1032_Reset(struct comedi_device * dev) | 280 | int i_APCI1032_Reset(struct comedi_device *dev) |
281 | { | 281 | { |
282 | outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ); /* disable the interrupts */ | 282 | outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ); /* disable the interrupts */ |
283 | inl(devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_STATUS); /* Reset the interrupt status register */ | 283 | inl(devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_STATUS); /* Reset the interrupt status register */ |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c index 8f2cae90be7..da0e6dd8a17 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c | |||
@@ -137,8 +137,8 @@ int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled = | |||
137 | +----------------------------------------------------------------------------+ | 137 | +----------------------------------------------------------------------------+ |
138 | */ | 138 | */ |
139 | 139 | ||
140 | int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device * dev, | 140 | int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev, |
141 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 141 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
142 | { | 142 | { |
143 | int i_PatternPolarity = 0, i_PatternTransition = 0, i_PatternMask = 0; | 143 | int i_PatternPolarity = 0, i_PatternTransition = 0, i_PatternMask = 0; |
144 | int i_MaxChannel = 0, i_Count = 0, i_EventMask = 0; | 144 | int i_MaxChannel = 0, i_Count = 0, i_EventMask = 0; |
@@ -519,8 +519,8 @@ int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device * dev, | |||
519 | | | | 519 | | | |
520 | +----------------------------------------------------------------------------+ | 520 | +----------------------------------------------------------------------------+ |
521 | */ | 521 | */ |
522 | int i_APCI1500_StartStopInputEvent(struct comedi_device * dev, struct comedi_subdevice * s, | 522 | int i_APCI1500_StartStopInputEvent(struct comedi_device *dev, struct comedi_subdevice *s, |
523 | struct comedi_insn * insn, unsigned int * data) | 523 | struct comedi_insn *insn, unsigned int *data) |
524 | { | 524 | { |
525 | int i_Event1InterruptStatus = 0, i_Event2InterruptStatus = | 525 | int i_Event1InterruptStatus = 0, i_Event2InterruptStatus = |
526 | 0, i_RegValue; | 526 | 0, i_RegValue; |
@@ -784,8 +784,8 @@ int i_APCI1500_StartStopInputEvent(struct comedi_device * dev, struct comedi_sub | |||
784 | | | | 784 | | | |
785 | +----------------------------------------------------------------------------+ | 785 | +----------------------------------------------------------------------------+ |
786 | */ | 786 | */ |
787 | int i_APCI1500_Initialisation(struct comedi_device * dev, struct comedi_subdevice * s, | 787 | int i_APCI1500_Initialisation(struct comedi_device *dev, struct comedi_subdevice *s, |
788 | struct comedi_insn * insn, unsigned int * data) | 788 | struct comedi_insn *insn, unsigned int *data) |
789 | { | 789 | { |
790 | int i_DummyRead = 0; | 790 | int i_DummyRead = 0; |
791 | /******************/ | 791 | /******************/ |
@@ -957,8 +957,8 @@ int i_APCI1500_Initialisation(struct comedi_device * dev, struct comedi_subdevic | |||
957 | +----------------------------------------------------------------------------+ | 957 | +----------------------------------------------------------------------------+ |
958 | */ | 958 | */ |
959 | 959 | ||
960 | int i_APCI1500_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, | 960 | int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, |
961 | struct comedi_insn * insn, unsigned int * data) | 961 | struct comedi_insn *insn, unsigned int *data) |
962 | { | 962 | { |
963 | unsigned int ui_PortValue = data[1]; | 963 | unsigned int ui_PortValue = data[1]; |
964 | unsigned int ui_Mask = 0; | 964 | unsigned int ui_Mask = 0; |
@@ -1040,8 +1040,8 @@ int i_APCI1500_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su | |||
1040 | | | | 1040 | | | |
1041 | +----------------------------------------------------------------------------+ | 1041 | +----------------------------------------------------------------------------+ |
1042 | */ | 1042 | */ |
1043 | int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device * dev, | 1043 | int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *dev, |
1044 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1044 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1045 | { | 1045 | { |
1046 | devpriv->b_OutputMemoryStatus = data[0]; | 1046 | devpriv->b_OutputMemoryStatus = data[0]; |
1047 | return insn->n; | 1047 | return insn->n; |
@@ -1067,8 +1067,8 @@ int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device * dev, | |||
1067 | +----------------------------------------------------------------------------+ | 1067 | +----------------------------------------------------------------------------+ |
1068 | */ | 1068 | */ |
1069 | 1069 | ||
1070 | int i_APCI1500_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 1070 | int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
1071 | struct comedi_insn * insn, unsigned int * data) | 1071 | struct comedi_insn *insn, unsigned int *data) |
1072 | { | 1072 | { |
1073 | static unsigned int ui_Temp = 0; | 1073 | static unsigned int ui_Temp = 0; |
1074 | unsigned int ui_Temp1; | 1074 | unsigned int ui_Temp1; |
@@ -1261,8 +1261,8 @@ int i_APCI1500_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd | |||
1261 | +----------------------------------------------------------------------------+ | 1261 | +----------------------------------------------------------------------------+ |
1262 | */ | 1262 | */ |
1263 | 1263 | ||
1264 | int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device * dev, | 1264 | int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev, |
1265 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1265 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1266 | { | 1266 | { |
1267 | int i_TimerCounterMode, i_MasterConfiguration; | 1267 | int i_TimerCounterMode, i_MasterConfiguration; |
1268 | 1268 | ||
@@ -1860,8 +1860,8 @@ int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device * dev, | |||
1860 | | | | 1860 | | | |
1861 | +----------------------------------------------------------------------------+ | 1861 | +----------------------------------------------------------------------------+ |
1862 | */ | 1862 | */ |
1863 | int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device * dev, | 1863 | int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev, |
1864 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1864 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1865 | { | 1865 | { |
1866 | int i_CommandAndStatusValue; | 1866 | int i_CommandAndStatusValue; |
1867 | 1867 | ||
@@ -2182,8 +2182,8 @@ int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device * dev, | |||
2182 | +----------------------------------------------------------------------------+ | 2182 | +----------------------------------------------------------------------------+ |
2183 | */ | 2183 | */ |
2184 | 2184 | ||
2185 | int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device * dev, | 2185 | int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev, |
2186 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 2186 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
2187 | { | 2187 | { |
2188 | int i_CommandAndStatusValue; | 2188 | int i_CommandAndStatusValue; |
2189 | switch (data[0]) { | 2189 | switch (data[0]) { |
@@ -2370,8 +2370,8 @@ int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device * dev, | |||
2370 | | | | 2370 | | | |
2371 | +----------------------------------------------------------------------------+ | 2371 | +----------------------------------------------------------------------------+ |
2372 | */ | 2372 | */ |
2373 | int i_APCI1500_ReadInterruptMask(struct comedi_device * dev, struct comedi_subdevice * s, | 2373 | int i_APCI1500_ReadInterruptMask(struct comedi_device *dev, struct comedi_subdevice *s, |
2374 | struct comedi_insn * insn, unsigned int * data) | 2374 | struct comedi_insn *insn, unsigned int *data) |
2375 | { | 2375 | { |
2376 | data[0] = i_InterruptMask; | 2376 | data[0] = i_InterruptMask; |
2377 | data[1] = i_InputChannel; | 2377 | data[1] = i_InputChannel; |
@@ -2401,8 +2401,8 @@ int i_APCI1500_ReadInterruptMask(struct comedi_device * dev, struct comedi_subde | |||
2401 | | | | 2401 | | | |
2402 | +----------------------------------------------------------------------------+ | 2402 | +----------------------------------------------------------------------------+ |
2403 | */ | 2403 | */ |
2404 | int i_APCI1500_ConfigureInterrupt(struct comedi_device * dev, struct comedi_subdevice * s, | 2404 | int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev, struct comedi_subdevice *s, |
2405 | struct comedi_insn * insn, unsigned int * data) | 2405 | struct comedi_insn *insn, unsigned int *data) |
2406 | { | 2406 | { |
2407 | unsigned int ui_Status; | 2407 | unsigned int ui_Status; |
2408 | int i_RegValue; | 2408 | int i_RegValue; |
@@ -2822,7 +2822,7 @@ static void v_APCI1500_Interrupt(int irq, void *d) | |||
2822 | +----------------------------------------------------------------------------+ | 2822 | +----------------------------------------------------------------------------+ |
2823 | */ | 2823 | */ |
2824 | 2824 | ||
2825 | int i_APCI1500_Reset(struct comedi_device * dev) | 2825 | int i_APCI1500_Reset(struct comedi_device *dev) |
2826 | { | 2826 | { |
2827 | int i_DummyRead = 0; | 2827 | int i_DummyRead = 0; |
2828 | i_TimerCounter1Init = 0; | 2828 | i_TimerCounter1Init = 0; |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c index bcc9b7a67f2..dc2a1a9b41c 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c | |||
@@ -73,8 +73,8 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | |||
73 | | | | 73 | | | |
74 | +----------------------------------------------------------------------------+ | 74 | +----------------------------------------------------------------------------+ |
75 | */ | 75 | */ |
76 | int i_APCI1516_Read1DigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, | 76 | int i_APCI1516_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, |
77 | struct comedi_insn * insn, unsigned int * data) | 77 | struct comedi_insn *insn, unsigned int *data) |
78 | { | 78 | { |
79 | unsigned int ui_TmpValue = 0; | 79 | unsigned int ui_TmpValue = 0; |
80 | unsigned int ui_Channel; | 80 | unsigned int ui_Channel; |
@@ -114,8 +114,8 @@ int i_APCI1516_Read1DigitalInput(struct comedi_device * dev, struct comedi_subde | |||
114 | +----------------------------------------------------------------------------+ | 114 | +----------------------------------------------------------------------------+ |
115 | */ | 115 | */ |
116 | 116 | ||
117 | int i_APCI1516_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, | 117 | int i_APCI1516_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, |
118 | struct comedi_insn * insn, unsigned int * data) | 118 | struct comedi_insn *insn, unsigned int *data) |
119 | { | 119 | { |
120 | 120 | ||
121 | unsigned int ui_PortValue = data[0]; | 121 | unsigned int ui_PortValue = data[0]; |
@@ -171,8 +171,8 @@ int i_APCI1516_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su | |||
171 | | | | 171 | | | |
172 | +----------------------------------------------------------------------------+ | 172 | +----------------------------------------------------------------------------+ |
173 | */ | 173 | */ |
174 | int i_APCI1516_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 174 | int i_APCI1516_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
175 | struct comedi_insn * insn, unsigned int * data) | 175 | struct comedi_insn *insn, unsigned int *data) |
176 | { | 176 | { |
177 | devpriv->b_OutputMemoryStatus = data[0]; | 177 | devpriv->b_OutputMemoryStatus = data[0]; |
178 | return insn->n; | 178 | return insn->n; |
@@ -199,8 +199,8 @@ int i_APCI1516_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub | |||
199 | +----------------------------------------------------------------------------+ | 199 | +----------------------------------------------------------------------------+ |
200 | */ | 200 | */ |
201 | 201 | ||
202 | int i_APCI1516_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 202 | int i_APCI1516_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
203 | struct comedi_insn * insn, unsigned int * data) | 203 | struct comedi_insn *insn, unsigned int *data) |
204 | { | 204 | { |
205 | unsigned int ui_Temp, ui_Temp1; | 205 | unsigned int ui_Temp, ui_Temp1; |
206 | unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec); /* get the channel */ | 206 | unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec); /* get the channel */ |
@@ -359,8 +359,8 @@ int i_APCI1516_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd | |||
359 | +----------------------------------------------------------------------------+ | 359 | +----------------------------------------------------------------------------+ |
360 | */ | 360 | */ |
361 | 361 | ||
362 | int i_APCI1516_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 362 | int i_APCI1516_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
363 | struct comedi_insn * insn, unsigned int * data) | 363 | struct comedi_insn *insn, unsigned int *data) |
364 | { | 364 | { |
365 | 365 | ||
366 | unsigned int ui_Temp; | 366 | unsigned int ui_Temp; |
@@ -419,8 +419,8 @@ int i_APCI1516_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde | |||
419 | +----------------------------------------------------------------------------+ | 419 | +----------------------------------------------------------------------------+ |
420 | */ | 420 | */ |
421 | 421 | ||
422 | int i_APCI1516_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, | 422 | int i_APCI1516_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, |
423 | struct comedi_insn * insn, unsigned int * data) | 423 | struct comedi_insn *insn, unsigned int *data) |
424 | { | 424 | { |
425 | if (data[0] == 0) { | 425 | if (data[0] == 0) { |
426 | /* Disable the watchdog */ | 426 | /* Disable the watchdog */ |
@@ -465,8 +465,8 @@ int i_APCI1516_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevic | |||
465 | +----------------------------------------------------------------------------+ | 465 | +----------------------------------------------------------------------------+ |
466 | */ | 466 | */ |
467 | 467 | ||
468 | int i_APCI1516_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, | 468 | int i_APCI1516_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, |
469 | struct comedi_insn * insn, unsigned int * data) | 469 | struct comedi_insn *insn, unsigned int *data) |
470 | { | 470 | { |
471 | switch (data[0]) { | 471 | switch (data[0]) { |
472 | case 0: /* stop the watchdog */ | 472 | case 0: /* stop the watchdog */ |
@@ -510,8 +510,8 @@ int i_APCI1516_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_ | |||
510 | +----------------------------------------------------------------------------+ | 510 | +----------------------------------------------------------------------------+ |
511 | */ | 511 | */ |
512 | 512 | ||
513 | int i_APCI1516_ReadWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, | 513 | int i_APCI1516_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, |
514 | struct comedi_insn * insn, unsigned int * data) | 514 | struct comedi_insn *insn, unsigned int *data) |
515 | { | 515 | { |
516 | data[0] = inw(devpriv->i_IobaseAddon + APCI1516_WATCHDOG_STATUS) & 0x1; | 516 | data[0] = inw(devpriv->i_IobaseAddon + APCI1516_WATCHDOG_STATUS) & 0x1; |
517 | return insn->n; | 517 | return insn->n; |
@@ -532,7 +532,7 @@ int i_APCI1516_ReadWatchdog(struct comedi_device * dev, struct comedi_subdevice | |||
532 | +----------------------------------------------------------------------------+ | 532 | +----------------------------------------------------------------------------+ |
533 | */ | 533 | */ |
534 | 534 | ||
535 | int i_APCI1516_Reset(struct comedi_device * dev) | 535 | int i_APCI1516_Reset(struct comedi_device *dev) |
536 | { | 536 | { |
537 | outw(0x0, devpriv->iobase + APCI1516_DIGITAL_OP); /* RESETS THE DIGITAL OUTPUTS */ | 537 | outw(0x0, devpriv->iobase + APCI1516_DIGITAL_OP); /* RESETS THE DIGITAL OUTPUTS */ |
538 | outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_ENABLEDISABLE); | 538 | outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_ENABLEDISABLE); |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c index 304079bbb80..f90e9605c9b 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c | |||
@@ -86,8 +86,8 @@ unsigned int ui_InterruptData, ui_Type; | |||
86 | | | | 86 | | | |
87 | +----------------------------------------------------------------------------+ | 87 | +----------------------------------------------------------------------------+ |
88 | */ | 88 | */ |
89 | int i_APCI1564_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, | 89 | int i_APCI1564_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, |
90 | struct comedi_insn * insn, unsigned int * data) | 90 | struct comedi_insn *insn, unsigned int *data) |
91 | { | 91 | { |
92 | devpriv->tsk_Current = current; | 92 | devpriv->tsk_Current = current; |
93 | /*******************************/ | 93 | /*******************************/ |
@@ -147,8 +147,8 @@ int i_APCI1564_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subd | |||
147 | | | | 147 | | | |
148 | +----------------------------------------------------------------------------+ | 148 | +----------------------------------------------------------------------------+ |
149 | */ | 149 | */ |
150 | int i_APCI1564_Read1DigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, | 150 | int i_APCI1564_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, |
151 | struct comedi_insn * insn, unsigned int * data) | 151 | struct comedi_insn *insn, unsigned int *data) |
152 | { | 152 | { |
153 | unsigned int ui_TmpValue = 0; | 153 | unsigned int ui_TmpValue = 0; |
154 | unsigned int ui_Channel; | 154 | unsigned int ui_Channel; |
@@ -189,8 +189,8 @@ int i_APCI1564_Read1DigitalInput(struct comedi_device * dev, struct comedi_subde | |||
189 | | | | 189 | | | |
190 | +----------------------------------------------------------------------------+ | 190 | +----------------------------------------------------------------------------+ |
191 | */ | 191 | */ |
192 | int i_APCI1564_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, | 192 | int i_APCI1564_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, |
193 | struct comedi_insn * insn, unsigned int * data) | 193 | struct comedi_insn *insn, unsigned int *data) |
194 | { | 194 | { |
195 | unsigned int ui_PortValue = data[0]; | 195 | unsigned int ui_PortValue = data[0]; |
196 | unsigned int ui_Mask = 0; | 196 | unsigned int ui_Mask = 0; |
@@ -257,8 +257,8 @@ int i_APCI1564_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su | |||
257 | | | | 257 | | | |
258 | +----------------------------------------------------------------------------+ | 258 | +----------------------------------------------------------------------------+ |
259 | */ | 259 | */ |
260 | int i_APCI1564_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 260 | int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
261 | struct comedi_insn * insn, unsigned int * data) | 261 | struct comedi_insn *insn, unsigned int *data) |
262 | { | 262 | { |
263 | unsigned int ul_Command = 0; | 263 | unsigned int ul_Command = 0; |
264 | 264 | ||
@@ -314,8 +314,8 @@ int i_APCI1564_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub | |||
314 | | | | 314 | | | |
315 | +----------------------------------------------------------------------------+ | 315 | +----------------------------------------------------------------------------+ |
316 | */ | 316 | */ |
317 | int i_APCI1564_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 317 | int i_APCI1564_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
318 | struct comedi_insn * insn, unsigned int * data) | 318 | struct comedi_insn *insn, unsigned int *data) |
319 | { | 319 | { |
320 | unsigned int ui_Temp, ui_Temp1; | 320 | unsigned int ui_Temp, ui_Temp1; |
321 | unsigned int ui_NoOfChannel; | 321 | unsigned int ui_NoOfChannel; |
@@ -488,8 +488,8 @@ int i_APCI1564_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd | |||
488 | | | | 488 | | | |
489 | +----------------------------------------------------------------------------+ | 489 | +----------------------------------------------------------------------------+ |
490 | */ | 490 | */ |
491 | int i_APCI1564_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 491 | int i_APCI1564_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
492 | struct comedi_insn * insn, unsigned int * data) | 492 | struct comedi_insn *insn, unsigned int *data) |
493 | { | 493 | { |
494 | unsigned int ui_Temp; | 494 | unsigned int ui_Temp; |
495 | unsigned int ui_NoOfChannel; | 495 | unsigned int ui_NoOfChannel; |
@@ -566,8 +566,8 @@ int i_APCI1564_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde | |||
566 | | | | 566 | | | |
567 | +----------------------------------------------------------------------------+ | 567 | +----------------------------------------------------------------------------+ |
568 | */ | 568 | */ |
569 | int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device * dev, | 569 | int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev, |
570 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 570 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
571 | { | 571 | { |
572 | unsigned int ul_Command1 = 0; | 572 | unsigned int ul_Command1 = 0; |
573 | devpriv->tsk_Current = current; | 573 | devpriv->tsk_Current = current; |
@@ -720,8 +720,8 @@ int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device * dev, | |||
720 | | | | 720 | | | |
721 | +----------------------------------------------------------------------------+ | 721 | +----------------------------------------------------------------------------+ |
722 | */ | 722 | */ |
723 | int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device * dev, | 723 | int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev, |
724 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 724 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
725 | { | 725 | { |
726 | unsigned int ul_Command1 = 0; | 726 | unsigned int ul_Command1 = 0; |
727 | if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) { | 727 | if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) { |
@@ -815,8 +815,8 @@ int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device * dev, | |||
815 | | | | 815 | | | |
816 | +----------------------------------------------------------------------------+ | 816 | +----------------------------------------------------------------------------+ |
817 | */ | 817 | */ |
818 | int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device * dev, | 818 | int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev, |
819 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 819 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
820 | { | 820 | { |
821 | unsigned int ul_Command1 = 0; | 821 | unsigned int ul_Command1 = 0; |
822 | 822 | ||
@@ -894,8 +894,8 @@ int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device * dev, | |||
894 | +----------------------------------------------------------------------------+ | 894 | +----------------------------------------------------------------------------+ |
895 | */ | 895 | */ |
896 | 896 | ||
897 | int i_APCI1564_ReadInterruptStatus(struct comedi_device * dev, struct comedi_subdevice * s, | 897 | int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev, struct comedi_subdevice *s, |
898 | struct comedi_insn * insn, unsigned int * data) | 898 | struct comedi_insn *insn, unsigned int *data) |
899 | { | 899 | { |
900 | *data = ui_Type; | 900 | *data = ui_Type; |
901 | return insn->n; | 901 | return insn->n; |
@@ -1083,7 +1083,7 @@ static void v_APCI1564_Interrupt(int irq, void *d) | |||
1083 | +----------------------------------------------------------------------------+ | 1083 | +----------------------------------------------------------------------------+ |
1084 | */ | 1084 | */ |
1085 | 1085 | ||
1086 | int i_APCI1564_Reset(struct comedi_device * dev) | 1086 | int i_APCI1564_Reset(struct comedi_device *dev) |
1087 | { | 1087 | { |
1088 | outl(0x0, devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_IRQ); /* disable the interrupts */ | 1088 | outl(0x0, devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_IRQ); /* disable the interrupts */ |
1089 | inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_INTERRUPT_STATUS); /* Reset the interrupt status register */ | 1089 | inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_INTERRUPT_STATUS); /* Reset the interrupt status register */ |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c index b22739a6c9a..1261801d0b8 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c | |||
@@ -90,8 +90,8 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | |||
90 | +----------------------------------------------------------------------------+ | 90 | +----------------------------------------------------------------------------+ |
91 | */ | 91 | */ |
92 | 92 | ||
93 | int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev, | 93 | int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device *dev, |
94 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 94 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
95 | { | 95 | { |
96 | int i_ReturnValue = insn->n; | 96 | int i_ReturnValue = insn->n; |
97 | unsigned char b_Command = 0; | 97 | unsigned char b_Command = 0; |
@@ -283,8 +283,8 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev, | |||
283 | +----------------------------------------------------------------------------+ | 283 | +----------------------------------------------------------------------------+ |
284 | */ | 284 | */ |
285 | 285 | ||
286 | int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev, | 286 | int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device *dev, |
287 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 287 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
288 | { | 288 | { |
289 | int i_ReturnValue = insn->n; | 289 | int i_ReturnValue = insn->n; |
290 | unsigned char b_Command = 0; | 290 | unsigned char b_Command = 0; |
@@ -430,8 +430,8 @@ int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev, | |||
430 | +----------------------------------------------------------------------------+ | 430 | +----------------------------------------------------------------------------+ |
431 | */ | 431 | */ |
432 | 432 | ||
433 | int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev, | 433 | int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev, |
434 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 434 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
435 | { | 435 | { |
436 | unsigned char b_Command = (unsigned char) CR_AREF(insn->chanspec); | 436 | unsigned char b_Command = (unsigned char) CR_AREF(insn->chanspec); |
437 | int i_ReturnValue = insn->n; | 437 | int i_ReturnValue = insn->n; |
@@ -570,8 +570,8 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev, | |||
570 | +----------------------------------------------------------------------------+ | 570 | +----------------------------------------------------------------------------+ |
571 | */ | 571 | */ |
572 | 572 | ||
573 | int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device * dev, | 573 | int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device *dev, |
574 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 574 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
575 | { | 575 | { |
576 | int i_ReturnValue = insn->n; | 576 | int i_ReturnValue = insn->n; |
577 | unsigned char b_Command = 0; | 577 | unsigned char b_Command = 0; |
@@ -774,7 +774,7 @@ int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device * dev, | |||
774 | +----------------------------------------------------------------------------+ | 774 | +----------------------------------------------------------------------------+ |
775 | */ | 775 | */ |
776 | 776 | ||
777 | int i_APCI16XX_Reset(struct comedi_device * dev) | 777 | int i_APCI16XX_Reset(struct comedi_device *dev) |
778 | { | 778 | { |
779 | return 0; | 779 | return 0; |
780 | } | 780 | } |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c index 1969e8df737..58ff5df037e 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c | |||
@@ -75,8 +75,8 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | |||
75 | | | | 75 | | | |
76 | +----------------------------------------------------------------------------+ | 76 | +----------------------------------------------------------------------------+ |
77 | */ | 77 | */ |
78 | int i_APCI2016_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 78 | int i_APCI2016_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
79 | struct comedi_insn * insn, unsigned int * data) | 79 | struct comedi_insn *insn, unsigned int *data) |
80 | { | 80 | { |
81 | if ((data[0] != 0) && (data[0] != 1)) { | 81 | if ((data[0] != 0) && (data[0] != 1)) { |
82 | comedi_error(dev, | 82 | comedi_error(dev, |
@@ -111,8 +111,8 @@ int i_APCI2016_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub | |||
111 | | | | 111 | | | |
112 | +----------------------------------------------------------------------------+ | 112 | +----------------------------------------------------------------------------+ |
113 | */ | 113 | */ |
114 | int i_APCI2016_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 114 | int i_APCI2016_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
115 | struct comedi_insn * insn, unsigned int * data) | 115 | struct comedi_insn *insn, unsigned int *data) |
116 | { | 116 | { |
117 | unsigned int ui_NoOfChannel; | 117 | unsigned int ui_NoOfChannel; |
118 | unsigned int ui_Temp, ui_Temp1; | 118 | unsigned int ui_Temp, ui_Temp1; |
@@ -266,8 +266,8 @@ int i_APCI2016_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd | |||
266 | | | | 266 | | | |
267 | +----------------------------------------------------------------------------+ | 267 | +----------------------------------------------------------------------------+ |
268 | */ | 268 | */ |
269 | int i_APCI2016_BitsDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 269 | int i_APCI2016_BitsDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
270 | struct comedi_insn * insn, unsigned int * data) | 270 | struct comedi_insn *insn, unsigned int *data) |
271 | { | 271 | { |
272 | unsigned int ui_Temp; | 272 | unsigned int ui_Temp; |
273 | unsigned int ui_NoOfChannel; | 273 | unsigned int ui_NoOfChannel; |
@@ -337,8 +337,8 @@ int i_APCI2016_BitsDigitalOutput(struct comedi_device * dev, struct comedi_subde | |||
337 | | | | 337 | | | |
338 | +----------------------------------------------------------------------------+ | 338 | +----------------------------------------------------------------------------+ |
339 | */ | 339 | */ |
340 | int i_APCI2016_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, | 340 | int i_APCI2016_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, |
341 | struct comedi_insn * insn, unsigned int * data) | 341 | struct comedi_insn *insn, unsigned int *data) |
342 | { | 342 | { |
343 | 343 | ||
344 | if (data[0] == 0) { | 344 | if (data[0] == 0) { |
@@ -380,8 +380,8 @@ int i_APCI2016_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevic | |||
380 | | | | 380 | | | |
381 | +----------------------------------------------------------------------------+ | 381 | +----------------------------------------------------------------------------+ |
382 | */ | 382 | */ |
383 | int i_APCI2016_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, | 383 | int i_APCI2016_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, |
384 | struct comedi_insn * insn, unsigned int * data) | 384 | struct comedi_insn *insn, unsigned int *data) |
385 | { | 385 | { |
386 | 386 | ||
387 | switch (data[0]) { | 387 | switch (data[0]) { |
@@ -427,8 +427,8 @@ int i_APCI2016_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_ | |||
427 | +----------------------------------------------------------------------------+ | 427 | +----------------------------------------------------------------------------+ |
428 | */ | 428 | */ |
429 | 429 | ||
430 | int i_APCI2016_ReadWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, | 430 | int i_APCI2016_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, |
431 | struct comedi_insn * insn, unsigned int * data) | 431 | struct comedi_insn *insn, unsigned int *data) |
432 | { | 432 | { |
433 | udelay(5); | 433 | udelay(5); |
434 | data[0] = inw(devpriv->i_IobaseAddon + APCI2016_WATCHDOG_STATUS) & 0x1; | 434 | data[0] = inw(devpriv->i_IobaseAddon + APCI2016_WATCHDOG_STATUS) & 0x1; |
@@ -450,7 +450,7 @@ int i_APCI2016_ReadWatchdog(struct comedi_device * dev, struct comedi_subdevice | |||
450 | +----------------------------------------------------------------------------+ | 450 | +----------------------------------------------------------------------------+ |
451 | */ | 451 | */ |
452 | 452 | ||
453 | int i_APCI2016_Reset(struct comedi_device * dev) | 453 | int i_APCI2016_Reset(struct comedi_device *dev) |
454 | { | 454 | { |
455 | outw(0x0, devpriv->iobase + APCI2016_DIGITAL_OP); /* Resets the digital output channels */ | 455 | outw(0x0, devpriv->iobase + APCI2016_DIGITAL_OP); /* Resets the digital output channels */ |
456 | outw(0x0, devpriv->i_IobaseAddon + APCI2016_WATCHDOG_ENABLEDISABLE); | 456 | outw(0x0, devpriv->i_IobaseAddon + APCI2016_WATCHDOG_ENABLEDISABLE); |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c index c2580c6e0d4..ad91b7b4a5c 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c | |||
@@ -79,8 +79,8 @@ unsigned int ui_InterruptData, ui_Type; | |||
79 | | | | 79 | | | |
80 | +----------------------------------------------------------------------------+ | 80 | +----------------------------------------------------------------------------+ |
81 | */ | 81 | */ |
82 | int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 82 | int i_APCI2032_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
83 | struct comedi_insn * insn, unsigned int * data) | 83 | struct comedi_insn *insn, unsigned int *data) |
84 | { | 84 | { |
85 | unsigned int ul_Command = 0; | 85 | unsigned int ul_Command = 0; |
86 | devpriv->tsk_Current = current; | 86 | devpriv->tsk_Current = current; |
@@ -134,8 +134,8 @@ int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub | |||
134 | +----------------------------------------------------------------------------+ | 134 | +----------------------------------------------------------------------------+ |
135 | */ | 135 | */ |
136 | 136 | ||
137 | int i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 137 | int i_APCI2032_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
138 | struct comedi_insn * insn, unsigned int * data) | 138 | struct comedi_insn *insn, unsigned int *data) |
139 | { | 139 | { |
140 | unsigned int ui_Temp, ui_Temp1; | 140 | unsigned int ui_Temp, ui_Temp1; |
141 | unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec); /* get the channel */ | 141 | unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec); /* get the channel */ |
@@ -313,8 +313,8 @@ int i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd | |||
313 | +----------------------------------------------------------------------------+ | 313 | +----------------------------------------------------------------------------+ |
314 | */ | 314 | */ |
315 | 315 | ||
316 | int i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 316 | int i_APCI2032_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
317 | struct comedi_insn * insn, unsigned int * data) | 317 | struct comedi_insn *insn, unsigned int *data) |
318 | { | 318 | { |
319 | unsigned int ui_Temp; | 319 | unsigned int ui_Temp; |
320 | unsigned int ui_NoOfChannel; | 320 | unsigned int ui_NoOfChannel; |
@@ -380,8 +380,8 @@ int i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde | |||
380 | | | | 380 | | | |
381 | +----------------------------------------------------------------------------+ | 381 | +----------------------------------------------------------------------------+ |
382 | */ | 382 | */ |
383 | int i_APCI2032_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, | 383 | int i_APCI2032_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, |
384 | struct comedi_insn * insn, unsigned int * data) | 384 | struct comedi_insn *insn, unsigned int *data) |
385 | { | 385 | { |
386 | if (data[0] == 0) { | 386 | if (data[0] == 0) { |
387 | /* Disable the watchdog */ | 387 | /* Disable the watchdog */ |
@@ -421,8 +421,8 @@ int i_APCI2032_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevic | |||
421 | +----------------------------------------------------------------------------+ | 421 | +----------------------------------------------------------------------------+ |
422 | */ | 422 | */ |
423 | 423 | ||
424 | int i_APCI2032_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, | 424 | int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, |
425 | struct comedi_insn * insn, unsigned int * data) | 425 | struct comedi_insn *insn, unsigned int *data) |
426 | { | 426 | { |
427 | switch (data[0]) { | 427 | switch (data[0]) { |
428 | case 0: /* stop the watchdog */ | 428 | case 0: /* stop the watchdog */ |
@@ -466,8 +466,8 @@ int i_APCI2032_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_ | |||
466 | +----------------------------------------------------------------------------+ | 466 | +----------------------------------------------------------------------------+ |
467 | */ | 467 | */ |
468 | 468 | ||
469 | int i_APCI2032_ReadWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, | 469 | int i_APCI2032_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, |
470 | struct comedi_insn * insn, unsigned int * data) | 470 | struct comedi_insn *insn, unsigned int *data) |
471 | { | 471 | { |
472 | 472 | ||
473 | data[0] = | 473 | data[0] = |
@@ -544,8 +544,8 @@ void v_APCI2032_Interrupt(int irq, void *d) | |||
544 | +----------------------------------------------------------------------------+ | 544 | +----------------------------------------------------------------------------+ |
545 | */ | 545 | */ |
546 | 546 | ||
547 | int i_APCI2032_ReadInterruptStatus(struct comedi_device * dev, struct comedi_subdevice * s, | 547 | int i_APCI2032_ReadInterruptStatus(struct comedi_device *dev, struct comedi_subdevice *s, |
548 | struct comedi_insn * insn, unsigned int * data) | 548 | struct comedi_insn *insn, unsigned int *data) |
549 | { | 549 | { |
550 | *data = ui_Type; | 550 | *data = ui_Type; |
551 | return insn->n; | 551 | return insn->n; |
@@ -567,7 +567,7 @@ int i_APCI2032_ReadInterruptStatus(struct comedi_device * dev, struct comedi_sub | |||
567 | +----------------------------------------------------------------------------+ | 567 | +----------------------------------------------------------------------------+ |
568 | */ | 568 | */ |
569 | 569 | ||
570 | int i_APCI2032_Reset(struct comedi_device * dev) | 570 | int i_APCI2032_Reset(struct comedi_device *dev) |
571 | { | 571 | { |
572 | devpriv->b_DigitalOutputRegister = 0; | 572 | devpriv->b_DigitalOutputRegister = 0; |
573 | ui_Type = 0; | 573 | ui_Type = 0; |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c index 530629bcdac..c03192b5d9a 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c | |||
@@ -73,8 +73,8 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | |||
73 | | | | 73 | | | |
74 | +----------------------------------------------------------------------------+ | 74 | +----------------------------------------------------------------------------+ |
75 | */ | 75 | */ |
76 | int i_APCI2200_Read1DigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, | 76 | int i_APCI2200_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, |
77 | struct comedi_insn * insn, unsigned int * data) | 77 | struct comedi_insn *insn, unsigned int *data) |
78 | { | 78 | { |
79 | unsigned int ui_TmpValue = 0; | 79 | unsigned int ui_TmpValue = 0; |
80 | unsigned int ui_Channel; | 80 | unsigned int ui_Channel; |
@@ -112,8 +112,8 @@ int i_APCI2200_Read1DigitalInput(struct comedi_device * dev, struct comedi_subde | |||
112 | +----------------------------------------------------------------------------+ | 112 | +----------------------------------------------------------------------------+ |
113 | */ | 113 | */ |
114 | 114 | ||
115 | int i_APCI2200_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, | 115 | int i_APCI2200_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, |
116 | struct comedi_insn * insn, unsigned int * data) | 116 | struct comedi_insn *insn, unsigned int *data) |
117 | { | 117 | { |
118 | 118 | ||
119 | unsigned int ui_PortValue = data[0]; | 119 | unsigned int ui_PortValue = data[0]; |
@@ -169,8 +169,8 @@ int i_APCI2200_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su | |||
169 | | | | 169 | | | |
170 | +----------------------------------------------------------------------------+ | 170 | +----------------------------------------------------------------------------+ |
171 | */ | 171 | */ |
172 | int i_APCI2200_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 172 | int i_APCI2200_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
173 | struct comedi_insn * insn, unsigned int * data) | 173 | struct comedi_insn *insn, unsigned int *data) |
174 | { | 174 | { |
175 | devpriv->b_OutputMemoryStatus = data[0]; | 175 | devpriv->b_OutputMemoryStatus = data[0]; |
176 | return insn->n; | 176 | return insn->n; |
@@ -197,8 +197,8 @@ int i_APCI2200_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub | |||
197 | +----------------------------------------------------------------------------+ | 197 | +----------------------------------------------------------------------------+ |
198 | */ | 198 | */ |
199 | 199 | ||
200 | int i_APCI2200_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 200 | int i_APCI2200_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
201 | struct comedi_insn * insn, unsigned int * data) | 201 | struct comedi_insn *insn, unsigned int *data) |
202 | { | 202 | { |
203 | unsigned int ui_Temp, ui_Temp1; | 203 | unsigned int ui_Temp, ui_Temp1; |
204 | unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec); /* get the channel */ | 204 | unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec); /* get the channel */ |
@@ -354,8 +354,8 @@ int i_APCI2200_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd | |||
354 | +----------------------------------------------------------------------------+ | 354 | +----------------------------------------------------------------------------+ |
355 | */ | 355 | */ |
356 | 356 | ||
357 | int i_APCI2200_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 357 | int i_APCI2200_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
358 | struct comedi_insn * insn, unsigned int * data) | 358 | struct comedi_insn *insn, unsigned int *data) |
359 | { | 359 | { |
360 | 360 | ||
361 | unsigned int ui_Temp; | 361 | unsigned int ui_Temp; |
@@ -418,8 +418,8 @@ int i_APCI2200_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde | |||
418 | +----------------------------------------------------------------------------+ | 418 | +----------------------------------------------------------------------------+ |
419 | */ | 419 | */ |
420 | 420 | ||
421 | int i_APCI2200_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, | 421 | int i_APCI2200_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, |
422 | struct comedi_insn * insn, unsigned int * data) | 422 | struct comedi_insn *insn, unsigned int *data) |
423 | { | 423 | { |
424 | if (data[0] == 0) { | 424 | if (data[0] == 0) { |
425 | /* Disable the watchdog */ | 425 | /* Disable the watchdog */ |
@@ -464,8 +464,8 @@ int i_APCI2200_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevic | |||
464 | +----------------------------------------------------------------------------+ | 464 | +----------------------------------------------------------------------------+ |
465 | */ | 465 | */ |
466 | 466 | ||
467 | int i_APCI2200_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, | 467 | int i_APCI2200_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, |
468 | struct comedi_insn * insn, unsigned int * data) | 468 | struct comedi_insn *insn, unsigned int *data) |
469 | { | 469 | { |
470 | switch (data[0]) { | 470 | switch (data[0]) { |
471 | case 0: /* stop the watchdog */ | 471 | case 0: /* stop the watchdog */ |
@@ -509,8 +509,8 @@ int i_APCI2200_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_ | |||
509 | +----------------------------------------------------------------------------+ | 509 | +----------------------------------------------------------------------------+ |
510 | */ | 510 | */ |
511 | 511 | ||
512 | int i_APCI2200_ReadWatchdog(struct comedi_device * dev, struct comedi_subdevice * s, | 512 | int i_APCI2200_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s, |
513 | struct comedi_insn * insn, unsigned int * data) | 513 | struct comedi_insn *insn, unsigned int *data) |
514 | { | 514 | { |
515 | data[0] = | 515 | data[0] = |
516 | inw(devpriv->iobase + APCI2200_WATCHDOG + | 516 | inw(devpriv->iobase + APCI2200_WATCHDOG + |
@@ -533,7 +533,7 @@ int i_APCI2200_ReadWatchdog(struct comedi_device * dev, struct comedi_subdevice | |||
533 | +----------------------------------------------------------------------------+ | 533 | +----------------------------------------------------------------------------+ |
534 | */ | 534 | */ |
535 | 535 | ||
536 | int i_APCI2200_Reset(struct comedi_device * dev) | 536 | int i_APCI2200_Reset(struct comedi_device *dev) |
537 | { | 537 | { |
538 | outw(0x0, devpriv->iobase + APCI2200_DIGITAL_OP); /* RESETS THE DIGITAL OUTPUTS */ | 538 | outw(0x0, devpriv->iobase + APCI2200_DIGITAL_OP); /* RESETS THE DIGITAL OUTPUTS */ |
539 | outw(0x0, | 539 | outw(0x0, |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c index 4808acbebd8..e4b1c09f0e4 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | |||
@@ -74,8 +74,8 @@ static unsigned int ui_Temp = 0; | |||
74 | +----------------------------------------------------------------------------+ | 74 | +----------------------------------------------------------------------------+ |
75 | */ | 75 | */ |
76 | 76 | ||
77 | int i_APCI3120_InsnConfigAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s, | 77 | int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, |
78 | struct comedi_insn * insn, unsigned int * data) | 78 | struct comedi_insn *insn, unsigned int *data) |
79 | { | 79 | { |
80 | unsigned int i; | 80 | unsigned int i; |
81 | 81 | ||
@@ -145,8 +145,8 @@ int i_APCI3120_InsnConfigAnalogInput(struct comedi_device * dev, struct comedi_s | |||
145 | +----------------------------------------------------------------------------+ | 145 | +----------------------------------------------------------------------------+ |
146 | */ | 146 | */ |
147 | 147 | ||
148 | int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s, | 148 | int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, |
149 | struct comedi_insn * insn, unsigned int * data) | 149 | struct comedi_insn *insn, unsigned int *data) |
150 | { | 150 | { |
151 | unsigned short us_ConvertTiming, us_TmpValue, i; | 151 | unsigned short us_ConvertTiming, us_TmpValue, i; |
152 | unsigned char b_Tmp; | 152 | unsigned char b_Tmp; |
@@ -412,7 +412,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, struct comedi_sub | |||
412 | +----------------------------------------------------------------------------+ | 412 | +----------------------------------------------------------------------------+ |
413 | */ | 413 | */ |
414 | 414 | ||
415 | int i_APCI3120_StopCyclicAcquisition(struct comedi_device * dev, struct comedi_subdevice * s) | 415 | int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_subdevice *s) |
416 | { | 416 | { |
417 | /* Disable A2P Fifo write and AMWEN signal */ | 417 | /* Disable A2P Fifo write and AMWEN signal */ |
418 | outw(0, devpriv->i_IobaseAddon + 4); | 418 | outw(0, devpriv->i_IobaseAddon + 4); |
@@ -482,8 +482,8 @@ int i_APCI3120_StopCyclicAcquisition(struct comedi_device * dev, struct comedi_s | |||
482 | +----------------------------------------------------------------------------+ | 482 | +----------------------------------------------------------------------------+ |
483 | */ | 483 | */ |
484 | 484 | ||
485 | int i_APCI3120_CommandTestAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s, | 485 | int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, |
486 | struct comedi_cmd * cmd) | 486 | struct comedi_cmd *cmd) |
487 | { | 487 | { |
488 | int err = 0; | 488 | int err = 0; |
489 | int tmp; /* divisor1,divisor2; */ | 489 | int tmp; /* divisor1,divisor2; */ |
@@ -639,7 +639,7 @@ int i_APCI3120_CommandTestAnalogInput(struct comedi_device * dev, struct comedi_ | |||
639 | +----------------------------------------------------------------------------+ | 639 | +----------------------------------------------------------------------------+ |
640 | */ | 640 | */ |
641 | 641 | ||
642 | int i_APCI3120_CommandAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s) | 642 | int i_APCI3120_CommandAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s) |
643 | { | 643 | { |
644 | struct comedi_cmd *cmd = &s->async->cmd; | 644 | struct comedi_cmd *cmd = &s->async->cmd; |
645 | 645 | ||
@@ -713,8 +713,8 @@ int i_APCI3120_CommandAnalogInput(struct comedi_device * dev, struct comedi_subd | |||
713 | +----------------------------------------------------------------------------+ | 713 | +----------------------------------------------------------------------------+ |
714 | */ | 714 | */ |
715 | 715 | ||
716 | int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev, | 716 | int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev, |
717 | struct comedi_subdevice * s) | 717 | struct comedi_subdevice *s) |
718 | { | 718 | { |
719 | unsigned char b_Tmp; | 719 | unsigned char b_Tmp; |
720 | unsigned int ui_Tmp, ui_DelayTiming = 0, ui_TimerValue1 = 0, dmalen0 = | 720 | unsigned int ui_Tmp, ui_DelayTiming = 0, ui_TimerValue1 = 0, dmalen0 = |
@@ -1250,7 +1250,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev, | |||
1250 | +----------------------------------------------------------------------------+ | 1250 | +----------------------------------------------------------------------------+ |
1251 | */ | 1251 | */ |
1252 | 1252 | ||
1253 | int i_APCI3120_Reset(struct comedi_device * dev) | 1253 | int i_APCI3120_Reset(struct comedi_device *dev) |
1254 | { | 1254 | { |
1255 | unsigned int i; | 1255 | unsigned int i; |
1256 | unsigned short us_TmpValue; | 1256 | unsigned short us_TmpValue; |
@@ -1330,7 +1330,7 @@ int i_APCI3120_Reset(struct comedi_device * dev) | |||
1330 | +----------------------------------------------------------------------------+ | 1330 | +----------------------------------------------------------------------------+ |
1331 | */ | 1331 | */ |
1332 | 1332 | ||
1333 | int i_APCI3120_SetupChannelList(struct comedi_device * dev, struct comedi_subdevice * s, | 1333 | int i_APCI3120_SetupChannelList(struct comedi_device *dev, struct comedi_subdevice *s, |
1334 | int n_chan, unsigned int *chanlist, char check) | 1334 | int n_chan, unsigned int *chanlist, char check) |
1335 | { | 1335 | { |
1336 | unsigned int i; /* , differencial=0, bipolar=0; */ | 1336 | unsigned int i; /* , differencial=0, bipolar=0; */ |
@@ -1394,7 +1394,7 @@ int i_APCI3120_SetupChannelList(struct comedi_device * dev, struct comedi_subdev | |||
1394 | +----------------------------------------------------------------------------+ | 1394 | +----------------------------------------------------------------------------+ |
1395 | */ | 1395 | */ |
1396 | 1396 | ||
1397 | int i_APCI3120_ExttrigEnable(struct comedi_device * dev) | 1397 | int i_APCI3120_ExttrigEnable(struct comedi_device *dev) |
1398 | { | 1398 | { |
1399 | 1399 | ||
1400 | devpriv->us_OutputRegister |= APCI3120_ENABLE_EXT_TRIGGER; | 1400 | devpriv->us_OutputRegister |= APCI3120_ENABLE_EXT_TRIGGER; |
@@ -1419,7 +1419,7 @@ int i_APCI3120_ExttrigEnable(struct comedi_device * dev) | |||
1419 | +----------------------------------------------------------------------------+ | 1419 | +----------------------------------------------------------------------------+ |
1420 | */ | 1420 | */ |
1421 | 1421 | ||
1422 | int i_APCI3120_ExttrigDisable(struct comedi_device * dev) | 1422 | int i_APCI3120_ExttrigDisable(struct comedi_device *dev) |
1423 | { | 1423 | { |
1424 | devpriv->us_OutputRegister &= ~APCI3120_ENABLE_EXT_TRIGGER; | 1424 | devpriv->us_OutputRegister &= ~APCI3120_ENABLE_EXT_TRIGGER; |
1425 | outw(devpriv->us_OutputRegister, dev->iobase + APCI3120_WR_ADDRESS); | 1425 | outw(devpriv->us_OutputRegister, dev->iobase + APCI3120_WR_ADDRESS); |
@@ -1665,7 +1665,7 @@ void v_APCI3120_Interrupt(int irq, void *d) | |||
1665 | */ | 1665 | */ |
1666 | 1666 | ||
1667 | 1667 | ||
1668 | int i_APCI3120_InterruptHandleEos(struct comedi_device * dev) | 1668 | int i_APCI3120_InterruptHandleEos(struct comedi_device *dev) |
1669 | { | 1669 | { |
1670 | int n_chan, i; | 1670 | int n_chan, i; |
1671 | struct comedi_subdevice *s = dev->subdevices + 0; | 1671 | struct comedi_subdevice *s = dev->subdevices + 0; |
@@ -1877,8 +1877,8 @@ void v_APCI3120_InterruptDma(int irq, void *d) | |||
1877 | +----------------------------------------------------------------------------+ | 1877 | +----------------------------------------------------------------------------+ |
1878 | */ | 1878 | */ |
1879 | 1879 | ||
1880 | void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device * dev, | 1880 | void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev, |
1881 | struct comedi_subdevice * s, short * dma_buffer, unsigned int num_samples) | 1881 | struct comedi_subdevice *s, short *dma_buffer, unsigned int num_samples) |
1882 | { | 1882 | { |
1883 | devpriv->ui_AiActualScan += | 1883 | devpriv->ui_AiActualScan += |
1884 | (s->async->cur_chan + num_samples) / devpriv->ui_AiScanLength; | 1884 | (s->async->cur_chan + num_samples) / devpriv->ui_AiScanLength; |
@@ -1919,8 +1919,8 @@ void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device * dev, | |||
1919 | +----------------------------------------------------------------------------+ | 1919 | +----------------------------------------------------------------------------+ |
1920 | */ | 1920 | */ |
1921 | 1921 | ||
1922 | int i_APCI3120_InsnConfigTimer(struct comedi_device * dev, struct comedi_subdevice * s, | 1922 | int i_APCI3120_InsnConfigTimer(struct comedi_device *dev, struct comedi_subdevice *s, |
1923 | struct comedi_insn * insn, unsigned int * data) | 1923 | struct comedi_insn *insn, unsigned int *data) |
1924 | { | 1924 | { |
1925 | 1925 | ||
1926 | unsigned int ui_Timervalue2; | 1926 | unsigned int ui_Timervalue2; |
@@ -2079,8 +2079,8 @@ int i_APCI3120_InsnConfigTimer(struct comedi_device * dev, struct comedi_subdevi | |||
2079 | +----------------------------------------------------------------------------+ | 2079 | +----------------------------------------------------------------------------+ |
2080 | */ | 2080 | */ |
2081 | 2081 | ||
2082 | int i_APCI3120_InsnWriteTimer(struct comedi_device * dev, struct comedi_subdevice * s, | 2082 | int i_APCI3120_InsnWriteTimer(struct comedi_device *dev, struct comedi_subdevice *s, |
2083 | struct comedi_insn * insn, unsigned int * data) | 2083 | struct comedi_insn *insn, unsigned int *data) |
2084 | { | 2084 | { |
2085 | 2085 | ||
2086 | unsigned int ui_Timervalue2 = 0; | 2086 | unsigned int ui_Timervalue2 = 0; |
@@ -2267,8 +2267,8 @@ int i_APCI3120_InsnWriteTimer(struct comedi_device * dev, struct comedi_subdevic | |||
2267 | | | | 2267 | | | |
2268 | +----------------------------------------------------------------------------+ | 2268 | +----------------------------------------------------------------------------+ |
2269 | */ | 2269 | */ |
2270 | int i_APCI3120_InsnReadTimer(struct comedi_device * dev, struct comedi_subdevice * s, | 2270 | int i_APCI3120_InsnReadTimer(struct comedi_device *dev, struct comedi_subdevice *s, |
2271 | struct comedi_insn * insn, unsigned int * data) | 2271 | struct comedi_insn *insn, unsigned int *data) |
2272 | { | 2272 | { |
2273 | unsigned char b_Tmp; | 2273 | unsigned char b_Tmp; |
2274 | unsigned short us_TmpValue, us_TmpValue_2, us_StatusValue; | 2274 | unsigned short us_TmpValue, us_TmpValue_2, us_StatusValue; |
@@ -2387,8 +2387,8 @@ int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev, | |||
2387 | | | | 2387 | | | |
2388 | +----------------------------------------------------------------------------+ | 2388 | +----------------------------------------------------------------------------+ |
2389 | */ | 2389 | */ |
2390 | int i_APCI3120_InsnBitsDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, | 2390 | int i_APCI3120_InsnBitsDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, |
2391 | struct comedi_insn * insn, unsigned int * data) | 2391 | struct comedi_insn *insn, unsigned int *data) |
2392 | { | 2392 | { |
2393 | unsigned int ui_TmpValue; | 2393 | unsigned int ui_TmpValue; |
2394 | ui_TmpValue = (unsigned int) inw(devpriv->iobase + APCI3120_RD_STATUS); | 2394 | ui_TmpValue = (unsigned int) inw(devpriv->iobase + APCI3120_RD_STATUS); |
@@ -2426,8 +2426,8 @@ int i_APCI3120_InsnBitsDigitalInput(struct comedi_device * dev, struct comedi_su | |||
2426 | +----------------------------------------------------------------------------+ | 2426 | +----------------------------------------------------------------------------+ |
2427 | */ | 2427 | */ |
2428 | 2428 | ||
2429 | int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device * dev, | 2429 | int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device *dev, |
2430 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 2430 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
2431 | { | 2431 | { |
2432 | 2432 | ||
2433 | if ((data[0] != 0) && (data[0] != 1)) { | 2433 | if ((data[0] != 0) && (data[0] != 1)) { |
@@ -2472,7 +2472,7 @@ int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device * dev, | |||
2472 | +----------------------------------------------------------------------------+ | 2472 | +----------------------------------------------------------------------------+ |
2473 | */ | 2473 | */ |
2474 | 2474 | ||
2475 | int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device * dev, | 2475 | int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device *dev, |
2476 | struct comedi_subdevice *s, | 2476 | struct comedi_subdevice *s, |
2477 | struct comedi_insn *insn, | 2477 | struct comedi_insn *insn, |
2478 | unsigned int *data) | 2478 | unsigned int *data) |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c index 8981b0feaba..b6b07500778 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c | |||
@@ -112,7 +112,7 @@ struct str_BoardInfos s_BoardInfos[100]; /* 100 will be the max number of board | |||
112 | 112 | ||
113 | int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, | 113 | int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, |
114 | unsigned int dw_PCIBoardEepromAddress, | 114 | unsigned int dw_PCIBoardEepromAddress, |
115 | unsigned short w_EepromStartAddress, unsigned short * pw_DataRead) | 115 | unsigned short w_EepromStartAddress, unsigned short *pw_DataRead) |
116 | { | 116 | { |
117 | unsigned int dw_eeprom_busy = 0; | 117 | unsigned int dw_eeprom_busy = 0; |
118 | int i_Counter = 0; | 118 | int i_Counter = 0; |
@@ -453,9 +453,9 @@ void v_GetAPCI3200EepromCalibrationValue(unsigned int dw_PCIBoardEepromAddress, | |||
453 | } | 453 | } |
454 | } | 454 | } |
455 | 455 | ||
456 | int i_APCI3200_GetChannelCalibrationValue(struct comedi_device * dev, | 456 | int i_APCI3200_GetChannelCalibrationValue(struct comedi_device *dev, |
457 | unsigned int ui_Channel_num, unsigned int * CJCCurrentSource, | 457 | unsigned int ui_Channel_num, unsigned int *CJCCurrentSource, |
458 | unsigned int * ChannelCurrentSource, unsigned int * ChannelGainFactor) | 458 | unsigned int *ChannelCurrentSource, unsigned int *ChannelGainFactor) |
459 | { | 459 | { |
460 | int i_DiffChannel = 0; | 460 | int i_DiffChannel = 0; |
461 | int i_Module = 0; | 461 | int i_Module = 0; |
@@ -550,8 +550,8 @@ int i_APCI3200_GetChannelCalibrationValue(struct comedi_device * dev, | |||
550 | +----------------------------------------------------------------------------+ | 550 | +----------------------------------------------------------------------------+ |
551 | */ | 551 | */ |
552 | 552 | ||
553 | int i_APCI3200_ReadDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, | 553 | int i_APCI3200_ReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, |
554 | struct comedi_insn * insn, unsigned int * data) | 554 | struct comedi_insn *insn, unsigned int *data) |
555 | { | 555 | { |
556 | unsigned int ui_Temp = 0; | 556 | unsigned int ui_Temp = 0; |
557 | unsigned int ui_NoOfChannel = 0; | 557 | unsigned int ui_NoOfChannel = 0; |
@@ -608,8 +608,8 @@ int i_APCI3200_ReadDigitalInput(struct comedi_device * dev, struct comedi_subdev | |||
608 | | | | 608 | | | |
609 | +----------------------------------------------------------------------------+ | 609 | +----------------------------------------------------------------------------+ |
610 | */ | 610 | */ |
611 | int i_APCI3200_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 611 | int i_APCI3200_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
612 | struct comedi_insn * insn, unsigned int * data) | 612 | struct comedi_insn *insn, unsigned int *data) |
613 | { | 613 | { |
614 | 614 | ||
615 | if ((data[0] != 0) && (data[0] != 1)) { | 615 | if ((data[0] != 0) && (data[0] != 1)) { |
@@ -653,8 +653,8 @@ int i_APCI3200_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub | |||
653 | | | | 653 | | | |
654 | +----------------------------------------------------------------------------+ | 654 | +----------------------------------------------------------------------------+ |
655 | */ | 655 | */ |
656 | int i_APCI3200_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 656 | int i_APCI3200_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
657 | struct comedi_insn * insn, unsigned int * data) | 657 | struct comedi_insn *insn, unsigned int *data) |
658 | { | 658 | { |
659 | unsigned int ui_Temp = 0, ui_Temp1 = 0; | 659 | unsigned int ui_Temp = 0, ui_Temp1 = 0; |
660 | unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec); /* get the channel */ | 660 | unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec); /* get the channel */ |
@@ -766,8 +766,8 @@ int i_APCI3200_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd | |||
766 | | | | 766 | | | |
767 | +----------------------------------------------------------------------------+ | 767 | +----------------------------------------------------------------------------+ |
768 | */ | 768 | */ |
769 | int i_APCI3200_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 769 | int i_APCI3200_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
770 | struct comedi_insn * insn, unsigned int * data) | 770 | struct comedi_insn *insn, unsigned int *data) |
771 | { | 771 | { |
772 | unsigned int ui_Temp; | 772 | unsigned int ui_Temp; |
773 | unsigned int ui_NoOfChannel; | 773 | unsigned int ui_NoOfChannel; |
@@ -874,8 +874,8 @@ int i_APCI3200_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde | |||
874 | | | | 874 | | | |
875 | +----------------------------------------------------------------------------+ | 875 | +----------------------------------------------------------------------------+ |
876 | */ | 876 | */ |
877 | int i_APCI3200_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s, | 877 | int i_APCI3200_ConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, |
878 | struct comedi_insn * insn, unsigned int * data) | 878 | struct comedi_insn *insn, unsigned int *data) |
879 | { | 879 | { |
880 | 880 | ||
881 | unsigned int ul_Config = 0, ul_Temp = 0; | 881 | unsigned int ul_Config = 0, ul_Temp = 0; |
@@ -1361,8 +1361,8 @@ int i_APCI3200_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subde | |||
1361 | | | | 1361 | | | |
1362 | +----------------------------------------------------------------------------+ | 1362 | +----------------------------------------------------------------------------+ |
1363 | */ | 1363 | */ |
1364 | int i_APCI3200_ReadAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s, | 1364 | int i_APCI3200_ReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, |
1365 | struct comedi_insn * insn, unsigned int * data) | 1365 | struct comedi_insn *insn, unsigned int *data) |
1366 | { | 1366 | { |
1367 | unsigned int ui_DummyValue = 0; | 1367 | unsigned int ui_DummyValue = 0; |
1368 | int i_ConvertCJCCalibration; | 1368 | int i_ConvertCJCCalibration; |
@@ -1651,8 +1651,8 @@ int i_APCI3200_ReadAnalogInput(struct comedi_device * dev, struct comedi_subdevi | |||
1651 | | | | 1651 | | | |
1652 | +----------------------------------------------------------------------------+ | 1652 | +----------------------------------------------------------------------------+ |
1653 | */ | 1653 | */ |
1654 | int i_APCI3200_Read1AnalogInputChannel(struct comedi_device * dev, | 1654 | int i_APCI3200_Read1AnalogInputChannel(struct comedi_device *dev, |
1655 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1655 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1656 | { | 1656 | { |
1657 | unsigned int ui_EOC = 0; | 1657 | unsigned int ui_EOC = 0; |
1658 | unsigned int ui_ChannelNo = 0; | 1658 | unsigned int ui_ChannelNo = 0; |
@@ -1776,7 +1776,7 @@ int i_APCI3200_Read1AnalogInputChannel(struct comedi_device * dev, | |||
1776 | | | | 1776 | | | |
1777 | +----------------------------------------------------------------------------+ | 1777 | +----------------------------------------------------------------------------+ |
1778 | */ | 1778 | */ |
1779 | int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device * dev, unsigned int * data) | 1779 | int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device *dev, unsigned int *data) |
1780 | { | 1780 | { |
1781 | unsigned int ui_Temp = 0, ui_EOC = 0; | 1781 | unsigned int ui_Temp = 0, ui_EOC = 0; |
1782 | unsigned int ui_CommandRegister = 0; | 1782 | unsigned int ui_CommandRegister = 0; |
@@ -1912,7 +1912,7 @@ int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device * dev, unsigned i | |||
1912 | | | | 1912 | | | |
1913 | +----------------------------------------------------------------------------+ | 1913 | +----------------------------------------------------------------------------+ |
1914 | */ | 1914 | */ |
1915 | int i_APCI3200_ReadCalibrationGainValue(struct comedi_device * dev, unsigned int * data) | 1915 | int i_APCI3200_ReadCalibrationGainValue(struct comedi_device *dev, unsigned int *data) |
1916 | { | 1916 | { |
1917 | unsigned int ui_EOC = 0; | 1917 | unsigned int ui_EOC = 0; |
1918 | int ui_CommandRegister = 0; | 1918 | int ui_CommandRegister = 0; |
@@ -2048,7 +2048,7 @@ int i_APCI3200_ReadCalibrationGainValue(struct comedi_device * dev, unsigned int | |||
2048 | +----------------------------------------------------------------------------+ | 2048 | +----------------------------------------------------------------------------+ |
2049 | */ | 2049 | */ |
2050 | 2050 | ||
2051 | int i_APCI3200_ReadCJCValue(struct comedi_device * dev, unsigned int * data) | 2051 | int i_APCI3200_ReadCJCValue(struct comedi_device *dev, unsigned int *data) |
2052 | { | 2052 | { |
2053 | unsigned int ui_EOC = 0; | 2053 | unsigned int ui_EOC = 0; |
2054 | int ui_CommandRegister = 0; | 2054 | int ui_CommandRegister = 0; |
@@ -2167,7 +2167,7 @@ int i_APCI3200_ReadCJCValue(struct comedi_device * dev, unsigned int * data) | |||
2167 | | | | 2167 | | | |
2168 | +----------------------------------------------------------------------------+ | 2168 | +----------------------------------------------------------------------------+ |
2169 | */ | 2169 | */ |
2170 | int i_APCI3200_ReadCJCCalOffset(struct comedi_device * dev, unsigned int * data) | 2170 | int i_APCI3200_ReadCJCCalOffset(struct comedi_device *dev, unsigned int *data) |
2171 | { | 2171 | { |
2172 | unsigned int ui_EOC = 0; | 2172 | unsigned int ui_EOC = 0; |
2173 | int ui_CommandRegister = 0; | 2173 | int ui_CommandRegister = 0; |
@@ -2283,7 +2283,7 @@ int i_APCI3200_ReadCJCCalOffset(struct comedi_device * dev, unsigned int * data) | |||
2283 | | | | 2283 | | | |
2284 | +----------------------------------------------------------------------------+ | 2284 | +----------------------------------------------------------------------------+ |
2285 | */ | 2285 | */ |
2286 | int i_APCI3200_ReadCJCCalGain(struct comedi_device * dev, unsigned int * data) | 2286 | int i_APCI3200_ReadCJCCalGain(struct comedi_device *dev, unsigned int *data) |
2287 | { | 2287 | { |
2288 | unsigned int ui_EOC = 0; | 2288 | unsigned int ui_EOC = 0; |
2289 | int ui_CommandRegister = 0; | 2289 | int ui_CommandRegister = 0; |
@@ -2404,8 +2404,8 @@ int i_APCI3200_ReadCJCCalGain(struct comedi_device * dev, unsigned int * data) | |||
2404 | +----------------------------------------------------------------------------+ | 2404 | +----------------------------------------------------------------------------+ |
2405 | */ | 2405 | */ |
2406 | 2406 | ||
2407 | int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device * dev, | 2407 | int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device *dev, |
2408 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 2408 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
2409 | { | 2409 | { |
2410 | unsigned int ui_Configuration = 0; | 2410 | unsigned int ui_Configuration = 0; |
2411 | int i_Temp; /* ,i_TimeUnit; */ | 2411 | int i_Temp; /* ,i_TimeUnit; */ |
@@ -2529,8 +2529,8 @@ int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device * dev, | |||
2529 | +----------------------------------------------------------------------------+ | 2529 | +----------------------------------------------------------------------------+ |
2530 | */ | 2530 | */ |
2531 | 2531 | ||
2532 | int i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device * dev, | 2532 | int i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device *dev, |
2533 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 2533 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
2534 | { | 2534 | { |
2535 | i_APCI3200_Reset(dev); | 2535 | i_APCI3200_Reset(dev); |
2536 | return insn->n; | 2536 | return insn->n; |
@@ -2560,8 +2560,8 @@ int i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device * dev, | |||
2560 | +----------------------------------------------------------------------------+ | 2560 | +----------------------------------------------------------------------------+ |
2561 | */ | 2561 | */ |
2562 | 2562 | ||
2563 | int i_APCI3200_CommandTestAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s, | 2563 | int i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s, |
2564 | struct comedi_cmd * cmd) | 2564 | struct comedi_cmd *cmd) |
2565 | { | 2565 | { |
2566 | 2566 | ||
2567 | int err = 0; | 2567 | int err = 0; |
@@ -2764,7 +2764,7 @@ int i_APCI3200_CommandTestAnalogInput(struct comedi_device * dev, struct comedi_ | |||
2764 | +----------------------------------------------------------------------------+ | 2764 | +----------------------------------------------------------------------------+ |
2765 | */ | 2765 | */ |
2766 | 2766 | ||
2767 | int i_APCI3200_StopCyclicAcquisition(struct comedi_device * dev, struct comedi_subdevice * s) | 2767 | int i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_subdevice *s) |
2768 | { | 2768 | { |
2769 | unsigned int ui_Configuration = 0; | 2769 | unsigned int ui_Configuration = 0; |
2770 | /* i_InterruptFlag=0; */ | 2770 | /* i_InterruptFlag=0; */ |
@@ -2814,7 +2814,7 @@ int i_APCI3200_StopCyclicAcquisition(struct comedi_device * dev, struct comedi_s | |||
2814 | +----------------------------------------------------------------------------+ | 2814 | +----------------------------------------------------------------------------+ |
2815 | */ | 2815 | */ |
2816 | 2816 | ||
2817 | int i_APCI3200_CommandAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s) | 2817 | int i_APCI3200_CommandAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s) |
2818 | { | 2818 | { |
2819 | struct comedi_cmd *cmd = &s->async->cmd; | 2819 | struct comedi_cmd *cmd = &s->async->cmd; |
2820 | unsigned int ui_Configuration = 0; | 2820 | unsigned int ui_Configuration = 0; |
@@ -3001,7 +3001,7 @@ int i_APCI3200_CommandAnalogInput(struct comedi_device * dev, struct comedi_subd | |||
3001 | +----------------------------------------------------------------------------+ | 3001 | +----------------------------------------------------------------------------+ |
3002 | */ | 3002 | */ |
3003 | 3003 | ||
3004 | int i_APCI3200_Reset(struct comedi_device * dev) | 3004 | int i_APCI3200_Reset(struct comedi_device *dev) |
3005 | { | 3005 | { |
3006 | int i_Temp; | 3006 | int i_Temp; |
3007 | unsigned int dw_Dummy; | 3007 | unsigned int dw_Dummy; |
@@ -3499,7 +3499,7 @@ void v_APCI3200_Interrupt(int irq, void *d) | |||
3499 | | | | 3499 | | | |
3500 | +----------------------------------------------------------------------------+ | 3500 | +----------------------------------------------------------------------------+ |
3501 | */ | 3501 | */ |
3502 | int i_APCI3200_InterruptHandleEos(struct comedi_device * dev) | 3502 | int i_APCI3200_InterruptHandleEos(struct comedi_device *dev) |
3503 | { | 3503 | { |
3504 | unsigned int ui_StatusRegister = 0; | 3504 | unsigned int ui_StatusRegister = 0; |
3505 | struct comedi_subdevice *s = dev->subdevices + 0; | 3505 | struct comedi_subdevice *s = dev->subdevices + 0; |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c index dfca2e6d4d8..20460e2382a 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c | |||
@@ -73,8 +73,8 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | |||
73 | +----------------------------------------------------------------------------+ | 73 | +----------------------------------------------------------------------------+ |
74 | */ | 74 | */ |
75 | 75 | ||
76 | int i_APCI3501_ReadDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s, | 76 | int i_APCI3501_ReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, |
77 | struct comedi_insn * insn, unsigned int * data) | 77 | struct comedi_insn *insn, unsigned int *data) |
78 | { | 78 | { |
79 | unsigned int ui_Temp; | 79 | unsigned int ui_Temp; |
80 | unsigned int ui_NoOfChannel; | 80 | unsigned int ui_NoOfChannel; |
@@ -121,8 +121,8 @@ int i_APCI3501_ReadDigitalInput(struct comedi_device * dev, struct comedi_subdev | |||
121 | | | | 121 | | | |
122 | +----------------------------------------------------------------------------+ | 122 | +----------------------------------------------------------------------------+ |
123 | */ | 123 | */ |
124 | int i_APCI3501_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 124 | int i_APCI3501_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
125 | struct comedi_insn * insn, unsigned int * data) | 125 | struct comedi_insn *insn, unsigned int *data) |
126 | { | 126 | { |
127 | 127 | ||
128 | if ((data[0] != 0) && (data[0] != 1)) { | 128 | if ((data[0] != 0) && (data[0] != 1)) { |
@@ -161,8 +161,8 @@ int i_APCI3501_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_sub | |||
161 | | | | 161 | | | |
162 | +----------------------------------------------------------------------------+ | 162 | +----------------------------------------------------------------------------+ |
163 | */ | 163 | */ |
164 | int i_APCI3501_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 164 | int i_APCI3501_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
165 | struct comedi_insn * insn, unsigned int * data) | 165 | struct comedi_insn *insn, unsigned int *data) |
166 | { | 166 | { |
167 | unsigned int ui_Temp, ui_Temp1; | 167 | unsigned int ui_Temp, ui_Temp1; |
168 | unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec); /* get the channel */ | 168 | unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec); /* get the channel */ |
@@ -248,8 +248,8 @@ int i_APCI3501_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subd | |||
248 | | | | 248 | | | |
249 | +----------------------------------------------------------------------------+ | 249 | +----------------------------------------------------------------------------+ |
250 | */ | 250 | */ |
251 | int i_APCI3501_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 251 | int i_APCI3501_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
252 | struct comedi_insn * insn, unsigned int * data) | 252 | struct comedi_insn *insn, unsigned int *data) |
253 | { | 253 | { |
254 | unsigned int ui_Temp; | 254 | unsigned int ui_Temp; |
255 | unsigned int ui_NoOfChannel; | 255 | unsigned int ui_NoOfChannel; |
@@ -298,8 +298,8 @@ int i_APCI3501_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subde | |||
298 | | | | 298 | | | |
299 | +----------------------------------------------------------------------------+ | 299 | +----------------------------------------------------------------------------+ |
300 | */ | 300 | */ |
301 | int i_APCI3501_ConfigAnalogOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 301 | int i_APCI3501_ConfigAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
302 | struct comedi_insn * insn, unsigned int * data) | 302 | struct comedi_insn *insn, unsigned int *data) |
303 | { | 303 | { |
304 | outl(data[0], | 304 | outl(data[0], |
305 | devpriv->iobase + APCI3501_ANALOG_OUTPUT + | 305 | devpriv->iobase + APCI3501_ANALOG_OUTPUT + |
@@ -336,8 +336,8 @@ int i_APCI3501_ConfigAnalogOutput(struct comedi_device * dev, struct comedi_subd | |||
336 | | | | 336 | | | |
337 | +----------------------------------------------------------------------------+ | 337 | +----------------------------------------------------------------------------+ |
338 | */ | 338 | */ |
339 | int i_APCI3501_WriteAnalogOutput(struct comedi_device * dev, struct comedi_subdevice * s, | 339 | int i_APCI3501_WriteAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s, |
340 | struct comedi_insn * insn, unsigned int * data) | 340 | struct comedi_insn *insn, unsigned int *data) |
341 | { | 341 | { |
342 | unsigned int ul_Command1 = 0, ul_Channel_no, ul_Polarity, ul_DAC_Ready = 0;; | 342 | unsigned int ul_Command1 = 0, ul_Channel_no, ul_Polarity, ul_DAC_Ready = 0;; |
343 | 343 | ||
@@ -410,8 +410,8 @@ int i_APCI3501_WriteAnalogOutput(struct comedi_device * dev, struct comedi_subde | |||
410 | | | | 410 | | | |
411 | +----------------------------------------------------------------------------+ | 411 | +----------------------------------------------------------------------------+ |
412 | */ | 412 | */ |
413 | int i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device * dev, | 413 | int i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev, |
414 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 414 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
415 | { | 415 | { |
416 | unsigned int ul_Command1 = 0; | 416 | unsigned int ul_Command1 = 0; |
417 | devpriv->tsk_Current = current; | 417 | devpriv->tsk_Current = current; |
@@ -511,8 +511,8 @@ int i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device * dev, | |||
511 | +----------------------------------------------------------------------------+ | 511 | +----------------------------------------------------------------------------+ |
512 | */ | 512 | */ |
513 | 513 | ||
514 | int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device * dev, | 514 | int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev, |
515 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 515 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
516 | { | 516 | { |
517 | unsigned int ul_Command1 = 0; | 517 | unsigned int ul_Command1 = 0; |
518 | int i_Temp; | 518 | int i_Temp; |
@@ -613,8 +613,8 @@ int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device * dev, | |||
613 | +----------------------------------------------------------------------------+ | 613 | +----------------------------------------------------------------------------+ |
614 | */ | 614 | */ |
615 | 615 | ||
616 | int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device * dev, | 616 | int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev, |
617 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 617 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
618 | { | 618 | { |
619 | 619 | ||
620 | if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) { | 620 | if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) { |
@@ -654,7 +654,7 @@ int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device * dev, | |||
654 | +----------------------------------------------------------------------------+ | 654 | +----------------------------------------------------------------------------+ |
655 | */ | 655 | */ |
656 | 656 | ||
657 | int i_APCI3501_Reset(struct comedi_device * dev) | 657 | int i_APCI3501_Reset(struct comedi_device *dev) |
658 | { | 658 | { |
659 | int i_Count = 0, i_temp = 0; | 659 | int i_Count = 0, i_temp = 0; |
660 | unsigned int ul_Command1 = 0, ul_Polarity, ul_DAC_Ready = 0; | 660 | unsigned int ul_Command1 = 0, ul_Polarity, ul_DAC_Ready = 0; |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c index 8c630d72ad4..a908603e7e0 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c | |||
@@ -68,7 +68,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc | |||
68 | +----------------------------------------------------------------------------+ | 68 | +----------------------------------------------------------------------------+ |
69 | */ | 69 | */ |
70 | 70 | ||
71 | int i_APCI3XXX_TestConversionStarted(struct comedi_device * dev) | 71 | int i_APCI3XXX_TestConversionStarted(struct comedi_device *dev) |
72 | { | 72 | { |
73 | if ((readl((void *)(devpriv->dw_AiBase + 8)) & 0x80000UL) == 0x80000UL) { | 73 | if ((readl((void *)(devpriv->dw_AiBase + 8)) & 0x80000UL) == 0x80000UL) { |
74 | return (1); | 74 | return (1); |
@@ -105,8 +105,8 @@ int i_APCI3XXX_TestConversionStarted(struct comedi_device * dev) | |||
105 | +----------------------------------------------------------------------------+ | 105 | +----------------------------------------------------------------------------+ |
106 | */ | 106 | */ |
107 | 107 | ||
108 | int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device * dev, | 108 | int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device *dev, |
109 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 109 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
110 | { | 110 | { |
111 | int i_ReturnValue = insn->n; | 111 | int i_ReturnValue = insn->n; |
112 | unsigned char b_TimeBase = 0; | 112 | unsigned char b_TimeBase = 0; |
@@ -295,8 +295,8 @@ int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device * dev, | |||
295 | +----------------------------------------------------------------------------+ | 295 | +----------------------------------------------------------------------------+ |
296 | */ | 296 | */ |
297 | 297 | ||
298 | int i_APCI3XXX_InsnConfigAnalogInput(struct comedi_device * dev, | 298 | int i_APCI3XXX_InsnConfigAnalogInput(struct comedi_device *dev, |
299 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 299 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
300 | { | 300 | { |
301 | int i_ReturnValue = insn->n; | 301 | int i_ReturnValue = insn->n; |
302 | 302 | ||
@@ -355,8 +355,8 @@ int i_APCI3XXX_InsnConfigAnalogInput(struct comedi_device * dev, | |||
355 | +----------------------------------------------------------------------------+ | 355 | +----------------------------------------------------------------------------+ |
356 | */ | 356 | */ |
357 | 357 | ||
358 | int i_APCI3XXX_InsnReadAnalogInput(struct comedi_device * dev, | 358 | int i_APCI3XXX_InsnReadAnalogInput(struct comedi_device *dev, |
359 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 359 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
360 | { | 360 | { |
361 | int i_ReturnValue = insn->n; | 361 | int i_ReturnValue = insn->n; |
362 | unsigned char b_Configuration = (unsigned char) CR_RANGE(insn->chanspec); | 362 | unsigned char b_Configuration = (unsigned char) CR_RANGE(insn->chanspec); |
@@ -684,8 +684,8 @@ void v_APCI3XXX_Interrupt(int irq, void *d) | |||
684 | +----------------------------------------------------------------------------+ | 684 | +----------------------------------------------------------------------------+ |
685 | */ | 685 | */ |
686 | 686 | ||
687 | int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device * dev, | 687 | int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device *dev, |
688 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 688 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
689 | { | 689 | { |
690 | unsigned char b_Range = (unsigned char) CR_RANGE(insn->chanspec); | 690 | unsigned char b_Range = (unsigned char) CR_RANGE(insn->chanspec); |
691 | unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec); | 691 | unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec); |
@@ -791,8 +791,8 @@ int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device * dev, | |||
791 | +----------------------------------------------------------------------------+ | 791 | +----------------------------------------------------------------------------+ |
792 | */ | 792 | */ |
793 | 793 | ||
794 | int i_APCI3XXX_InsnConfigInitTTLIO(struct comedi_device * dev, | 794 | int i_APCI3XXX_InsnConfigInitTTLIO(struct comedi_device *dev, |
795 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 795 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
796 | { | 796 | { |
797 | int i_ReturnValue = insn->n; | 797 | int i_ReturnValue = insn->n; |
798 | unsigned char b_Command = 0; | 798 | unsigned char b_Command = 0; |
@@ -919,8 +919,8 @@ int i_APCI3XXX_InsnConfigInitTTLIO(struct comedi_device * dev, | |||
919 | +----------------------------------------------------------------------------+ | 919 | +----------------------------------------------------------------------------+ |
920 | */ | 920 | */ |
921 | 921 | ||
922 | int i_APCI3XXX_InsnBitsTTLIO(struct comedi_device * dev, | 922 | int i_APCI3XXX_InsnBitsTTLIO(struct comedi_device *dev, |
923 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 923 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
924 | { | 924 | { |
925 | int i_ReturnValue = insn->n; | 925 | int i_ReturnValue = insn->n; |
926 | unsigned char b_ChannelCpt = 0; | 926 | unsigned char b_ChannelCpt = 0; |
@@ -1074,8 +1074,8 @@ int i_APCI3XXX_InsnBitsTTLIO(struct comedi_device * dev, | |||
1074 | +----------------------------------------------------------------------------+ | 1074 | +----------------------------------------------------------------------------+ |
1075 | */ | 1075 | */ |
1076 | 1076 | ||
1077 | int i_APCI3XXX_InsnReadTTLIO(struct comedi_device * dev, | 1077 | int i_APCI3XXX_InsnReadTTLIO(struct comedi_device *dev, |
1078 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1078 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1079 | { | 1079 | { |
1080 | unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec); | 1080 | unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec); |
1081 | int i_ReturnValue = insn->n; | 1081 | int i_ReturnValue = insn->n; |
@@ -1187,8 +1187,8 @@ int i_APCI3XXX_InsnReadTTLIO(struct comedi_device * dev, | |||
1187 | +----------------------------------------------------------------------------+ | 1187 | +----------------------------------------------------------------------------+ |
1188 | */ | 1188 | */ |
1189 | 1189 | ||
1190 | int i_APCI3XXX_InsnWriteTTLIO(struct comedi_device * dev, | 1190 | int i_APCI3XXX_InsnWriteTTLIO(struct comedi_device *dev, |
1191 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1191 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1192 | { | 1192 | { |
1193 | int i_ReturnValue = insn->n; | 1193 | int i_ReturnValue = insn->n; |
1194 | unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec); | 1194 | unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec); |
@@ -1298,8 +1298,8 @@ int i_APCI3XXX_InsnWriteTTLIO(struct comedi_device * dev, | |||
1298 | +----------------------------------------------------------------------------+ | 1298 | +----------------------------------------------------------------------------+ |
1299 | */ | 1299 | */ |
1300 | 1300 | ||
1301 | int i_APCI3XXX_InsnReadDigitalInput(struct comedi_device * dev, | 1301 | int i_APCI3XXX_InsnReadDigitalInput(struct comedi_device *dev, |
1302 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1302 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1303 | { | 1303 | { |
1304 | int i_ReturnValue = insn->n; | 1304 | int i_ReturnValue = insn->n; |
1305 | unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec); | 1305 | unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec); |
@@ -1356,8 +1356,8 @@ int i_APCI3XXX_InsnReadDigitalInput(struct comedi_device * dev, | |||
1356 | | -101 : Data size error | | 1356 | | -101 : Data size error | |
1357 | +----------------------------------------------------------------------------+ | 1357 | +----------------------------------------------------------------------------+ |
1358 | */ | 1358 | */ |
1359 | int i_APCI3XXX_InsnBitsDigitalInput(struct comedi_device * dev, | 1359 | int i_APCI3XXX_InsnBitsDigitalInput(struct comedi_device *dev, |
1360 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1360 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1361 | { | 1361 | { |
1362 | int i_ReturnValue = insn->n; | 1362 | int i_ReturnValue = insn->n; |
1363 | unsigned int dw_Temp = 0; | 1363 | unsigned int dw_Temp = 0; |
@@ -1409,8 +1409,8 @@ int i_APCI3XXX_InsnBitsDigitalInput(struct comedi_device * dev, | |||
1409 | | -101 : Data size error | | 1409 | | -101 : Data size error | |
1410 | +----------------------------------------------------------------------------+ | 1410 | +----------------------------------------------------------------------------+ |
1411 | */ | 1411 | */ |
1412 | int i_APCI3XXX_InsnBitsDigitalOutput(struct comedi_device * dev, | 1412 | int i_APCI3XXX_InsnBitsDigitalOutput(struct comedi_device *dev, |
1413 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1413 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1414 | { | 1414 | { |
1415 | int i_ReturnValue = insn->n; | 1415 | int i_ReturnValue = insn->n; |
1416 | unsigned char b_ChannelCpt = 0; | 1416 | unsigned char b_ChannelCpt = 0; |
@@ -1505,8 +1505,8 @@ int i_APCI3XXX_InsnBitsDigitalOutput(struct comedi_device * dev, | |||
1505 | +----------------------------------------------------------------------------+ | 1505 | +----------------------------------------------------------------------------+ |
1506 | */ | 1506 | */ |
1507 | 1507 | ||
1508 | int i_APCI3XXX_InsnWriteDigitalOutput(struct comedi_device * dev, | 1508 | int i_APCI3XXX_InsnWriteDigitalOutput(struct comedi_device *dev, |
1509 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1509 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1510 | { | 1510 | { |
1511 | int i_ReturnValue = insn->n; | 1511 | int i_ReturnValue = insn->n; |
1512 | unsigned char b_Channel = CR_CHAN(insn->chanspec); | 1512 | unsigned char b_Channel = CR_CHAN(insn->chanspec); |
@@ -1580,8 +1580,8 @@ int i_APCI3XXX_InsnWriteDigitalOutput(struct comedi_device * dev, | |||
1580 | +----------------------------------------------------------------------------+ | 1580 | +----------------------------------------------------------------------------+ |
1581 | */ | 1581 | */ |
1582 | 1582 | ||
1583 | int i_APCI3XXX_InsnReadDigitalOutput(struct comedi_device * dev, | 1583 | int i_APCI3XXX_InsnReadDigitalOutput(struct comedi_device *dev, |
1584 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1584 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1585 | { | 1585 | { |
1586 | int i_ReturnValue = insn->n; | 1586 | int i_ReturnValue = insn->n; |
1587 | unsigned char b_Channel = CR_CHAN(insn->chanspec); | 1587 | unsigned char b_Channel = CR_CHAN(insn->chanspec); |
@@ -1638,7 +1638,7 @@ int i_APCI3XXX_InsnReadDigitalOutput(struct comedi_device * dev, | |||
1638 | +----------------------------------------------------------------------------+ | 1638 | +----------------------------------------------------------------------------+ |
1639 | */ | 1639 | */ |
1640 | 1640 | ||
1641 | int i_APCI3XXX_Reset(struct comedi_device * dev) | 1641 | int i_APCI3XXX_Reset(struct comedi_device *dev) |
1642 | { | 1642 | { |
1643 | unsigned char b_Cpt = 0; | 1643 | unsigned char b_Cpt = 0; |
1644 | 1644 | ||
diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c index 7e27f92a9e6..ad96114e359 100644 --- a/drivers/staging/comedi/drivers/adl_pci6208.c +++ b/drivers/staging/comedi/drivers/adl_pci6208.c | |||
@@ -107,8 +107,8 @@ struct pci6208_private { | |||
107 | 107 | ||
108 | #define devpriv ((struct pci6208_private *)dev->private) | 108 | #define devpriv ((struct pci6208_private *)dev->private) |
109 | 109 | ||
110 | static int pci6208_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 110 | static int pci6208_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
111 | static int pci6208_detach(struct comedi_device * dev); | 111 | static int pci6208_detach(struct comedi_device *dev); |
112 | 112 | ||
113 | #define pci6208_board_nbr \ | 113 | #define pci6208_board_nbr \ |
114 | (sizeof(pci6208_boards) / sizeof(struct pci6208_board)) | 114 | (sizeof(pci6208_boards) / sizeof(struct pci6208_board)) |
@@ -122,16 +122,16 @@ static struct comedi_driver driver_pci6208 = { | |||
122 | 122 | ||
123 | COMEDI_PCI_INITCLEANUP(driver_pci6208, pci6208_pci_table); | 123 | COMEDI_PCI_INITCLEANUP(driver_pci6208, pci6208_pci_table); |
124 | 124 | ||
125 | static int pci6208_find_device(struct comedi_device * dev, int bus, int slot); | 125 | static int pci6208_find_device(struct comedi_device *dev, int bus, int slot); |
126 | static int | 126 | static int |
127 | pci6208_pci_setup(struct pci_dev *pci_dev, unsigned long *io_base_ptr, | 127 | pci6208_pci_setup(struct pci_dev *pci_dev, unsigned long *io_base_ptr, |
128 | int dev_minor); | 128 | int dev_minor); |
129 | 129 | ||
130 | /*read/write functions*/ | 130 | /*read/write functions*/ |
131 | static int pci6208_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 131 | static int pci6208_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
132 | struct comedi_insn * insn, unsigned int * data); | 132 | struct comedi_insn *insn, unsigned int *data); |
133 | static int pci6208_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 133 | static int pci6208_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
134 | struct comedi_insn * insn, unsigned int * data); | 134 | struct comedi_insn *insn, unsigned int *data); |
135 | /* static int pci6208_dio_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, */ | 135 | /* static int pci6208_dio_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, */ |
136 | /* struct comedi_insn *insn,unsigned int *data); */ | 136 | /* struct comedi_insn *insn,unsigned int *data); */ |
137 | /* static int pci6208_dio_insn_config(struct comedi_device *dev,struct comedi_subdevice *s, */ | 137 | /* static int pci6208_dio_insn_config(struct comedi_device *dev,struct comedi_subdevice *s, */ |
@@ -143,7 +143,7 @@ static int pci6208_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice | |||
143 | * in the driver structure, dev->board_ptr contains that | 143 | * in the driver structure, dev->board_ptr contains that |
144 | * address. | 144 | * address. |
145 | */ | 145 | */ |
146 | static int pci6208_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 146 | static int pci6208_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
147 | { | 147 | { |
148 | struct comedi_subdevice *s; | 148 | struct comedi_subdevice *s; |
149 | int retval; | 149 | int retval; |
@@ -206,7 +206,7 @@ static int pci6208_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
206 | * allocated by _attach(). dev->private and dev->subdevices are | 206 | * allocated by _attach(). dev->private and dev->subdevices are |
207 | * deallocated automatically by the core. | 207 | * deallocated automatically by the core. |
208 | */ | 208 | */ |
209 | static int pci6208_detach(struct comedi_device * dev) | 209 | static int pci6208_detach(struct comedi_device *dev) |
210 | { | 210 | { |
211 | printk("comedi%d: pci6208: remove\n", dev->minor); | 211 | printk("comedi%d: pci6208: remove\n", dev->minor); |
212 | 212 | ||
@@ -220,8 +220,8 @@ static int pci6208_detach(struct comedi_device * dev) | |||
220 | return 0; | 220 | return 0; |
221 | } | 221 | } |
222 | 222 | ||
223 | static int pci6208_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 223 | static int pci6208_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
224 | struct comedi_insn * insn, unsigned int * data) | 224 | struct comedi_insn *insn, unsigned int *data) |
225 | { | 225 | { |
226 | int i = 0, Data_Read; | 226 | int i = 0, Data_Read; |
227 | unsigned short chan = CR_CHAN(insn->chanspec); | 227 | unsigned short chan = CR_CHAN(insn->chanspec); |
@@ -245,8 +245,8 @@ static int pci6208_ao_winsn(struct comedi_device * dev, struct comedi_subdevice | |||
245 | 245 | ||
246 | /* AO subdevices should have a read insn as well as a write insn. | 246 | /* AO subdevices should have a read insn as well as a write insn. |
247 | * Usually this means copying a value stored in devpriv. */ | 247 | * Usually this means copying a value stored in devpriv. */ |
248 | static int pci6208_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 248 | static int pci6208_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
249 | struct comedi_insn * insn, unsigned int * data) | 249 | struct comedi_insn *insn, unsigned int *data) |
250 | { | 250 | { |
251 | int i; | 251 | int i; |
252 | int chan = CR_CHAN(insn->chanspec); | 252 | int chan = CR_CHAN(insn->chanspec); |
@@ -306,7 +306,7 @@ static int pci6208_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice | |||
306 | /* return 1; */ | 306 | /* return 1; */ |
307 | /* } */ | 307 | /* } */ |
308 | 308 | ||
309 | static int pci6208_find_device(struct comedi_device * dev, int bus, int slot) | 309 | static int pci6208_find_device(struct comedi_device *dev, int bus, int slot) |
310 | { | 310 | { |
311 | struct pci_dev *pci_dev; | 311 | struct pci_dev *pci_dev; |
312 | int i; | 312 | int i; |
diff --git a/drivers/staging/comedi/drivers/adl_pci7296.c b/drivers/staging/comedi/drivers/adl_pci7296.c index 1d9f5ad6972..72b3f4614d0 100644 --- a/drivers/staging/comedi/drivers/adl_pci7296.c +++ b/drivers/staging/comedi/drivers/adl_pci7296.c | |||
@@ -64,8 +64,8 @@ struct adl_pci7296_private { | |||
64 | 64 | ||
65 | #define devpriv ((struct adl_pci7296_private *)dev->private) | 65 | #define devpriv ((struct adl_pci7296_private *)dev->private) |
66 | 66 | ||
67 | static int adl_pci7296_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 67 | static int adl_pci7296_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
68 | static int adl_pci7296_detach(struct comedi_device * dev); | 68 | static int adl_pci7296_detach(struct comedi_device *dev); |
69 | static struct comedi_driver driver_adl_pci7296 = { | 69 | static struct comedi_driver driver_adl_pci7296 = { |
70 | driver_name:"adl_pci7296", | 70 | driver_name:"adl_pci7296", |
71 | module:THIS_MODULE, | 71 | module:THIS_MODULE, |
@@ -73,7 +73,7 @@ static struct comedi_driver driver_adl_pci7296 = { | |||
73 | detach:adl_pci7296_detach, | 73 | detach:adl_pci7296_detach, |
74 | }; | 74 | }; |
75 | 75 | ||
76 | static int adl_pci7296_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 76 | static int adl_pci7296_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
77 | { | 77 | { |
78 | struct pci_dev *pcidev; | 78 | struct pci_dev *pcidev; |
79 | struct comedi_subdevice *s; | 79 | struct comedi_subdevice *s; |
@@ -149,7 +149,7 @@ static int adl_pci7296_attach(struct comedi_device * dev, struct comedi_devconfi | |||
149 | return -EIO; | 149 | return -EIO; |
150 | } | 150 | } |
151 | 151 | ||
152 | static int adl_pci7296_detach(struct comedi_device * dev) | 152 | static int adl_pci7296_detach(struct comedi_device *dev) |
153 | { | 153 | { |
154 | printk("comedi%d: pci7432: remove\n", dev->minor); | 154 | printk("comedi%d: pci7432: remove\n", dev->minor); |
155 | 155 | ||
diff --git a/drivers/staging/comedi/drivers/adl_pci7432.c b/drivers/staging/comedi/drivers/adl_pci7432.c index a8f1715608d..e20ec2f9904 100644 --- a/drivers/staging/comedi/drivers/adl_pci7432.c +++ b/drivers/staging/comedi/drivers/adl_pci7432.c | |||
@@ -58,8 +58,8 @@ struct adl_pci7432_private { | |||
58 | 58 | ||
59 | #define devpriv ((struct adl_pci7432_private *)dev->private) | 59 | #define devpriv ((struct adl_pci7432_private *)dev->private) |
60 | 60 | ||
61 | static int adl_pci7432_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 61 | static int adl_pci7432_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
62 | static int adl_pci7432_detach(struct comedi_device * dev); | 62 | static int adl_pci7432_detach(struct comedi_device *dev); |
63 | static struct comedi_driver driver_adl_pci7432 = { | 63 | static struct comedi_driver driver_adl_pci7432 = { |
64 | driver_name:"adl_pci7432", | 64 | driver_name:"adl_pci7432", |
65 | module:THIS_MODULE, | 65 | module:THIS_MODULE, |
@@ -69,15 +69,15 @@ static struct comedi_driver driver_adl_pci7432 = { | |||
69 | 69 | ||
70 | /* Digital IO */ | 70 | /* Digital IO */ |
71 | 71 | ||
72 | static int adl_pci7432_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 72 | static int adl_pci7432_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
73 | struct comedi_insn * insn, unsigned int * data); | 73 | struct comedi_insn *insn, unsigned int *data); |
74 | 74 | ||
75 | static int adl_pci7432_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 75 | static int adl_pci7432_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
76 | struct comedi_insn * insn, unsigned int * data); | 76 | struct comedi_insn *insn, unsigned int *data); |
77 | 77 | ||
78 | /* */ | 78 | /* */ |
79 | 79 | ||
80 | static int adl_pci7432_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 80 | static int adl_pci7432_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
81 | { | 81 | { |
82 | struct pci_dev *pcidev; | 82 | struct pci_dev *pcidev; |
83 | struct comedi_subdevice *s; | 83 | struct comedi_subdevice *s; |
@@ -150,7 +150,7 @@ static int adl_pci7432_attach(struct comedi_device * dev, struct comedi_devconfi | |||
150 | return -EIO; | 150 | return -EIO; |
151 | } | 151 | } |
152 | 152 | ||
153 | static int adl_pci7432_detach(struct comedi_device * dev) | 153 | static int adl_pci7432_detach(struct comedi_device *dev) |
154 | { | 154 | { |
155 | printk("comedi%d: pci7432: remove\n", dev->minor); | 155 | printk("comedi%d: pci7432: remove\n", dev->minor); |
156 | 156 | ||
@@ -164,8 +164,8 @@ static int adl_pci7432_detach(struct comedi_device * dev) | |||
164 | return 0; | 164 | return 0; |
165 | } | 165 | } |
166 | 166 | ||
167 | static int adl_pci7432_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 167 | static int adl_pci7432_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
168 | struct comedi_insn * insn, unsigned int * data) | 168 | struct comedi_insn *insn, unsigned int *data) |
169 | { | 169 | { |
170 | printk("comedi: pci7432_do_insn_bits called\n"); | 170 | printk("comedi: pci7432_do_insn_bits called\n"); |
171 | printk("comedi: data0: %8x data1: %8x\n", data[0], data[1]); | 171 | printk("comedi: data0: %8x data1: %8x\n", data[0], data[1]); |
@@ -184,8 +184,8 @@ static int adl_pci7432_do_insn_bits(struct comedi_device * dev, struct comedi_su | |||
184 | return 2; | 184 | return 2; |
185 | } | 185 | } |
186 | 186 | ||
187 | static int adl_pci7432_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 187 | static int adl_pci7432_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
188 | struct comedi_insn * insn, unsigned int * data) | 188 | struct comedi_insn *insn, unsigned int *data) |
189 | { | 189 | { |
190 | printk("comedi: pci7432_di_insn_bits called\n"); | 190 | printk("comedi: pci7432_di_insn_bits called\n"); |
191 | printk("comedi: data0: %8x data1: %8x\n", data[0], data[1]); | 191 | 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 dd376b69bde..61b8cba40d0 100644 --- a/drivers/staging/comedi/drivers/adl_pci8164.c +++ b/drivers/staging/comedi/drivers/adl_pci8164.c | |||
@@ -70,8 +70,8 @@ struct adl_pci8164_private { | |||
70 | 70 | ||
71 | #define devpriv ((struct adl_pci8164_private *)dev->private) | 71 | #define devpriv ((struct adl_pci8164_private *)dev->private) |
72 | 72 | ||
73 | static int adl_pci8164_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 73 | static int adl_pci8164_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
74 | static int adl_pci8164_detach(struct comedi_device * dev); | 74 | static int adl_pci8164_detach(struct comedi_device *dev); |
75 | static struct comedi_driver driver_adl_pci8164 = { | 75 | static struct comedi_driver driver_adl_pci8164 = { |
76 | driver_name:"adl_pci8164", | 76 | driver_name:"adl_pci8164", |
77 | module:THIS_MODULE, | 77 | module:THIS_MODULE, |
@@ -79,31 +79,31 @@ static struct comedi_driver driver_adl_pci8164 = { | |||
79 | detach:adl_pci8164_detach, | 79 | detach:adl_pci8164_detach, |
80 | }; | 80 | }; |
81 | 81 | ||
82 | static int adl_pci8164_insn_read_msts(struct comedi_device * dev, struct comedi_subdevice * s, | 82 | static int adl_pci8164_insn_read_msts(struct comedi_device *dev, struct comedi_subdevice *s, |
83 | struct comedi_insn * insn, unsigned int * data); | 83 | struct comedi_insn *insn, unsigned int *data); |
84 | 84 | ||
85 | static int adl_pci8164_insn_read_ssts(struct comedi_device * dev, struct comedi_subdevice * s, | 85 | static int adl_pci8164_insn_read_ssts(struct comedi_device *dev, struct comedi_subdevice *s, |
86 | struct comedi_insn * insn, unsigned int * data); | 86 | struct comedi_insn *insn, unsigned int *data); |
87 | 87 | ||
88 | static int adl_pci8164_insn_read_buf0(struct comedi_device * dev, struct comedi_subdevice * s, | 88 | static int adl_pci8164_insn_read_buf0(struct comedi_device *dev, struct comedi_subdevice *s, |
89 | struct comedi_insn * insn, unsigned int * data); | 89 | struct comedi_insn *insn, unsigned int *data); |
90 | 90 | ||
91 | static int adl_pci8164_insn_read_buf1(struct comedi_device * dev, struct comedi_subdevice * s, | 91 | static int adl_pci8164_insn_read_buf1(struct comedi_device *dev, struct comedi_subdevice *s, |
92 | struct comedi_insn * insn, unsigned int * data); | 92 | struct comedi_insn *insn, unsigned int *data); |
93 | 93 | ||
94 | static int adl_pci8164_insn_write_cmd(struct comedi_device * dev, struct comedi_subdevice * s, | 94 | static int adl_pci8164_insn_write_cmd(struct comedi_device *dev, struct comedi_subdevice *s, |
95 | struct comedi_insn * insn, unsigned int * data); | 95 | struct comedi_insn *insn, unsigned int *data); |
96 | 96 | ||
97 | static int adl_pci8164_insn_write_otp(struct comedi_device * dev, struct comedi_subdevice * s, | 97 | static int adl_pci8164_insn_write_otp(struct comedi_device *dev, struct comedi_subdevice *s, |
98 | struct comedi_insn * insn, unsigned int * data); | 98 | struct comedi_insn *insn, unsigned int *data); |
99 | 99 | ||
100 | static int adl_pci8164_insn_write_buf0(struct comedi_device * dev, | 100 | static int adl_pci8164_insn_write_buf0(struct comedi_device *dev, |
101 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 101 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); |
102 | 102 | ||
103 | static int adl_pci8164_insn_write_buf1(struct comedi_device * dev, | 103 | static int adl_pci8164_insn_write_buf1(struct comedi_device *dev, |
104 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 104 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); |
105 | 105 | ||
106 | static int adl_pci8164_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 106 | static int adl_pci8164_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
107 | { | 107 | { |
108 | struct pci_dev *pcidev; | 108 | struct pci_dev *pcidev; |
109 | struct comedi_subdevice *s; | 109 | struct comedi_subdevice *s; |
@@ -194,7 +194,7 @@ static int adl_pci8164_attach(struct comedi_device * dev, struct comedi_devconfi | |||
194 | return -EIO; | 194 | return -EIO; |
195 | } | 195 | } |
196 | 196 | ||
197 | static int adl_pci8164_detach(struct comedi_device * dev) | 197 | static int adl_pci8164_detach(struct comedi_device *dev) |
198 | { | 198 | { |
199 | printk("comedi%d: pci8164: remove\n", dev->minor); | 199 | printk("comedi%d: pci8164: remove\n", dev->minor); |
200 | 200 | ||
@@ -208,8 +208,8 @@ static int adl_pci8164_detach(struct comedi_device * dev) | |||
208 | return 0; | 208 | return 0; |
209 | } | 209 | } |
210 | 210 | ||
211 | static int adl_pci8164_insn_read_msts(struct comedi_device * dev, struct comedi_subdevice * s, | 211 | static int adl_pci8164_insn_read_msts(struct comedi_device *dev, struct comedi_subdevice *s, |
212 | struct comedi_insn * insn, unsigned int * data) | 212 | struct comedi_insn *insn, unsigned int *data) |
213 | { | 213 | { |
214 | int axis, axis_reg; | 214 | int axis, axis_reg; |
215 | char *axisname; | 215 | char *axisname; |
@@ -245,8 +245,8 @@ static int adl_pci8164_insn_read_msts(struct comedi_device * dev, struct comedi_ | |||
245 | return 2; | 245 | return 2; |
246 | } | 246 | } |
247 | 247 | ||
248 | static int adl_pci8164_insn_read_ssts(struct comedi_device * dev, struct comedi_subdevice * s, | 248 | static int adl_pci8164_insn_read_ssts(struct comedi_device *dev, struct comedi_subdevice *s, |
249 | struct comedi_insn * insn, unsigned int * data) | 249 | struct comedi_insn *insn, unsigned int *data) |
250 | { | 250 | { |
251 | int axis, axis_reg; | 251 | int axis, axis_reg; |
252 | char *axisname; | 252 | char *axisname; |
@@ -282,8 +282,8 @@ static int adl_pci8164_insn_read_ssts(struct comedi_device * dev, struct comedi_ | |||
282 | return 2; | 282 | return 2; |
283 | } | 283 | } |
284 | 284 | ||
285 | static int adl_pci8164_insn_read_buf0(struct comedi_device * dev, struct comedi_subdevice * s, | 285 | static int adl_pci8164_insn_read_buf0(struct comedi_device *dev, struct comedi_subdevice *s, |
286 | struct comedi_insn * insn, unsigned int * data) | 286 | struct comedi_insn *insn, unsigned int *data) |
287 | { | 287 | { |
288 | int axis, axis_reg; | 288 | int axis, axis_reg; |
289 | char *axisname; | 289 | char *axisname; |
@@ -319,8 +319,8 @@ static int adl_pci8164_insn_read_buf0(struct comedi_device * dev, struct comedi_ | |||
319 | return 2; | 319 | return 2; |
320 | } | 320 | } |
321 | 321 | ||
322 | static int adl_pci8164_insn_read_buf1(struct comedi_device * dev, struct comedi_subdevice * s, | 322 | static int adl_pci8164_insn_read_buf1(struct comedi_device *dev, struct comedi_subdevice *s, |
323 | struct comedi_insn * insn, unsigned int * data) | 323 | struct comedi_insn *insn, unsigned int *data) |
324 | { | 324 | { |
325 | int axis, axis_reg; | 325 | int axis, axis_reg; |
326 | 326 | ||
@@ -357,8 +357,8 @@ static int adl_pci8164_insn_read_buf1(struct comedi_device * dev, struct comedi_ | |||
357 | return 2; | 357 | return 2; |
358 | } | 358 | } |
359 | 359 | ||
360 | static int adl_pci8164_insn_write_cmd(struct comedi_device * dev, struct comedi_subdevice * s, | 360 | static int adl_pci8164_insn_write_cmd(struct comedi_device *dev, struct comedi_subdevice *s, |
361 | struct comedi_insn * insn, unsigned int * data) | 361 | struct comedi_insn *insn, unsigned int *data) |
362 | { | 362 | { |
363 | unsigned int axis, axis_reg; | 363 | unsigned int axis, axis_reg; |
364 | 364 | ||
@@ -395,8 +395,8 @@ static int adl_pci8164_insn_write_cmd(struct comedi_device * dev, struct comedi_ | |||
395 | return 2; | 395 | return 2; |
396 | } | 396 | } |
397 | 397 | ||
398 | static int adl_pci8164_insn_write_otp(struct comedi_device * dev, struct comedi_subdevice * s, | 398 | static int adl_pci8164_insn_write_otp(struct comedi_device *dev, struct comedi_subdevice *s, |
399 | struct comedi_insn * insn, unsigned int * data) | 399 | struct comedi_insn *insn, unsigned int *data) |
400 | { | 400 | { |
401 | int axis, axis_reg; | 401 | int axis, axis_reg; |
402 | 402 | ||
@@ -433,8 +433,8 @@ static int adl_pci8164_insn_write_otp(struct comedi_device * dev, struct comedi_ | |||
433 | return 2; | 433 | return 2; |
434 | } | 434 | } |
435 | 435 | ||
436 | static int adl_pci8164_insn_write_buf0(struct comedi_device * dev, | 436 | static int adl_pci8164_insn_write_buf0(struct comedi_device *dev, |
437 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 437 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
438 | { | 438 | { |
439 | int axis, axis_reg; | 439 | int axis, axis_reg; |
440 | 440 | ||
@@ -471,8 +471,8 @@ static int adl_pci8164_insn_write_buf0(struct comedi_device * dev, | |||
471 | return 2; | 471 | return 2; |
472 | } | 472 | } |
473 | 473 | ||
474 | static int adl_pci8164_insn_write_buf1(struct comedi_device * dev, | 474 | static int adl_pci8164_insn_write_buf1(struct comedi_device *dev, |
475 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 475 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
476 | { | 476 | { |
477 | int axis, axis_reg; | 477 | int axis, axis_reg; |
478 | 478 | ||
diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c index 28b6b8d3c66..ae5c8552f11 100644 --- a/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/drivers/staging/comedi/drivers/adl_pci9111.c | |||
@@ -264,9 +264,9 @@ TODO: | |||
264 | 264 | ||
265 | /* Function prototypes */ | 265 | /* Function prototypes */ |
266 | 266 | ||
267 | static int pci9111_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 267 | static int pci9111_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
268 | static int pci9111_detach(struct comedi_device * dev); | 268 | static int pci9111_detach(struct comedi_device *dev); |
269 | static void pci9111_ai_munge(struct comedi_device * dev, struct comedi_subdevice * s, | 269 | static void pci9111_ai_munge(struct comedi_device *dev, struct comedi_subdevice *s, |
270 | void *data, unsigned int num_bytes, unsigned int start_chan_index); | 270 | void *data, unsigned int num_bytes, unsigned int start_chan_index); |
271 | 271 | ||
272 | static const struct comedi_lrange pci9111_hr_ai_range = { | 272 | static const struct comedi_lrange pci9111_hr_ai_range = { |
@@ -406,7 +406,7 @@ static void plx9050_interrupt_control(unsigned long io_base, | |||
406 | 406 | ||
407 | /* 8254 timer */ | 407 | /* 8254 timer */ |
408 | 408 | ||
409 | static void pci9111_timer_set(struct comedi_device * dev) | 409 | static void pci9111_timer_set(struct comedi_device *dev) |
410 | { | 410 | { |
411 | pci9111_8254_control_set(PCI9111_8254_COUNTER_0 | | 411 | pci9111_8254_control_set(PCI9111_8254_COUNTER_0 | |
412 | PCI9111_8254_READ_LOAD_LSB_MSB | | 412 | PCI9111_8254_READ_LOAD_LSB_MSB | |
@@ -432,7 +432,7 @@ enum pci9111_trigger_sources { | |||
432 | external | 432 | external |
433 | }; | 433 | }; |
434 | 434 | ||
435 | static void pci9111_trigger_source_set(struct comedi_device * dev, | 435 | static void pci9111_trigger_source_set(struct comedi_device *dev, |
436 | enum pci9111_trigger_sources source) | 436 | enum pci9111_trigger_sources source) |
437 | { | 437 | { |
438 | int flags; | 438 | int flags; |
@@ -456,7 +456,7 @@ static void pci9111_trigger_source_set(struct comedi_device * dev, | |||
456 | pci9111_trigger_and_autoscan_set(flags); | 456 | pci9111_trigger_and_autoscan_set(flags); |
457 | } | 457 | } |
458 | 458 | ||
459 | static void pci9111_pretrigger_set(struct comedi_device * dev, bool pretrigger) | 459 | static void pci9111_pretrigger_set(struct comedi_device *dev, bool pretrigger) |
460 | { | 460 | { |
461 | int flags; | 461 | int flags; |
462 | 462 | ||
@@ -468,7 +468,7 @@ static void pci9111_pretrigger_set(struct comedi_device * dev, bool pretrigger) | |||
468 | pci9111_trigger_and_autoscan_set(flags); | 468 | pci9111_trigger_and_autoscan_set(flags); |
469 | } | 469 | } |
470 | 470 | ||
471 | static void pci9111_autoscan_set(struct comedi_device * dev, bool autoscan) | 471 | static void pci9111_autoscan_set(struct comedi_device *dev, bool autoscan) |
472 | { | 472 | { |
473 | int flags; | 473 | int flags; |
474 | 474 | ||
@@ -490,7 +490,7 @@ enum pci9111_ISC1_sources { | |||
490 | irq_on_external_trigger | 490 | irq_on_external_trigger |
491 | }; | 491 | }; |
492 | 492 | ||
493 | static void pci9111_interrupt_source_set(struct comedi_device * dev, | 493 | static void pci9111_interrupt_source_set(struct comedi_device *dev, |
494 | enum pci9111_ISC0_sources irq_0_source, enum pci9111_ISC1_sources irq_1_source) | 494 | enum pci9111_ISC0_sources irq_0_source, enum pci9111_ISC1_sources irq_1_source) |
495 | { | 495 | { |
496 | int flags; | 496 | int flags; |
@@ -514,7 +514,7 @@ static void pci9111_interrupt_source_set(struct comedi_device * dev, | |||
514 | 514 | ||
515 | #undef AI_DO_CMD_DEBUG | 515 | #undef AI_DO_CMD_DEBUG |
516 | 516 | ||
517 | static int pci9111_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 517 | static int pci9111_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
518 | { | 518 | { |
519 | /* Disable interrupts */ | 519 | /* Disable interrupts */ |
520 | 520 | ||
@@ -542,8 +542,8 @@ static int pci9111_ai_cancel(struct comedi_device * dev, struct comedi_subdevice | |||
542 | if (!src || tmp != src) error++ | 542 | if (!src || tmp != src) error++ |
543 | 543 | ||
544 | static int | 544 | static int |
545 | pci9111_ai_do_cmd_test(struct comedi_device * dev, | 545 | pci9111_ai_do_cmd_test(struct comedi_device *dev, |
546 | struct comedi_subdevice * s, struct comedi_cmd * cmd) | 546 | struct comedi_subdevice *s, struct comedi_cmd *cmd) |
547 | { | 547 | { |
548 | int tmp; | 548 | int tmp; |
549 | int error = 0; | 549 | int error = 0; |
@@ -741,7 +741,7 @@ pci9111_ai_do_cmd_test(struct comedi_device * dev, | |||
741 | 741 | ||
742 | /* Analog input command */ | 742 | /* Analog input command */ |
743 | 743 | ||
744 | static int pci9111_ai_do_cmd(struct comedi_device * dev, struct comedi_subdevice * subdevice) | 744 | static int pci9111_ai_do_cmd(struct comedi_device *dev, struct comedi_subdevice *subdevice) |
745 | { | 745 | { |
746 | struct comedi_cmd *async_cmd = &subdevice->async->cmd; | 746 | struct comedi_cmd *async_cmd = &subdevice->async->cmd; |
747 | 747 | ||
@@ -859,7 +859,7 @@ static int pci9111_ai_do_cmd(struct comedi_device * dev, struct comedi_subdevice | |||
859 | return 0; | 859 | return 0; |
860 | } | 860 | } |
861 | 861 | ||
862 | static void pci9111_ai_munge(struct comedi_device * dev, struct comedi_subdevice * s, | 862 | static void pci9111_ai_munge(struct comedi_device *dev, struct comedi_subdevice *s, |
863 | void *data, unsigned int num_bytes, unsigned int start_chan_index) | 863 | void *data, unsigned int num_bytes, unsigned int start_chan_index) |
864 | { | 864 | { |
865 | unsigned int i, num_samples = num_bytes / sizeof(short); | 865 | unsigned int i, num_samples = num_bytes / sizeof(short); |
@@ -1043,8 +1043,8 @@ static irqreturn_t pci9111_interrupt(int irq, void *p_device) | |||
1043 | 1043 | ||
1044 | #undef AI_INSN_DEBUG | 1044 | #undef AI_INSN_DEBUG |
1045 | 1045 | ||
1046 | static int pci9111_ai_insn_read(struct comedi_device * dev, | 1046 | static int pci9111_ai_insn_read(struct comedi_device *dev, |
1047 | struct comedi_subdevice * subdevice, struct comedi_insn * insn, unsigned int * data) | 1047 | struct comedi_subdevice *subdevice, struct comedi_insn *insn, unsigned int *data) |
1048 | { | 1048 | { |
1049 | int resolution = | 1049 | int resolution = |
1050 | ((struct pci9111_board *) dev->board_ptr)->ai_resolution; | 1050 | ((struct pci9111_board *) dev->board_ptr)->ai_resolution; |
@@ -1101,8 +1101,8 @@ static int pci9111_ai_insn_read(struct comedi_device * dev, | |||
1101 | /* Analog instant output */ | 1101 | /* Analog instant output */ |
1102 | 1102 | ||
1103 | static int | 1103 | static int |
1104 | pci9111_ao_insn_write(struct comedi_device * dev, | 1104 | pci9111_ao_insn_write(struct comedi_device *dev, |
1105 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1105 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1106 | { | 1106 | { |
1107 | int i; | 1107 | int i; |
1108 | 1108 | ||
@@ -1116,8 +1116,8 @@ pci9111_ao_insn_write(struct comedi_device * dev, | |||
1116 | 1116 | ||
1117 | /* Analog output readback */ | 1117 | /* Analog output readback */ |
1118 | 1118 | ||
1119 | static int pci9111_ao_insn_read(struct comedi_device * dev, | 1119 | static int pci9111_ao_insn_read(struct comedi_device *dev, |
1120 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1120 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1121 | { | 1121 | { |
1122 | int i; | 1122 | int i; |
1123 | 1123 | ||
@@ -1134,8 +1134,8 @@ static int pci9111_ao_insn_read(struct comedi_device * dev, | |||
1134 | 1134 | ||
1135 | /* Digital inputs */ | 1135 | /* Digital inputs */ |
1136 | 1136 | ||
1137 | static int pci9111_di_insn_bits(struct comedi_device * dev, | 1137 | static int pci9111_di_insn_bits(struct comedi_device *dev, |
1138 | struct comedi_subdevice * subdevice, struct comedi_insn * insn, unsigned int * data) | 1138 | struct comedi_subdevice *subdevice, struct comedi_insn *insn, unsigned int *data) |
1139 | { | 1139 | { |
1140 | unsigned int bits; | 1140 | unsigned int bits; |
1141 | 1141 | ||
@@ -1147,8 +1147,8 @@ static int pci9111_di_insn_bits(struct comedi_device * dev, | |||
1147 | 1147 | ||
1148 | /* Digital outputs */ | 1148 | /* Digital outputs */ |
1149 | 1149 | ||
1150 | static int pci9111_do_insn_bits(struct comedi_device * dev, | 1150 | static int pci9111_do_insn_bits(struct comedi_device *dev, |
1151 | struct comedi_subdevice * subdevice, struct comedi_insn * insn, unsigned int * data) | 1151 | struct comedi_subdevice *subdevice, struct comedi_insn *insn, unsigned int *data) |
1152 | { | 1152 | { |
1153 | unsigned int bits; | 1153 | unsigned int bits; |
1154 | 1154 | ||
@@ -1176,7 +1176,7 @@ static int pci9111_do_insn_bits(struct comedi_device * dev, | |||
1176 | 1176 | ||
1177 | /* Reset device */ | 1177 | /* Reset device */ |
1178 | 1178 | ||
1179 | static int pci9111_reset(struct comedi_device * dev) | 1179 | static int pci9111_reset(struct comedi_device *dev) |
1180 | { | 1180 | { |
1181 | /* Set trigger source to software */ | 1181 | /* Set trigger source to software */ |
1182 | 1182 | ||
@@ -1201,7 +1201,7 @@ static int pci9111_reset(struct comedi_device * dev) | |||
1201 | /* - Register PCI device */ | 1201 | /* - Register PCI device */ |
1202 | /* - Declare device driver capability */ | 1202 | /* - Declare device driver capability */ |
1203 | 1203 | ||
1204 | static int pci9111_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 1204 | static int pci9111_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
1205 | { | 1205 | { |
1206 | struct comedi_subdevice *subdevice; | 1206 | struct comedi_subdevice *subdevice; |
1207 | unsigned long io_base, io_range, lcr_io_base, lcr_io_range; | 1207 | unsigned long io_base, io_range, lcr_io_base, lcr_io_range; |
@@ -1366,7 +1366,7 @@ static int pci9111_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
1366 | 1366 | ||
1367 | /* Detach */ | 1367 | /* Detach */ |
1368 | 1368 | ||
1369 | static int pci9111_detach(struct comedi_device * dev) | 1369 | static int pci9111_detach(struct comedi_device *dev) |
1370 | { | 1370 | { |
1371 | /* Reset device */ | 1371 | /* Reset device */ |
1372 | 1372 | ||
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index 6a8a4e2d45a..20f7bf0c2b4 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c | |||
@@ -179,8 +179,8 @@ static const struct comedi_lrange range_pci9118hg = { 8, { | |||
179 | 179 | ||
180 | #define PCI9118_BIPOLAR_RANGES 4 /* used for test on mixture of BIP/UNI ranges */ | 180 | #define PCI9118_BIPOLAR_RANGES 4 /* used for test on mixture of BIP/UNI ranges */ |
181 | 181 | ||
182 | static int pci9118_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 182 | static int pci9118_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
183 | static int pci9118_detach(struct comedi_device * dev); | 183 | static int pci9118_detach(struct comedi_device *dev); |
184 | 184 | ||
185 | struct boardtype { | 185 | struct boardtype { |
186 | const char *name; /* board name */ | 186 | const char *name; /* board name */ |
@@ -309,27 +309,27 @@ struct pci9118_private { | |||
309 | ============================================================================== | 309 | ============================================================================== |
310 | */ | 310 | */ |
311 | 311 | ||
312 | static int check_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, | 312 | static int check_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, |
313 | int n_chan, unsigned int *chanlist, int frontadd, int backadd); | 313 | int n_chan, unsigned int *chanlist, int frontadd, int backadd); |
314 | static int setup_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, | 314 | static int setup_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, |
315 | int n_chan, unsigned int *chanlist, int rot, int frontadd, int backadd, | 315 | int n_chan, unsigned int *chanlist, int rot, int frontadd, int backadd, |
316 | int usedma, char eoshandle); | 316 | int usedma, char eoshandle); |
317 | static void start_pacer(struct comedi_device * dev, int mode, unsigned int divisor1, | 317 | static void start_pacer(struct comedi_device *dev, int mode, unsigned int divisor1, |
318 | unsigned int divisor2); | 318 | unsigned int divisor2); |
319 | static int pci9118_reset(struct comedi_device * dev); | 319 | static int pci9118_reset(struct comedi_device *dev); |
320 | static int pci9118_exttrg_add(struct comedi_device * dev, unsigned char source); | 320 | static int pci9118_exttrg_add(struct comedi_device *dev, unsigned char source); |
321 | static int pci9118_exttrg_del(struct comedi_device * dev, unsigned char source); | 321 | static int pci9118_exttrg_del(struct comedi_device *dev, unsigned char source); |
322 | static int pci9118_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 322 | static int pci9118_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s); |
323 | static void pci9118_calc_divisors(char mode, struct comedi_device * dev, | 323 | static void pci9118_calc_divisors(char mode, struct comedi_device *dev, |
324 | struct comedi_subdevice * s, unsigned int *tim1, unsigned int *tim2, | 324 | struct comedi_subdevice *s, unsigned int *tim1, unsigned int *tim2, |
325 | unsigned int flags, int chans, unsigned int *div1, unsigned int *div2, | 325 | unsigned int flags, int chans, unsigned int *div1, unsigned int *div2, |
326 | char usessh, unsigned int chnsshfront); | 326 | char usessh, unsigned int chnsshfront); |
327 | 327 | ||
328 | /* | 328 | /* |
329 | ============================================================================== | 329 | ============================================================================== |
330 | */ | 330 | */ |
331 | static int pci9118_insn_read_ai(struct comedi_device * dev, struct comedi_subdevice * s, | 331 | static int pci9118_insn_read_ai(struct comedi_device *dev, struct comedi_subdevice *s, |
332 | struct comedi_insn * insn, unsigned int * data) | 332 | struct comedi_insn *insn, unsigned int *data) |
333 | { | 333 | { |
334 | 334 | ||
335 | int n, timeout; | 335 | int n, timeout; |
@@ -378,8 +378,8 @@ static int pci9118_insn_read_ai(struct comedi_device * dev, struct comedi_subdev | |||
378 | /* | 378 | /* |
379 | ============================================================================== | 379 | ============================================================================== |
380 | */ | 380 | */ |
381 | static int pci9118_insn_write_ao(struct comedi_device * dev, struct comedi_subdevice * s, | 381 | static int pci9118_insn_write_ao(struct comedi_device *dev, struct comedi_subdevice *s, |
382 | struct comedi_insn * insn, unsigned int * data) | 382 | struct comedi_insn *insn, unsigned int *data) |
383 | { | 383 | { |
384 | int n, chanreg, ch; | 384 | int n, chanreg, ch; |
385 | 385 | ||
@@ -401,8 +401,8 @@ static int pci9118_insn_write_ao(struct comedi_device * dev, struct comedi_subde | |||
401 | /* | 401 | /* |
402 | ============================================================================== | 402 | ============================================================================== |
403 | */ | 403 | */ |
404 | static int pci9118_insn_read_ao(struct comedi_device * dev, struct comedi_subdevice * s, | 404 | static int pci9118_insn_read_ao(struct comedi_device *dev, struct comedi_subdevice *s, |
405 | struct comedi_insn * insn, unsigned int * data) | 405 | struct comedi_insn *insn, unsigned int *data) |
406 | { | 406 | { |
407 | int n, chan; | 407 | int n, chan; |
408 | 408 | ||
@@ -416,8 +416,8 @@ static int pci9118_insn_read_ao(struct comedi_device * dev, struct comedi_subdev | |||
416 | /* | 416 | /* |
417 | ============================================================================== | 417 | ============================================================================== |
418 | */ | 418 | */ |
419 | static int pci9118_insn_bits_di(struct comedi_device * dev, struct comedi_subdevice * s, | 419 | static int pci9118_insn_bits_di(struct comedi_device *dev, struct comedi_subdevice *s, |
420 | struct comedi_insn * insn, unsigned int * data) | 420 | struct comedi_insn *insn, unsigned int *data) |
421 | { | 421 | { |
422 | data[1] = inl(dev->iobase + PCI9118_DI) & 0xf; | 422 | data[1] = inl(dev->iobase + PCI9118_DI) & 0xf; |
423 | 423 | ||
@@ -427,8 +427,8 @@ static int pci9118_insn_bits_di(struct comedi_device * dev, struct comedi_subdev | |||
427 | /* | 427 | /* |
428 | ============================================================================== | 428 | ============================================================================== |
429 | */ | 429 | */ |
430 | static int pci9118_insn_bits_do(struct comedi_device * dev, struct comedi_subdevice * s, | 430 | static int pci9118_insn_bits_do(struct comedi_device *dev, struct comedi_subdevice *s, |
431 | struct comedi_insn * insn, unsigned int * data) | 431 | struct comedi_insn *insn, unsigned int *data) |
432 | { | 432 | { |
433 | if (data[0]) { | 433 | if (data[0]) { |
434 | s->state &= ~data[0]; | 434 | s->state &= ~data[0]; |
@@ -443,7 +443,7 @@ static int pci9118_insn_bits_do(struct comedi_device * dev, struct comedi_subdev | |||
443 | /* | 443 | /* |
444 | ============================================================================== | 444 | ============================================================================== |
445 | */ | 445 | */ |
446 | static void interrupt_pci9118_ai_mode4_switch(struct comedi_device * dev) | 446 | static void interrupt_pci9118_ai_mode4_switch(struct comedi_device *dev) |
447 | { | 447 | { |
448 | devpriv->AdFunctionReg = | 448 | devpriv->AdFunctionReg = |
449 | AdFunction_PDTrg | AdFunction_PETrg | AdFunction_AM; | 449 | AdFunction_PDTrg | AdFunction_PETrg | AdFunction_AM; |
@@ -457,8 +457,8 @@ static void interrupt_pci9118_ai_mode4_switch(struct comedi_device * dev) | |||
457 | outl(devpriv->AdFunctionReg, dev->iobase + PCI9118_ADFUNC); | 457 | outl(devpriv->AdFunctionReg, dev->iobase + PCI9118_ADFUNC); |
458 | } | 458 | } |
459 | 459 | ||
460 | static unsigned int defragment_dma_buffer(struct comedi_device * dev, | 460 | static unsigned int defragment_dma_buffer(struct comedi_device *dev, |
461 | struct comedi_subdevice * s, short * dma_buffer, unsigned int num_samples) | 461 | struct comedi_subdevice *s, short *dma_buffer, unsigned int num_samples) |
462 | { | 462 | { |
463 | unsigned int i = 0, j = 0; | 463 | unsigned int i = 0, j = 0; |
464 | unsigned int start_pos = devpriv->ai_add_front, | 464 | unsigned int start_pos = devpriv->ai_add_front, |
@@ -481,8 +481,8 @@ static unsigned int defragment_dma_buffer(struct comedi_device * dev, | |||
481 | /* | 481 | /* |
482 | ============================================================================== | 482 | ============================================================================== |
483 | */ | 483 | */ |
484 | static unsigned int move_block_from_dma(struct comedi_device * dev, | 484 | static unsigned int move_block_from_dma(struct comedi_device *dev, |
485 | struct comedi_subdevice * s, short * dma_buffer, unsigned int num_samples) | 485 | struct comedi_subdevice *s, short *dma_buffer, unsigned int num_samples) |
486 | { | 486 | { |
487 | unsigned int num_bytes; | 487 | unsigned int num_bytes; |
488 | 488 | ||
@@ -502,8 +502,8 @@ static unsigned int move_block_from_dma(struct comedi_device * dev, | |||
502 | /* | 502 | /* |
503 | ============================================================================== | 503 | ============================================================================== |
504 | */ | 504 | */ |
505 | static char pci9118_decode_error_status(struct comedi_device * dev, | 505 | static char pci9118_decode_error_status(struct comedi_device *dev, |
506 | struct comedi_subdevice * s, unsigned char m) | 506 | struct comedi_subdevice *s, unsigned char m) |
507 | { | 507 | { |
508 | if (m & 0x100) { | 508 | if (m & 0x100) { |
509 | comedi_error(dev, "A/D FIFO Full status (Fatal Error!)"); | 509 | comedi_error(dev, "A/D FIFO Full status (Fatal Error!)"); |
@@ -532,7 +532,7 @@ static char pci9118_decode_error_status(struct comedi_device * dev, | |||
532 | return 0; | 532 | return 0; |
533 | } | 533 | } |
534 | 534 | ||
535 | static void pci9118_ai_munge(struct comedi_device * dev, struct comedi_subdevice * s, | 535 | static void pci9118_ai_munge(struct comedi_device *dev, struct comedi_subdevice *s, |
536 | void *data, unsigned int num_bytes, unsigned int start_chan_index) | 536 | void *data, unsigned int num_bytes, unsigned int start_chan_index) |
537 | { | 537 | { |
538 | unsigned int i, num_samples = num_bytes / sizeof(short); | 538 | unsigned int i, num_samples = num_bytes / sizeof(short); |
@@ -552,8 +552,8 @@ static void pci9118_ai_munge(struct comedi_device * dev, struct comedi_subdevice | |||
552 | /* | 552 | /* |
553 | ============================================================================== | 553 | ============================================================================== |
554 | */ | 554 | */ |
555 | static void interrupt_pci9118_ai_onesample(struct comedi_device * dev, | 555 | static void interrupt_pci9118_ai_onesample(struct comedi_device *dev, |
556 | struct comedi_subdevice * s, unsigned short int_adstat, unsigned int int_amcc, | 556 | struct comedi_subdevice *s, unsigned short int_adstat, unsigned int int_amcc, |
557 | unsigned short int_daq) | 557 | unsigned short int_daq) |
558 | { | 558 | { |
559 | register short sampl; | 559 | register short sampl; |
@@ -599,7 +599,7 @@ static void interrupt_pci9118_ai_onesample(struct comedi_device * dev, | |||
599 | /* | 599 | /* |
600 | ============================================================================== | 600 | ============================================================================== |
601 | */ | 601 | */ |
602 | static void interrupt_pci9118_ai_dma(struct comedi_device * dev, struct comedi_subdevice * s, | 602 | static void interrupt_pci9118_ai_dma(struct comedi_device *dev, struct comedi_subdevice *s, |
603 | unsigned short int_adstat, unsigned int int_amcc, | 603 | unsigned short int_adstat, unsigned int int_amcc, |
604 | unsigned short int_daq) | 604 | unsigned short int_daq) |
605 | { | 605 | { |
@@ -728,7 +728,7 @@ static irqreturn_t interrupt_pci9118(int irq, void *d) | |||
728 | /* | 728 | /* |
729 | ============================================================================== | 729 | ============================================================================== |
730 | */ | 730 | */ |
731 | static int pci9118_ai_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, | 731 | static int pci9118_ai_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, |
732 | unsigned int trignum) | 732 | unsigned int trignum) |
733 | { | 733 | { |
734 | if (trignum != devpriv->ai_inttrig_start) | 734 | if (trignum != devpriv->ai_inttrig_start) |
@@ -752,8 +752,8 @@ static int pci9118_ai_inttrig(struct comedi_device * dev, struct comedi_subdevic | |||
752 | /* | 752 | /* |
753 | ============================================================================== | 753 | ============================================================================== |
754 | */ | 754 | */ |
755 | static int pci9118_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 755 | static int pci9118_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
756 | struct comedi_cmd * cmd) | 756 | struct comedi_cmd *cmd) |
757 | { | 757 | { |
758 | int err = 0; | 758 | int err = 0; |
759 | int tmp, divisor1, divisor2; | 759 | int tmp, divisor1, divisor2; |
@@ -1010,7 +1010,7 @@ static int pci9118_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevic | |||
1010 | /* | 1010 | /* |
1011 | ============================================================================== | 1011 | ============================================================================== |
1012 | */ | 1012 | */ |
1013 | static int Compute_and_setup_dma(struct comedi_device * dev) | 1013 | static int Compute_and_setup_dma(struct comedi_device *dev) |
1014 | { | 1014 | { |
1015 | unsigned int dmalen0, dmalen1, i; | 1015 | unsigned int dmalen0, dmalen1, i; |
1016 | 1016 | ||
@@ -1164,7 +1164,7 @@ static int Compute_and_setup_dma(struct comedi_device * dev) | |||
1164 | /* | 1164 | /* |
1165 | ============================================================================== | 1165 | ============================================================================== |
1166 | */ | 1166 | */ |
1167 | static int pci9118_ai_docmd_sampl(struct comedi_device * dev, struct comedi_subdevice * s) | 1167 | static int pci9118_ai_docmd_sampl(struct comedi_device *dev, struct comedi_subdevice *s) |
1168 | { | 1168 | { |
1169 | DPRINTK("adl_pci9118 EDBG: BGN: pci9118_ai_docmd_sampl(%d,) [%d]\n", | 1169 | DPRINTK("adl_pci9118 EDBG: BGN: pci9118_ai_docmd_sampl(%d,) [%d]\n", |
1170 | dev->minor, devpriv->ai_do); | 1170 | dev->minor, devpriv->ai_do); |
@@ -1217,7 +1217,7 @@ static int pci9118_ai_docmd_sampl(struct comedi_device * dev, struct comedi_subd | |||
1217 | /* | 1217 | /* |
1218 | ============================================================================== | 1218 | ============================================================================== |
1219 | */ | 1219 | */ |
1220 | static int pci9118_ai_docmd_dma(struct comedi_device * dev, struct comedi_subdevice * s) | 1220 | static int pci9118_ai_docmd_dma(struct comedi_device *dev, struct comedi_subdevice *s) |
1221 | { | 1221 | { |
1222 | DPRINTK("adl_pci9118 EDBG: BGN: pci9118_ai_docmd_dma(%d,) [%d,%d]\n", | 1222 | DPRINTK("adl_pci9118 EDBG: BGN: pci9118_ai_docmd_dma(%d,) [%d,%d]\n", |
1223 | dev->minor, devpriv->ai_do, devpriv->usedma); | 1223 | dev->minor, devpriv->ai_do, devpriv->usedma); |
@@ -1288,7 +1288,7 @@ static int pci9118_ai_docmd_dma(struct comedi_device * dev, struct comedi_subdev | |||
1288 | /* | 1288 | /* |
1289 | ============================================================================== | 1289 | ============================================================================== |
1290 | */ | 1290 | */ |
1291 | static int pci9118_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 1291 | static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
1292 | { | 1292 | { |
1293 | struct comedi_cmd *cmd = &s->async->cmd; | 1293 | struct comedi_cmd *cmd = &s->async->cmd; |
1294 | unsigned int addchans = 0; | 1294 | unsigned int addchans = 0; |
@@ -1487,7 +1487,7 @@ static int pci9118_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * | |||
1487 | /* | 1487 | /* |
1488 | ============================================================================== | 1488 | ============================================================================== |
1489 | */ | 1489 | */ |
1490 | static int check_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, | 1490 | static int check_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, |
1491 | int n_chan, unsigned int *chanlist, int frontadd, int backadd) | 1491 | int n_chan, unsigned int *chanlist, int frontadd, int backadd) |
1492 | { | 1492 | { |
1493 | unsigned int i, differencial = 0, bipolar = 0; | 1493 | unsigned int i, differencial = 0, bipolar = 0; |
@@ -1538,7 +1538,7 @@ static int check_channel_list(struct comedi_device * dev, struct comedi_subdevic | |||
1538 | /* | 1538 | /* |
1539 | ============================================================================== | 1539 | ============================================================================== |
1540 | */ | 1540 | */ |
1541 | static int setup_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, | 1541 | static int setup_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, |
1542 | int n_chan, unsigned int *chanlist, int rot, int frontadd, int backadd, | 1542 | int n_chan, unsigned int *chanlist, int rot, int frontadd, int backadd, |
1543 | int usedma, char useeos) | 1543 | int usedma, char useeos) |
1544 | { | 1544 | { |
@@ -1652,8 +1652,8 @@ static int setup_channel_list(struct comedi_device * dev, struct comedi_subdevic | |||
1652 | ============================================================================== | 1652 | ============================================================================== |
1653 | calculate 8254 divisors if they are used for dual timing | 1653 | calculate 8254 divisors if they are used for dual timing |
1654 | */ | 1654 | */ |
1655 | static void pci9118_calc_divisors(char mode, struct comedi_device * dev, | 1655 | static void pci9118_calc_divisors(char mode, struct comedi_device *dev, |
1656 | struct comedi_subdevice * s, unsigned int *tim1, unsigned int *tim2, | 1656 | struct comedi_subdevice *s, unsigned int *tim1, unsigned int *tim2, |
1657 | unsigned int flags, int chans, unsigned int *div1, unsigned int *div2, | 1657 | unsigned int flags, int chans, unsigned int *div1, unsigned int *div2, |
1658 | char usessh, unsigned int chnsshfront) | 1658 | char usessh, unsigned int chnsshfront) |
1659 | { | 1659 | { |
@@ -1711,7 +1711,7 @@ static void pci9118_calc_divisors(char mode, struct comedi_device * dev, | |||
1711 | /* | 1711 | /* |
1712 | ============================================================================== | 1712 | ============================================================================== |
1713 | */ | 1713 | */ |
1714 | static void start_pacer(struct comedi_device * dev, int mode, unsigned int divisor1, | 1714 | static void start_pacer(struct comedi_device *dev, int mode, unsigned int divisor1, |
1715 | unsigned int divisor2) | 1715 | unsigned int divisor2) |
1716 | { | 1716 | { |
1717 | outl(0x74, dev->iobase + PCI9118_CNTCTRL); | 1717 | outl(0x74, dev->iobase + PCI9118_CNTCTRL); |
@@ -1730,7 +1730,7 @@ static void start_pacer(struct comedi_device * dev, int mode, unsigned int divis | |||
1730 | /* | 1730 | /* |
1731 | ============================================================================== | 1731 | ============================================================================== |
1732 | */ | 1732 | */ |
1733 | static int pci9118_exttrg_add(struct comedi_device * dev, unsigned char source) | 1733 | static int pci9118_exttrg_add(struct comedi_device *dev, unsigned char source) |
1734 | { | 1734 | { |
1735 | if (source > 3) | 1735 | if (source > 3) |
1736 | return -1; /* incorrect source */ | 1736 | return -1; /* incorrect source */ |
@@ -1744,7 +1744,7 @@ static int pci9118_exttrg_add(struct comedi_device * dev, unsigned char source) | |||
1744 | /* | 1744 | /* |
1745 | ============================================================================== | 1745 | ============================================================================== |
1746 | */ | 1746 | */ |
1747 | static int pci9118_exttrg_del(struct comedi_device * dev, unsigned char source) | 1747 | static int pci9118_exttrg_del(struct comedi_device *dev, unsigned char source) |
1748 | { | 1748 | { |
1749 | if (source > 3) | 1749 | if (source > 3) |
1750 | return -1; /* incorrect source */ | 1750 | return -1; /* incorrect source */ |
@@ -1761,7 +1761,7 @@ static int pci9118_exttrg_del(struct comedi_device * dev, unsigned char source) | |||
1761 | /* | 1761 | /* |
1762 | ============================================================================== | 1762 | ============================================================================== |
1763 | */ | 1763 | */ |
1764 | static int pci9118_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 1764 | static int pci9118_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
1765 | { | 1765 | { |
1766 | if (devpriv->usedma) | 1766 | if (devpriv->usedma) |
1767 | outl(inl(devpriv->iobase_a + AMCC_OP_REG_MCSR) & (~EN_A2P_TRANSFERS), devpriv->iobase_a + AMCC_OP_REG_MCSR); /* stop DMA */ | 1767 | outl(inl(devpriv->iobase_a + AMCC_OP_REG_MCSR) & (~EN_A2P_TRANSFERS), devpriv->iobase_a + AMCC_OP_REG_MCSR); /* stop DMA */ |
@@ -1796,7 +1796,7 @@ static int pci9118_ai_cancel(struct comedi_device * dev, struct comedi_subdevice | |||
1796 | /* | 1796 | /* |
1797 | ============================================================================== | 1797 | ============================================================================== |
1798 | */ | 1798 | */ |
1799 | static int pci9118_reset(struct comedi_device * dev) | 1799 | static int pci9118_reset(struct comedi_device *dev) |
1800 | { | 1800 | { |
1801 | devpriv->IntControlReg = 0; | 1801 | devpriv->IntControlReg = 0; |
1802 | devpriv->exttrg_users = 0; | 1802 | devpriv->exttrg_users = 0; |
@@ -1836,7 +1836,7 @@ static int pci9118_reset(struct comedi_device * dev) | |||
1836 | /* | 1836 | /* |
1837 | ============================================================================== | 1837 | ============================================================================== |
1838 | */ | 1838 | */ |
1839 | static int pci9118_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 1839 | static int pci9118_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
1840 | { | 1840 | { |
1841 | struct comedi_subdevice *s; | 1841 | struct comedi_subdevice *s; |
1842 | int ret, pages, i; | 1842 | int ret, pages, i; |
@@ -2072,7 +2072,7 @@ static int pci9118_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
2072 | /* | 2072 | /* |
2073 | ============================================================================== | 2073 | ============================================================================== |
2074 | */ | 2074 | */ |
2075 | static int pci9118_detach(struct comedi_device * dev) | 2075 | static int pci9118_detach(struct comedi_device *dev) |
2076 | { | 2076 | { |
2077 | if (dev->private) { | 2077 | if (dev->private) { |
2078 | if (devpriv->valid) | 2078 | if (devpriv->valid) |
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c index b8b5001c5d2..2df5ab0eaee 100644 --- a/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/drivers/staging/comedi/drivers/adv_pci1710.c | |||
@@ -184,8 +184,8 @@ static const struct comedi_lrange range_pci171x_da = { 2, { | |||
184 | } | 184 | } |
185 | }; | 185 | }; |
186 | 186 | ||
187 | static int pci1710_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 187 | static int pci1710_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
188 | static int pci1710_detach(struct comedi_device * dev); | 188 | static int pci1710_detach(struct comedi_device *dev); |
189 | 189 | ||
190 | struct boardtype { | 190 | struct boardtype { |
191 | const char *name; /* board name */ | 191 | const char *name; /* board name */ |
@@ -306,14 +306,14 @@ struct pci1710_private { | |||
306 | ============================================================================== | 306 | ============================================================================== |
307 | */ | 307 | */ |
308 | 308 | ||
309 | static int check_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, | 309 | static int check_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, |
310 | unsigned int *chanlist, unsigned int n_chan); | 310 | unsigned int *chanlist, unsigned int n_chan); |
311 | static void setup_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, | 311 | static void setup_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, |
312 | unsigned int *chanlist, unsigned int n_chan, unsigned int seglen); | 312 | unsigned int *chanlist, unsigned int n_chan, unsigned int seglen); |
313 | static void start_pacer(struct comedi_device * dev, int mode, unsigned int divisor1, | 313 | static void start_pacer(struct comedi_device *dev, int mode, unsigned int divisor1, |
314 | unsigned int divisor2); | 314 | unsigned int divisor2); |
315 | static int pci1710_reset(struct comedi_device * dev); | 315 | static int pci1710_reset(struct comedi_device *dev); |
316 | static int pci171x_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 316 | static int pci171x_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s); |
317 | 317 | ||
318 | static const unsigned int muxonechan[] = { 0x0000, 0x0101, 0x0202, 0x0303, 0x0404, 0x0505, 0x0606, 0x0707, /* used for gain list programming */ | 318 | static const unsigned int muxonechan[] = { 0x0000, 0x0101, 0x0202, 0x0303, 0x0404, 0x0505, 0x0606, 0x0707, /* used for gain list programming */ |
319 | 0x0808, 0x0909, 0x0a0a, 0x0b0b, 0x0c0c, 0x0d0d, 0x0e0e, 0x0f0f, | 319 | 0x0808, 0x0909, 0x0a0a, 0x0b0b, 0x0c0c, 0x0d0d, 0x0e0e, 0x0f0f, |
@@ -324,8 +324,8 @@ static const unsigned int muxonechan[] = { 0x0000, 0x0101, 0x0202, 0x0303, 0x040 | |||
324 | /* | 324 | /* |
325 | ============================================================================== | 325 | ============================================================================== |
326 | */ | 326 | */ |
327 | static int pci171x_insn_read_ai(struct comedi_device * dev, struct comedi_subdevice * s, | 327 | static int pci171x_insn_read_ai(struct comedi_device *dev, struct comedi_subdevice *s, |
328 | struct comedi_insn * insn, unsigned int * data) | 328 | struct comedi_insn *insn, unsigned int *data) |
329 | { | 329 | { |
330 | int n, timeout; | 330 | int n, timeout; |
331 | #ifdef PCI171x_PARANOIDCHECK | 331 | #ifdef PCI171x_PARANOIDCHECK |
@@ -392,8 +392,8 @@ static int pci171x_insn_read_ai(struct comedi_device * dev, struct comedi_subdev | |||
392 | /* | 392 | /* |
393 | ============================================================================== | 393 | ============================================================================== |
394 | */ | 394 | */ |
395 | static int pci171x_insn_write_ao(struct comedi_device * dev, struct comedi_subdevice * s, | 395 | static int pci171x_insn_write_ao(struct comedi_device *dev, struct comedi_subdevice *s, |
396 | struct comedi_insn * insn, unsigned int * data) | 396 | struct comedi_insn *insn, unsigned int *data) |
397 | { | 397 | { |
398 | int n, chan, range, ofs; | 398 | int n, chan, range, ofs; |
399 | 399 | ||
@@ -423,8 +423,8 @@ static int pci171x_insn_write_ao(struct comedi_device * dev, struct comedi_subde | |||
423 | /* | 423 | /* |
424 | ============================================================================== | 424 | ============================================================================== |
425 | */ | 425 | */ |
426 | static int pci171x_insn_read_ao(struct comedi_device * dev, struct comedi_subdevice * s, | 426 | static int pci171x_insn_read_ao(struct comedi_device *dev, struct comedi_subdevice *s, |
427 | struct comedi_insn * insn, unsigned int * data) | 427 | struct comedi_insn *insn, unsigned int *data) |
428 | { | 428 | { |
429 | int n, chan; | 429 | int n, chan; |
430 | 430 | ||
@@ -438,8 +438,8 @@ static int pci171x_insn_read_ao(struct comedi_device * dev, struct comedi_subdev | |||
438 | /* | 438 | /* |
439 | ============================================================================== | 439 | ============================================================================== |
440 | */ | 440 | */ |
441 | static int pci171x_insn_bits_di(struct comedi_device * dev, struct comedi_subdevice * s, | 441 | static int pci171x_insn_bits_di(struct comedi_device *dev, struct comedi_subdevice *s, |
442 | struct comedi_insn * insn, unsigned int * data) | 442 | struct comedi_insn *insn, unsigned int *data) |
443 | { | 443 | { |
444 | data[1] = inw(dev->iobase + PCI171x_DI); | 444 | data[1] = inw(dev->iobase + PCI171x_DI); |
445 | 445 | ||
@@ -449,8 +449,8 @@ static int pci171x_insn_bits_di(struct comedi_device * dev, struct comedi_subdev | |||
449 | /* | 449 | /* |
450 | ============================================================================== | 450 | ============================================================================== |
451 | */ | 451 | */ |
452 | static int pci171x_insn_bits_do(struct comedi_device * dev, struct comedi_subdevice * s, | 452 | static int pci171x_insn_bits_do(struct comedi_device *dev, struct comedi_subdevice *s, |
453 | struct comedi_insn * insn, unsigned int * data) | 453 | struct comedi_insn *insn, unsigned int *data) |
454 | { | 454 | { |
455 | if (data[0]) { | 455 | if (data[0]) { |
456 | s->state &= ~data[0]; | 456 | s->state &= ~data[0]; |
@@ -465,8 +465,8 @@ static int pci171x_insn_bits_do(struct comedi_device * dev, struct comedi_subdev | |||
465 | /* | 465 | /* |
466 | ============================================================================== | 466 | ============================================================================== |
467 | */ | 467 | */ |
468 | static int pci171x_insn_counter_read(struct comedi_device * dev, struct comedi_subdevice * s, | 468 | static int pci171x_insn_counter_read(struct comedi_device *dev, struct comedi_subdevice *s, |
469 | struct comedi_insn * insn, unsigned int * data) | 469 | struct comedi_insn *insn, unsigned int *data) |
470 | { | 470 | { |
471 | unsigned int msb, lsb, ccntrl; | 471 | unsigned int msb, lsb, ccntrl; |
472 | int i; | 472 | int i; |
@@ -487,8 +487,8 @@ static int pci171x_insn_counter_read(struct comedi_device * dev, struct comedi_s | |||
487 | /* | 487 | /* |
488 | ============================================================================== | 488 | ============================================================================== |
489 | */ | 489 | */ |
490 | static int pci171x_insn_counter_write(struct comedi_device * dev, struct comedi_subdevice * s, | 490 | static int pci171x_insn_counter_write(struct comedi_device *dev, struct comedi_subdevice *s, |
491 | struct comedi_insn * insn, unsigned int * data) | 491 | struct comedi_insn *insn, unsigned int *data) |
492 | { | 492 | { |
493 | uint msb, lsb, ccntrl, status; | 493 | uint msb, lsb, ccntrl, status; |
494 | 494 | ||
@@ -514,8 +514,8 @@ static int pci171x_insn_counter_write(struct comedi_device * dev, struct comedi_ | |||
514 | /* | 514 | /* |
515 | ============================================================================== | 515 | ============================================================================== |
516 | */ | 516 | */ |
517 | static int pci171x_insn_counter_config(struct comedi_device * dev, | 517 | static int pci171x_insn_counter_config(struct comedi_device *dev, |
518 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 518 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
519 | { | 519 | { |
520 | #ifdef unused | 520 | #ifdef unused |
521 | /* This doesn't work like a normal Comedi counter config */ | 521 | /* This doesn't work like a normal Comedi counter config */ |
@@ -550,8 +550,8 @@ static int pci171x_insn_counter_config(struct comedi_device * dev, | |||
550 | /* | 550 | /* |
551 | ============================================================================== | 551 | ============================================================================== |
552 | */ | 552 | */ |
553 | static int pci1720_insn_write_ao(struct comedi_device * dev, struct comedi_subdevice * s, | 553 | static int pci1720_insn_write_ao(struct comedi_device *dev, struct comedi_subdevice *s, |
554 | struct comedi_insn * insn, unsigned int * data) | 554 | struct comedi_insn *insn, unsigned int *data) |
555 | { | 555 | { |
556 | int n, rangereg, chan; | 556 | int n, rangereg, chan; |
557 | 557 | ||
@@ -661,7 +661,7 @@ static void interrupt_pci1710_every_sample(void *d) | |||
661 | /* | 661 | /* |
662 | ============================================================================== | 662 | ============================================================================== |
663 | */ | 663 | */ |
664 | static int move_block_from_fifo(struct comedi_device * dev, struct comedi_subdevice * s, | 664 | static int move_block_from_fifo(struct comedi_device *dev, struct comedi_subdevice *s, |
665 | int n, int turn) | 665 | int n, int turn) |
666 | { | 666 | { |
667 | int i, j; | 667 | int i, j; |
@@ -803,8 +803,8 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d) | |||
803 | /* | 803 | /* |
804 | ============================================================================== | 804 | ============================================================================== |
805 | */ | 805 | */ |
806 | static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device * dev, | 806 | static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev, |
807 | struct comedi_subdevice * s) | 807 | struct comedi_subdevice *s) |
808 | { | 808 | { |
809 | unsigned int divisor1, divisor2; | 809 | unsigned int divisor1, divisor2; |
810 | unsigned int seglen; | 810 | unsigned int seglen; |
@@ -886,7 +886,7 @@ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device * dev, | |||
886 | /* | 886 | /* |
887 | ============================================================================== | 887 | ============================================================================== |
888 | */ | 888 | */ |
889 | static void pci171x_cmdtest_out(int e, struct comedi_cmd * cmd) | 889 | static void pci171x_cmdtest_out(int e, struct comedi_cmd *cmd) |
890 | { | 890 | { |
891 | rt_printk("adv_pci1710 e=%d startsrc=%x scansrc=%x convsrc=%x\n", e, | 891 | rt_printk("adv_pci1710 e=%d startsrc=%x scansrc=%x convsrc=%x\n", e, |
892 | cmd->start_src, cmd->scan_begin_src, cmd->convert_src); | 892 | cmd->start_src, cmd->scan_begin_src, cmd->convert_src); |
@@ -902,8 +902,8 @@ static void pci171x_cmdtest_out(int e, struct comedi_cmd * cmd) | |||
902 | /* | 902 | /* |
903 | ============================================================================== | 903 | ============================================================================== |
904 | */ | 904 | */ |
905 | static int pci171x_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 905 | static int pci171x_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
906 | struct comedi_cmd * cmd) | 906 | struct comedi_cmd *cmd) |
907 | { | 907 | { |
908 | int err = 0; | 908 | int err = 0; |
909 | int tmp, divisor1, divisor2; | 909 | int tmp, divisor1, divisor2; |
@@ -1067,7 +1067,7 @@ static int pci171x_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevic | |||
1067 | /* | 1067 | /* |
1068 | ============================================================================== | 1068 | ============================================================================== |
1069 | */ | 1069 | */ |
1070 | static int pci171x_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 1070 | static int pci171x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
1071 | { | 1071 | { |
1072 | struct comedi_cmd *cmd = &s->async->cmd; | 1072 | struct comedi_cmd *cmd = &s->async->cmd; |
1073 | 1073 | ||
@@ -1106,7 +1106,7 @@ static int pci171x_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * | |||
1106 | If it's ok, then program scan/gain logic. | 1106 | If it's ok, then program scan/gain logic. |
1107 | This works for all cards. | 1107 | This works for all cards. |
1108 | */ | 1108 | */ |
1109 | static int check_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, | 1109 | static int check_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, |
1110 | unsigned int *chanlist, unsigned int n_chan) | 1110 | unsigned int *chanlist, unsigned int n_chan) |
1111 | { | 1111 | { |
1112 | unsigned int chansegment[32]; | 1112 | unsigned int chansegment[32]; |
@@ -1165,7 +1165,7 @@ static int check_channel_list(struct comedi_device * dev, struct comedi_subdevic | |||
1165 | return seglen; | 1165 | return seglen; |
1166 | } | 1166 | } |
1167 | 1167 | ||
1168 | static void setup_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, | 1168 | static void setup_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, |
1169 | unsigned int *chanlist, unsigned int n_chan, unsigned int seglen) | 1169 | unsigned int *chanlist, unsigned int n_chan, unsigned int seglen) |
1170 | { | 1170 | { |
1171 | unsigned int i, range, chanprog; | 1171 | unsigned int i, range, chanprog; |
@@ -1202,7 +1202,7 @@ static void setup_channel_list(struct comedi_device * dev, struct comedi_subdevi | |||
1202 | /* | 1202 | /* |
1203 | ============================================================================== | 1203 | ============================================================================== |
1204 | */ | 1204 | */ |
1205 | static void start_pacer(struct comedi_device * dev, int mode, unsigned int divisor1, | 1205 | static void start_pacer(struct comedi_device *dev, int mode, unsigned int divisor1, |
1206 | unsigned int divisor2) | 1206 | unsigned int divisor2) |
1207 | { | 1207 | { |
1208 | DPRINTK("adv_pci1710 EDBG: BGN: start_pacer(%d,%u,%u)\n", mode, | 1208 | DPRINTK("adv_pci1710 EDBG: BGN: start_pacer(%d,%u,%u)\n", mode, |
@@ -1222,7 +1222,7 @@ static void start_pacer(struct comedi_device * dev, int mode, unsigned int divis | |||
1222 | /* | 1222 | /* |
1223 | ============================================================================== | 1223 | ============================================================================== |
1224 | */ | 1224 | */ |
1225 | static int pci171x_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 1225 | static int pci171x_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
1226 | { | 1226 | { |
1227 | DPRINTK("adv_pci1710 EDBG: BGN: pci171x_ai_cancel(...)\n"); | 1227 | DPRINTK("adv_pci1710 EDBG: BGN: pci171x_ai_cancel(...)\n"); |
1228 | 1228 | ||
@@ -1251,7 +1251,7 @@ static int pci171x_ai_cancel(struct comedi_device * dev, struct comedi_subdevice | |||
1251 | /* | 1251 | /* |
1252 | ============================================================================== | 1252 | ============================================================================== |
1253 | */ | 1253 | */ |
1254 | static int pci171x_reset(struct comedi_device * dev) | 1254 | static int pci171x_reset(struct comedi_device *dev) |
1255 | { | 1255 | { |
1256 | DPRINTK("adv_pci1710 EDBG: BGN: pci171x_reset(...)\n"); | 1256 | DPRINTK("adv_pci1710 EDBG: BGN: pci171x_reset(...)\n"); |
1257 | outw(0x30, dev->iobase + PCI171x_CNTCTRL); | 1257 | outw(0x30, dev->iobase + PCI171x_CNTCTRL); |
@@ -1281,7 +1281,7 @@ static int pci171x_reset(struct comedi_device * dev) | |||
1281 | /* | 1281 | /* |
1282 | ============================================================================== | 1282 | ============================================================================== |
1283 | */ | 1283 | */ |
1284 | static int pci1720_reset(struct comedi_device * dev) | 1284 | static int pci1720_reset(struct comedi_device *dev) |
1285 | { | 1285 | { |
1286 | DPRINTK("adv_pci1710 EDBG: BGN: pci1720_reset(...)\n"); | 1286 | DPRINTK("adv_pci1710 EDBG: BGN: pci1720_reset(...)\n"); |
1287 | outb(Syncont_SC0, dev->iobase + PCI1720_SYNCONT); /* set synchronous output mode */ | 1287 | outb(Syncont_SC0, dev->iobase + PCI1720_SYNCONT); /* set synchronous output mode */ |
@@ -1303,7 +1303,7 @@ static int pci1720_reset(struct comedi_device * dev) | |||
1303 | /* | 1303 | /* |
1304 | ============================================================================== | 1304 | ============================================================================== |
1305 | */ | 1305 | */ |
1306 | static int pci1710_reset(struct comedi_device * dev) | 1306 | static int pci1710_reset(struct comedi_device *dev) |
1307 | { | 1307 | { |
1308 | DPRINTK("adv_pci1710 EDBG: BGN: pci1710_reset(...)\n"); | 1308 | DPRINTK("adv_pci1710 EDBG: BGN: pci1710_reset(...)\n"); |
1309 | switch (this_board->cardtype) { | 1309 | switch (this_board->cardtype) { |
@@ -1318,7 +1318,7 @@ static int pci1710_reset(struct comedi_device * dev) | |||
1318 | /* | 1318 | /* |
1319 | ============================================================================== | 1319 | ============================================================================== |
1320 | */ | 1320 | */ |
1321 | static int pci1710_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 1321 | static int pci1710_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
1322 | { | 1322 | { |
1323 | struct comedi_subdevice *s; | 1323 | struct comedi_subdevice *s; |
1324 | int ret, subdev, n_subdevices; | 1324 | int ret, subdev, n_subdevices; |
@@ -1542,7 +1542,7 @@ static int pci1710_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
1542 | /* | 1542 | /* |
1543 | ============================================================================== | 1543 | ============================================================================== |
1544 | */ | 1544 | */ |
1545 | static int pci1710_detach(struct comedi_device * dev) | 1545 | static int pci1710_detach(struct comedi_device *dev) |
1546 | { | 1546 | { |
1547 | 1547 | ||
1548 | if (dev->private) { | 1548 | if (dev->private) { |
diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c index eb4bf1f47b3..e45ce552dd0 100644 --- a/drivers/staging/comedi/drivers/adv_pci1723.c +++ b/drivers/staging/comedi/drivers/adv_pci1723.c | |||
@@ -143,8 +143,8 @@ MODULE_DEVICE_TABLE(pci, pci1723_pci_table); | |||
143 | * the board, and also about the kernel module that contains | 143 | * the board, and also about the kernel module that contains |
144 | * the device code. | 144 | * the device code. |
145 | */ | 145 | */ |
146 | static int pci1723_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 146 | static int pci1723_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
147 | static int pci1723_detach(struct comedi_device * dev); | 147 | static int pci1723_detach(struct comedi_device *dev); |
148 | 148 | ||
149 | #define n_boardtypes (sizeof(boardtypes)/sizeof(struct pci1723_board)) | 149 | #define n_boardtypes (sizeof(boardtypes)/sizeof(struct pci1723_board)) |
150 | 150 | ||
@@ -175,7 +175,7 @@ struct pci1723_private { | |||
175 | /* | 175 | /* |
176 | * the pci1723 card reset; | 176 | * the pci1723 card reset; |
177 | */ | 177 | */ |
178 | static int pci1723_reset(struct comedi_device * dev) | 178 | static int pci1723_reset(struct comedi_device *dev) |
179 | { | 179 | { |
180 | int i; | 180 | int i; |
181 | DPRINTK("adv_pci1723 EDBG: BGN: pci1723_reset(...)\n"); | 181 | DPRINTK("adv_pci1723 EDBG: BGN: pci1723_reset(...)\n"); |
@@ -202,8 +202,8 @@ static int pci1723_reset(struct comedi_device * dev) | |||
202 | return 0; | 202 | return 0; |
203 | } | 203 | } |
204 | 204 | ||
205 | static int pci1723_insn_read_ao(struct comedi_device * dev, struct comedi_subdevice * s, | 205 | static int pci1723_insn_read_ao(struct comedi_device *dev, struct comedi_subdevice *s, |
206 | struct comedi_insn * insn, unsigned int * data) | 206 | struct comedi_insn *insn, unsigned int *data) |
207 | { | 207 | { |
208 | int n, chan; | 208 | int n, chan; |
209 | 209 | ||
@@ -218,8 +218,8 @@ static int pci1723_insn_read_ao(struct comedi_device * dev, struct comedi_subdev | |||
218 | /* | 218 | /* |
219 | analog data output; | 219 | analog data output; |
220 | */ | 220 | */ |
221 | static int pci1723_ao_write_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 221 | static int pci1723_ao_write_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
222 | struct comedi_insn * insn, unsigned int * data) | 222 | struct comedi_insn *insn, unsigned int *data) |
223 | { | 223 | { |
224 | int n, chan; | 224 | int n, chan; |
225 | chan = CR_CHAN(insn->chanspec); | 225 | chan = CR_CHAN(insn->chanspec); |
@@ -238,8 +238,8 @@ static int pci1723_ao_write_winsn(struct comedi_device * dev, struct comedi_subd | |||
238 | /* | 238 | /* |
239 | digital i/o config/query | 239 | digital i/o config/query |
240 | */ | 240 | */ |
241 | static int pci1723_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 241 | static int pci1723_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
242 | struct comedi_insn * insn, unsigned int * data) | 242 | struct comedi_insn *insn, unsigned int *data) |
243 | { | 243 | { |
244 | unsigned int mask; | 244 | unsigned int mask; |
245 | unsigned int bits; | 245 | unsigned int bits; |
@@ -278,8 +278,8 @@ static int pci1723_dio_insn_config(struct comedi_device * dev, struct comedi_sub | |||
278 | /* | 278 | /* |
279 | digital i/o bits read/write | 279 | digital i/o bits read/write |
280 | */ | 280 | */ |
281 | static int pci1723_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 281 | static int pci1723_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
282 | struct comedi_insn * insn, unsigned int * data) | 282 | struct comedi_insn *insn, unsigned int *data) |
283 | { | 283 | { |
284 | if (data[0]) { | 284 | if (data[0]) { |
285 | s->state &= ~data[0]; | 285 | s->state &= ~data[0]; |
@@ -294,7 +294,7 @@ static int pci1723_dio_insn_bits(struct comedi_device * dev, struct comedi_subde | |||
294 | * Attach is called by the Comedi core to configure the driver | 294 | * Attach is called by the Comedi core to configure the driver |
295 | * for a pci1723 board. | 295 | * for a pci1723 board. |
296 | */ | 296 | */ |
297 | static int pci1723_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 297 | static int pci1723_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
298 | { | 298 | { |
299 | struct comedi_subdevice *s; | 299 | struct comedi_subdevice *s; |
300 | int ret, subdev, n_subdevices; | 300 | int ret, subdev, n_subdevices; |
@@ -439,7 +439,7 @@ static int pci1723_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
439 | * allocated by _attach(). dev->private and dev->subdevices are | 439 | * allocated by _attach(). dev->private and dev->subdevices are |
440 | * deallocated automatically by the core. | 440 | * deallocated automatically by the core. |
441 | */ | 441 | */ |
442 | static int pci1723_detach(struct comedi_device * dev) | 442 | static int pci1723_detach(struct comedi_device *dev) |
443 | { | 443 | { |
444 | printk("comedi%d: pci1723: remove\n", dev->minor); | 444 | printk("comedi%d: pci1723: remove\n", dev->minor); |
445 | 445 | ||
diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c index 2604425c3a0..21fd9aa8dec 100644 --- a/drivers/staging/comedi/drivers/adv_pci_dio.c +++ b/drivers/staging/comedi/drivers/adv_pci_dio.c | |||
@@ -183,8 +183,8 @@ enum hw_io_access { | |||
183 | 183 | ||
184 | #define OMBCMD_RETRY 0x03 /* 3 times try request before error */ | 184 | #define OMBCMD_RETRY 0x03 /* 3 times try request before error */ |
185 | 185 | ||
186 | static int pci_dio_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 186 | static int pci_dio_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
187 | static int pci_dio_detach(struct comedi_device * dev); | 187 | static int pci_dio_detach(struct comedi_device *dev); |
188 | 188 | ||
189 | struct diosubd_data { | 189 | struct diosubd_data { |
190 | int chans; /* num of chans */ | 190 | int chans; /* num of chans */ |
@@ -357,8 +357,8 @@ static struct pci_dio_private *pci_priv = NULL; /* list of allocated cards */ | |||
357 | /* | 357 | /* |
358 | ============================================================================== | 358 | ============================================================================== |
359 | */ | 359 | */ |
360 | static int pci_dio_insn_bits_di_b(struct comedi_device * dev, struct comedi_subdevice * s, | 360 | static int pci_dio_insn_bits_di_b(struct comedi_device *dev, struct comedi_subdevice *s, |
361 | struct comedi_insn * insn, unsigned int * data) | 361 | struct comedi_insn *insn, unsigned int *data) |
362 | { | 362 | { |
363 | const struct diosubd_data *d = (const struct diosubd_data *)s->private; | 363 | const struct diosubd_data *d = (const struct diosubd_data *)s->private; |
364 | int i; | 364 | int i; |
@@ -374,8 +374,8 @@ static int pci_dio_insn_bits_di_b(struct comedi_device * dev, struct comedi_subd | |||
374 | /* | 374 | /* |
375 | ============================================================================== | 375 | ============================================================================== |
376 | */ | 376 | */ |
377 | static int pci_dio_insn_bits_di_w(struct comedi_device * dev, struct comedi_subdevice * s, | 377 | static int pci_dio_insn_bits_di_w(struct comedi_device *dev, struct comedi_subdevice *s, |
378 | struct comedi_insn * insn, unsigned int * data) | 378 | struct comedi_insn *insn, unsigned int *data) |
379 | { | 379 | { |
380 | const struct diosubd_data *d = (const struct diosubd_data *)s->private; | 380 | const struct diosubd_data *d = (const struct diosubd_data *)s->private; |
381 | int i; | 381 | int i; |
@@ -390,8 +390,8 @@ static int pci_dio_insn_bits_di_w(struct comedi_device * dev, struct comedi_subd | |||
390 | /* | 390 | /* |
391 | ============================================================================== | 391 | ============================================================================== |
392 | */ | 392 | */ |
393 | static int pci_dio_insn_bits_do_b(struct comedi_device * dev, struct comedi_subdevice * s, | 393 | static int pci_dio_insn_bits_do_b(struct comedi_device *dev, struct comedi_subdevice *s, |
394 | struct comedi_insn * insn, unsigned int * data) | 394 | struct comedi_insn *insn, unsigned int *data) |
395 | { | 395 | { |
396 | const struct diosubd_data *d = (const struct diosubd_data *)s->private; | 396 | const struct diosubd_data *d = (const struct diosubd_data *)s->private; |
397 | int i; | 397 | int i; |
@@ -411,8 +411,8 @@ static int pci_dio_insn_bits_do_b(struct comedi_device * dev, struct comedi_subd | |||
411 | /* | 411 | /* |
412 | ============================================================================== | 412 | ============================================================================== |
413 | */ | 413 | */ |
414 | static int pci_dio_insn_bits_do_w(struct comedi_device * dev, struct comedi_subdevice * s, | 414 | static int pci_dio_insn_bits_do_w(struct comedi_device *dev, struct comedi_subdevice *s, |
415 | struct comedi_insn * insn, unsigned int * data) | 415 | struct comedi_insn *insn, unsigned int *data) |
416 | { | 416 | { |
417 | const struct diosubd_data *d = (const struct diosubd_data *)s->private; | 417 | const struct diosubd_data *d = (const struct diosubd_data *)s->private; |
418 | int i; | 418 | int i; |
@@ -432,7 +432,7 @@ static int pci_dio_insn_bits_do_w(struct comedi_device * dev, struct comedi_subd | |||
432 | /* | 432 | /* |
433 | ============================================================================== | 433 | ============================================================================== |
434 | */ | 434 | */ |
435 | static int pci1760_unchecked_mbxrequest(struct comedi_device * dev, | 435 | static int pci1760_unchecked_mbxrequest(struct comedi_device *dev, |
436 | unsigned char *omb, unsigned char *imb, int repeats) | 436 | unsigned char *omb, unsigned char *imb, int repeats) |
437 | { | 437 | { |
438 | int cnt, tout, ok = 0; | 438 | int cnt, tout, ok = 0; |
@@ -460,7 +460,7 @@ static int pci1760_unchecked_mbxrequest(struct comedi_device * dev, | |||
460 | return -ETIME; | 460 | return -ETIME; |
461 | } | 461 | } |
462 | 462 | ||
463 | static int pci1760_clear_imb2(struct comedi_device * dev) | 463 | static int pci1760_clear_imb2(struct comedi_device *dev) |
464 | { | 464 | { |
465 | unsigned char omb[4] = { 0x0, 0x0, CMD_ClearIMB2, 0x0 }; | 465 | unsigned char omb[4] = { 0x0, 0x0, CMD_ClearIMB2, 0x0 }; |
466 | unsigned char imb[4]; | 466 | unsigned char imb[4]; |
@@ -470,7 +470,7 @@ static int pci1760_clear_imb2(struct comedi_device * dev) | |||
470 | return pci1760_unchecked_mbxrequest(dev, omb, imb, OMBCMD_RETRY); | 470 | return pci1760_unchecked_mbxrequest(dev, omb, imb, OMBCMD_RETRY); |
471 | } | 471 | } |
472 | 472 | ||
473 | static int pci1760_mbxrequest(struct comedi_device * dev, | 473 | static int pci1760_mbxrequest(struct comedi_device *dev, |
474 | unsigned char *omb, unsigned char *imb) | 474 | unsigned char *omb, unsigned char *imb) |
475 | { | 475 | { |
476 | if (omb[2] == CMD_ClearIMB2) { | 476 | if (omb[2] == CMD_ClearIMB2) { |
@@ -490,8 +490,8 @@ static int pci1760_mbxrequest(struct comedi_device * dev, | |||
490 | /* | 490 | /* |
491 | ============================================================================== | 491 | ============================================================================== |
492 | */ | 492 | */ |
493 | static int pci1760_insn_bits_di(struct comedi_device * dev, struct comedi_subdevice * s, | 493 | static int pci1760_insn_bits_di(struct comedi_device *dev, struct comedi_subdevice *s, |
494 | struct comedi_insn * insn, unsigned int * data) | 494 | struct comedi_insn *insn, unsigned int *data) |
495 | { | 495 | { |
496 | data[1] = inb(dev->iobase + IMB3); | 496 | data[1] = inb(dev->iobase + IMB3); |
497 | 497 | ||
@@ -501,8 +501,8 @@ static int pci1760_insn_bits_di(struct comedi_device * dev, struct comedi_subdev | |||
501 | /* | 501 | /* |
502 | ============================================================================== | 502 | ============================================================================== |
503 | */ | 503 | */ |
504 | static int pci1760_insn_bits_do(struct comedi_device * dev, struct comedi_subdevice * s, | 504 | static int pci1760_insn_bits_do(struct comedi_device *dev, struct comedi_subdevice *s, |
505 | struct comedi_insn * insn, unsigned int * data) | 505 | struct comedi_insn *insn, unsigned int *data) |
506 | { | 506 | { |
507 | int ret; | 507 | int ret; |
508 | unsigned char omb[4] = { | 508 | unsigned char omb[4] = { |
@@ -528,8 +528,8 @@ static int pci1760_insn_bits_do(struct comedi_device * dev, struct comedi_subdev | |||
528 | /* | 528 | /* |
529 | ============================================================================== | 529 | ============================================================================== |
530 | */ | 530 | */ |
531 | static int pci1760_insn_cnt_read(struct comedi_device * dev, struct comedi_subdevice * s, | 531 | static int pci1760_insn_cnt_read(struct comedi_device *dev, struct comedi_subdevice *s, |
532 | struct comedi_insn * insn, unsigned int * data) | 532 | struct comedi_insn *insn, unsigned int *data) |
533 | { | 533 | { |
534 | int ret, n; | 534 | int ret, n; |
535 | unsigned char omb[4] = { | 535 | unsigned char omb[4] = { |
@@ -552,8 +552,8 @@ static int pci1760_insn_cnt_read(struct comedi_device * dev, struct comedi_subde | |||
552 | /* | 552 | /* |
553 | ============================================================================== | 553 | ============================================================================== |
554 | */ | 554 | */ |
555 | static int pci1760_insn_cnt_write(struct comedi_device * dev, struct comedi_subdevice * s, | 555 | static int pci1760_insn_cnt_write(struct comedi_device *dev, struct comedi_subdevice *s, |
556 | struct comedi_insn * insn, unsigned int * data) | 556 | struct comedi_insn *insn, unsigned int *data) |
557 | { | 557 | { |
558 | int ret; | 558 | int ret; |
559 | unsigned char chan = CR_CHAN(insn->chanspec) & 0x07; | 559 | unsigned char chan = CR_CHAN(insn->chanspec) & 0x07; |
@@ -590,7 +590,7 @@ static int pci1760_insn_cnt_write(struct comedi_device * dev, struct comedi_subd | |||
590 | /* | 590 | /* |
591 | ============================================================================== | 591 | ============================================================================== |
592 | */ | 592 | */ |
593 | static int pci1760_reset(struct comedi_device * dev) | 593 | static int pci1760_reset(struct comedi_device *dev) |
594 | { | 594 | { |
595 | int i; | 595 | int i; |
596 | unsigned char omb[4] = { 0x00, 0x00, 0x00, 0x00 }; | 596 | unsigned char omb[4] = { 0x00, 0x00, 0x00, 0x00 }; |
@@ -667,7 +667,7 @@ static int pci1760_reset(struct comedi_device * dev) | |||
667 | /* | 667 | /* |
668 | ============================================================================== | 668 | ============================================================================== |
669 | */ | 669 | */ |
670 | static int pci_dio_reset(struct comedi_device * dev) | 670 | static int pci_dio_reset(struct comedi_device *dev) |
671 | { | 671 | { |
672 | DPRINTK("adv_pci_dio EDBG: BGN: pci171x_reset(...)\n"); | 672 | DPRINTK("adv_pci_dio EDBG: BGN: pci171x_reset(...)\n"); |
673 | 673 | ||
@@ -750,7 +750,7 @@ static int pci_dio_reset(struct comedi_device * dev) | |||
750 | /* | 750 | /* |
751 | ============================================================================== | 751 | ============================================================================== |
752 | */ | 752 | */ |
753 | static int pci1760_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 753 | static int pci1760_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
754 | { | 754 | { |
755 | struct comedi_subdevice *s; | 755 | struct comedi_subdevice *s; |
756 | int subdev = 0; | 756 | int subdev = 0; |
@@ -802,8 +802,8 @@ static int pci1760_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
802 | /* | 802 | /* |
803 | ============================================================================== | 803 | ============================================================================== |
804 | */ | 804 | */ |
805 | static int pci_dio_add_di(struct comedi_device * dev, struct comedi_subdevice * s, | 805 | static int pci_dio_add_di(struct comedi_device *dev, struct comedi_subdevice *s, |
806 | const struct diosubd_data * d, int subdev) | 806 | const struct diosubd_data *d, int subdev) |
807 | { | 807 | { |
808 | s->type = COMEDI_SUBD_DI; | 808 | s->type = COMEDI_SUBD_DI; |
809 | s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON | d->specflags; | 809 | s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON | d->specflags; |
@@ -829,8 +829,8 @@ static int pci_dio_add_di(struct comedi_device * dev, struct comedi_subdevice * | |||
829 | /* | 829 | /* |
830 | ============================================================================== | 830 | ============================================================================== |
831 | */ | 831 | */ |
832 | static int pci_dio_add_do(struct comedi_device * dev, struct comedi_subdevice * s, | 832 | static int pci_dio_add_do(struct comedi_device *dev, struct comedi_subdevice *s, |
833 | const struct diosubd_data * d, int subdev) | 833 | const struct diosubd_data *d, int subdev) |
834 | { | 834 | { |
835 | s->type = COMEDI_SUBD_DO; | 835 | s->type = COMEDI_SUBD_DO; |
836 | s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON; | 836 | s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON; |
@@ -857,7 +857,7 @@ static int pci_dio_add_do(struct comedi_device * dev, struct comedi_subdevice * | |||
857 | /* | 857 | /* |
858 | ============================================================================== | 858 | ============================================================================== |
859 | */ | 859 | */ |
860 | static int CheckAndAllocCard(struct comedi_device * dev, struct comedi_devconfig * it, | 860 | static int CheckAndAllocCard(struct comedi_device *dev, struct comedi_devconfig *it, |
861 | struct pci_dev *pcidev) | 861 | struct pci_dev *pcidev) |
862 | { | 862 | { |
863 | struct pci_dio_private *pr, *prev; | 863 | struct pci_dio_private *pr, *prev; |
@@ -883,7 +883,7 @@ static int CheckAndAllocCard(struct comedi_device * dev, struct comedi_devconfig | |||
883 | /* | 883 | /* |
884 | ============================================================================== | 884 | ============================================================================== |
885 | */ | 885 | */ |
886 | static int pci_dio_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 886 | static int pci_dio_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
887 | { | 887 | { |
888 | struct comedi_subdevice *s; | 888 | struct comedi_subdevice *s; |
889 | int ret, subdev, n_subdevices, i, j; | 889 | int ret, subdev, n_subdevices, i, j; |
@@ -1011,7 +1011,7 @@ static int pci_dio_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
1011 | /* | 1011 | /* |
1012 | ============================================================================== | 1012 | ============================================================================== |
1013 | */ | 1013 | */ |
1014 | static int pci_dio_detach(struct comedi_device * dev) | 1014 | static int pci_dio_detach(struct comedi_device *dev) |
1015 | { | 1015 | { |
1016 | int i, j; | 1016 | int i, j; |
1017 | struct comedi_subdevice *s; | 1017 | struct comedi_subdevice *s; |
diff --git a/drivers/staging/comedi/drivers/aio_aio12_8.c b/drivers/staging/comedi/drivers/aio_aio12_8.c index b21c23b8ba5..ce4e8e49ae8 100644 --- a/drivers/staging/comedi/drivers/aio_aio12_8.c +++ b/drivers/staging/comedi/drivers/aio_aio12_8.c | |||
@@ -88,8 +88,8 @@ struct aio12_8_private { | |||
88 | 88 | ||
89 | #define devpriv ((struct aio12_8_private *) dev->private) | 89 | #define devpriv ((struct aio12_8_private *) dev->private) |
90 | 90 | ||
91 | static int aio_aio12_8_ai_read(struct comedi_device * dev, struct comedi_subdevice * s, | 91 | static int aio_aio12_8_ai_read(struct comedi_device *dev, struct comedi_subdevice *s, |
92 | struct comedi_insn * insn, unsigned int * data) | 92 | struct comedi_insn *insn, unsigned int *data) |
93 | { | 93 | { |
94 | int n; | 94 | int n; |
95 | unsigned char control = | 95 | unsigned char control = |
@@ -122,8 +122,8 @@ static int aio_aio12_8_ai_read(struct comedi_device * dev, struct comedi_subdevi | |||
122 | return n; | 122 | return n; |
123 | } | 123 | } |
124 | 124 | ||
125 | static int aio_aio12_8_ao_read(struct comedi_device * dev, struct comedi_subdevice * s, | 125 | static int aio_aio12_8_ao_read(struct comedi_device *dev, struct comedi_subdevice *s, |
126 | struct comedi_insn * insn, unsigned int * data) | 126 | struct comedi_insn *insn, unsigned int *data) |
127 | { | 127 | { |
128 | int i; | 128 | int i; |
129 | int val = devpriv->ao_readback[CR_CHAN(insn->chanspec)]; | 129 | int val = devpriv->ao_readback[CR_CHAN(insn->chanspec)]; |
@@ -133,8 +133,8 @@ static int aio_aio12_8_ao_read(struct comedi_device * dev, struct comedi_subdevi | |||
133 | return insn->n; | 133 | return insn->n; |
134 | } | 134 | } |
135 | 135 | ||
136 | static int aio_aio12_8_ao_write(struct comedi_device * dev, struct comedi_subdevice * s, | 136 | static int aio_aio12_8_ao_write(struct comedi_device *dev, struct comedi_subdevice *s, |
137 | struct comedi_insn * insn, unsigned int * data) | 137 | struct comedi_insn *insn, unsigned int *data) |
138 | { | 138 | { |
139 | int i; | 139 | int i; |
140 | int chan = CR_CHAN(insn->chanspec); | 140 | int chan = CR_CHAN(insn->chanspec); |
@@ -161,7 +161,7 @@ static const struct comedi_lrange range_aio_aio12_8 = { | |||
161 | } | 161 | } |
162 | }; | 162 | }; |
163 | 163 | ||
164 | static int aio_aio12_8_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 164 | static int aio_aio12_8_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
165 | { | 165 | { |
166 | int iobase; | 166 | int iobase; |
167 | struct comedi_subdevice *s; | 167 | struct comedi_subdevice *s; |
@@ -205,7 +205,7 @@ static int aio_aio12_8_attach(struct comedi_device * dev, struct comedi_devconfi | |||
205 | return 0; | 205 | return 0; |
206 | } | 206 | } |
207 | 207 | ||
208 | static int aio_aio12_8_detach(struct comedi_device * dev) | 208 | static int aio_aio12_8_detach(struct comedi_device *dev) |
209 | { | 209 | { |
210 | subdev_8255_cleanup(dev, &dev->subdevices[2]); | 210 | subdev_8255_cleanup(dev, &dev->subdevices[2]); |
211 | if (dev->iobase) | 211 | if (dev->iobase) |
diff --git a/drivers/staging/comedi/drivers/aio_iiro_16.c b/drivers/staging/comedi/drivers/aio_iiro_16.c index 9160fdf0ca3..8374f65a8be 100644 --- a/drivers/staging/comedi/drivers/aio_iiro_16.c +++ b/drivers/staging/comedi/drivers/aio_iiro_16.c | |||
@@ -67,9 +67,9 @@ struct aio_iiro_16_private { | |||
67 | 67 | ||
68 | #define devpriv ((struct aio_iiro_16_private *) dev->private) | 68 | #define devpriv ((struct aio_iiro_16_private *) dev->private) |
69 | 69 | ||
70 | static int aio_iiro_16_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 70 | static int aio_iiro_16_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
71 | 71 | ||
72 | static int aio_iiro_16_detach(struct comedi_device * dev); | 72 | static int aio_iiro_16_detach(struct comedi_device *dev); |
73 | 73 | ||
74 | static struct comedi_driver driver_aio_iiro_16 = { | 74 | static struct comedi_driver driver_aio_iiro_16 = { |
75 | driver_name:"aio_iiro_16", | 75 | driver_name:"aio_iiro_16", |
@@ -81,13 +81,13 @@ static struct comedi_driver driver_aio_iiro_16 = { | |||
81 | num_names:sizeof(aio_iiro_16_boards) / sizeof(struct aio_iiro_16_board), | 81 | num_names:sizeof(aio_iiro_16_boards) / sizeof(struct aio_iiro_16_board), |
82 | }; | 82 | }; |
83 | 83 | ||
84 | static int aio_iiro_16_dio_insn_bits_read(struct comedi_device * dev, | 84 | static int aio_iiro_16_dio_insn_bits_read(struct comedi_device *dev, |
85 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 85 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); |
86 | 86 | ||
87 | static int aio_iiro_16_dio_insn_bits_write(struct comedi_device * dev, | 87 | static int aio_iiro_16_dio_insn_bits_write(struct comedi_device *dev, |
88 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 88 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); |
89 | 89 | ||
90 | static int aio_iiro_16_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 90 | static int aio_iiro_16_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
91 | { | 91 | { |
92 | int iobase; | 92 | int iobase; |
93 | struct comedi_subdevice *s; | 93 | struct comedi_subdevice *s; |
@@ -132,7 +132,7 @@ static int aio_iiro_16_attach(struct comedi_device * dev, struct comedi_devconfi | |||
132 | return 1; | 132 | return 1; |
133 | } | 133 | } |
134 | 134 | ||
135 | static int aio_iiro_16_detach(struct comedi_device * dev) | 135 | static int aio_iiro_16_detach(struct comedi_device *dev) |
136 | { | 136 | { |
137 | printk("comedi%d: aio_iiro_16: remove\n", dev->minor); | 137 | printk("comedi%d: aio_iiro_16: remove\n", dev->minor); |
138 | 138 | ||
@@ -142,8 +142,8 @@ static int aio_iiro_16_detach(struct comedi_device * dev) | |||
142 | return 0; | 142 | return 0; |
143 | } | 143 | } |
144 | 144 | ||
145 | static int aio_iiro_16_dio_insn_bits_write(struct comedi_device * dev, | 145 | static int aio_iiro_16_dio_insn_bits_write(struct comedi_device *dev, |
146 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 146 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
147 | { | 147 | { |
148 | if (insn->n != 2) | 148 | if (insn->n != 2) |
149 | return -EINVAL; | 149 | return -EINVAL; |
@@ -161,8 +161,8 @@ static int aio_iiro_16_dio_insn_bits_write(struct comedi_device * dev, | |||
161 | return 2; | 161 | return 2; |
162 | } | 162 | } |
163 | 163 | ||
164 | static int aio_iiro_16_dio_insn_bits_read(struct comedi_device * dev, | 164 | static int aio_iiro_16_dio_insn_bits_read(struct comedi_device *dev, |
165 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 165 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
166 | { | 166 | { |
167 | if (insn->n != 2) | 167 | if (insn->n != 2) |
168 | return -EINVAL; | 168 | return -EINVAL; |
diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c index 771e88ca873..563fb0ba06e 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200.c +++ b/drivers/staging/comedi/drivers/amplc_dio200.c | |||
@@ -475,8 +475,8 @@ struct dio200_subdev_intr { | |||
475 | * the board, and also about the kernel module that contains | 475 | * the board, and also about the kernel module that contains |
476 | * the device code. | 476 | * the device code. |
477 | */ | 477 | */ |
478 | static int dio200_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 478 | static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
479 | static int dio200_detach(struct comedi_device * dev); | 479 | static int dio200_detach(struct comedi_device *dev); |
480 | static struct comedi_driver driver_amplc_dio200 = { | 480 | static struct comedi_driver driver_amplc_dio200 = { |
481 | driver_name:DIO200_DRIVER_NAME, | 481 | driver_name:DIO200_DRIVER_NAME, |
482 | module:THIS_MODULE, | 482 | module:THIS_MODULE, |
@@ -499,7 +499,7 @@ COMEDI_INITCLEANUP(driver_amplc_dio200); | |||
499 | */ | 499 | */ |
500 | #ifdef CONFIG_COMEDI_PCI | 500 | #ifdef CONFIG_COMEDI_PCI |
501 | static int | 501 | static int |
502 | dio200_find_pci(struct comedi_device * dev, int bus, int slot, | 502 | dio200_find_pci(struct comedi_device *dev, int bus, int slot, |
503 | struct pci_dev **pci_dev_p) | 503 | struct pci_dev **pci_dev_p) |
504 | { | 504 | { |
505 | struct pci_dev *pci_dev = NULL; | 505 | struct pci_dev *pci_dev = NULL; |
@@ -574,8 +574,8 @@ dio200_request_region(unsigned minor, unsigned long from, unsigned long extent) | |||
574 | * 'insn_bits' function for an 'INTERRUPT' subdevice. | 574 | * 'insn_bits' function for an 'INTERRUPT' subdevice. |
575 | */ | 575 | */ |
576 | static int | 576 | static int |
577 | dio200_subdev_intr_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 577 | dio200_subdev_intr_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
578 | struct comedi_insn * insn, unsigned int * data) | 578 | struct comedi_insn *insn, unsigned int *data) |
579 | { | 579 | { |
580 | struct dio200_subdev_intr *subpriv = s->private; | 580 | struct dio200_subdev_intr *subpriv = s->private; |
581 | 581 | ||
@@ -593,7 +593,7 @@ dio200_subdev_intr_insn_bits(struct comedi_device * dev, struct comedi_subdevice | |||
593 | /* | 593 | /* |
594 | * Called to stop acquisition for an 'INTERRUPT' subdevice. | 594 | * Called to stop acquisition for an 'INTERRUPT' subdevice. |
595 | */ | 595 | */ |
596 | static void dio200_stop_intr(struct comedi_device * dev, struct comedi_subdevice * s) | 596 | static void dio200_stop_intr(struct comedi_device *dev, struct comedi_subdevice *s) |
597 | { | 597 | { |
598 | struct dio200_subdev_intr *subpriv = s->private; | 598 | struct dio200_subdev_intr *subpriv = s->private; |
599 | 599 | ||
@@ -607,7 +607,7 @@ static void dio200_stop_intr(struct comedi_device * dev, struct comedi_subdevice | |||
607 | /* | 607 | /* |
608 | * Called to start acquisition for an 'INTERRUPT' subdevice. | 608 | * Called to start acquisition for an 'INTERRUPT' subdevice. |
609 | */ | 609 | */ |
610 | static int dio200_start_intr(struct comedi_device * dev, struct comedi_subdevice * s) | 610 | static int dio200_start_intr(struct comedi_device *dev, struct comedi_subdevice *s) |
611 | { | 611 | { |
612 | unsigned int n; | 612 | unsigned int n; |
613 | unsigned isn_bits; | 613 | unsigned isn_bits; |
@@ -643,7 +643,7 @@ static int dio200_start_intr(struct comedi_device * dev, struct comedi_subdevice | |||
643 | * Internal trigger function to start acquisition for an 'INTERRUPT' subdevice. | 643 | * Internal trigger function to start acquisition for an 'INTERRUPT' subdevice. |
644 | */ | 644 | */ |
645 | static int | 645 | static int |
646 | dio200_inttrig_start_intr(struct comedi_device * dev, struct comedi_subdevice * s, | 646 | dio200_inttrig_start_intr(struct comedi_device *dev, struct comedi_subdevice *s, |
647 | unsigned int trignum) | 647 | unsigned int trignum) |
648 | { | 648 | { |
649 | struct dio200_subdev_intr *subpriv; | 649 | struct dio200_subdev_intr *subpriv; |
@@ -673,7 +673,7 @@ dio200_inttrig_start_intr(struct comedi_device * dev, struct comedi_subdevice * | |||
673 | * This is called from the interrupt service routine to handle a read | 673 | * This is called from the interrupt service routine to handle a read |
674 | * scan on an 'INTERRUPT' subdevice. | 674 | * scan on an 'INTERRUPT' subdevice. |
675 | */ | 675 | */ |
676 | static int dio200_handle_read_intr(struct comedi_device * dev, struct comedi_subdevice * s) | 676 | static int dio200_handle_read_intr(struct comedi_device *dev, struct comedi_subdevice *s) |
677 | { | 677 | { |
678 | struct dio200_subdev_intr *subpriv = s->private; | 678 | struct dio200_subdev_intr *subpriv = s->private; |
679 | unsigned triggered; | 679 | unsigned triggered; |
@@ -785,7 +785,7 @@ static int dio200_handle_read_intr(struct comedi_device * dev, struct comedi_sub | |||
785 | /* | 785 | /* |
786 | * 'cancel' function for an 'INTERRUPT' subdevice. | 786 | * 'cancel' function for an 'INTERRUPT' subdevice. |
787 | */ | 787 | */ |
788 | static int dio200_subdev_intr_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 788 | static int dio200_subdev_intr_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
789 | { | 789 | { |
790 | struct dio200_subdev_intr *subpriv = s->private; | 790 | struct dio200_subdev_intr *subpriv = s->private; |
791 | unsigned long flags; | 791 | unsigned long flags; |
@@ -803,8 +803,8 @@ static int dio200_subdev_intr_cancel(struct comedi_device * dev, struct comedi_s | |||
803 | * 'do_cmdtest' function for an 'INTERRUPT' subdevice. | 803 | * 'do_cmdtest' function for an 'INTERRUPT' subdevice. |
804 | */ | 804 | */ |
805 | static int | 805 | static int |
806 | dio200_subdev_intr_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 806 | dio200_subdev_intr_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
807 | struct comedi_cmd * cmd) | 807 | struct comedi_cmd *cmd) |
808 | { | 808 | { |
809 | int err = 0; | 809 | int err = 0; |
810 | unsigned int tmp; | 810 | unsigned int tmp; |
@@ -909,7 +909,7 @@ dio200_subdev_intr_cmdtest(struct comedi_device * dev, struct comedi_subdevice * | |||
909 | /* | 909 | /* |
910 | * 'do_cmd' function for an 'INTERRUPT' subdevice. | 910 | * 'do_cmd' function for an 'INTERRUPT' subdevice. |
911 | */ | 911 | */ |
912 | static int dio200_subdev_intr_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 912 | static int dio200_subdev_intr_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
913 | { | 913 | { |
914 | struct comedi_cmd *cmd = &s->async->cmd; | 914 | struct comedi_cmd *cmd = &s->async->cmd; |
915 | struct dio200_subdev_intr *subpriv = s->private; | 915 | struct dio200_subdev_intr *subpriv = s->private; |
@@ -955,7 +955,7 @@ static int dio200_subdev_intr_cmd(struct comedi_device * dev, struct comedi_subd | |||
955 | * This function initializes an 'INTERRUPT' subdevice. | 955 | * This function initializes an 'INTERRUPT' subdevice. |
956 | */ | 956 | */ |
957 | static int | 957 | static int |
958 | dio200_subdev_intr_init(struct comedi_device * dev, struct comedi_subdevice * s, | 958 | dio200_subdev_intr_init(struct comedi_device *dev, struct comedi_subdevice *s, |
959 | unsigned long iobase, unsigned valid_isns, int has_int_sce) | 959 | unsigned long iobase, unsigned valid_isns, int has_int_sce) |
960 | { | 960 | { |
961 | struct dio200_subdev_intr *subpriv; | 961 | struct dio200_subdev_intr *subpriv; |
@@ -1000,7 +1000,7 @@ dio200_subdev_intr_init(struct comedi_device * dev, struct comedi_subdevice * s, | |||
1000 | * This function cleans up an 'INTERRUPT' subdevice. | 1000 | * This function cleans up an 'INTERRUPT' subdevice. |
1001 | */ | 1001 | */ |
1002 | static void | 1002 | static void |
1003 | dio200_subdev_intr_cleanup(struct comedi_device * dev, struct comedi_subdevice * s) | 1003 | dio200_subdev_intr_cleanup(struct comedi_device *dev, struct comedi_subdevice *s) |
1004 | { | 1004 | { |
1005 | struct dio200_subdev_intr *subpriv = s->private; | 1005 | struct dio200_subdev_intr *subpriv = s->private; |
1006 | 1006 | ||
@@ -1035,8 +1035,8 @@ static irqreturn_t dio200_interrupt(int irq, void *d) | |||
1035 | * Handle 'insn_read' for an '8254' counter subdevice. | 1035 | * Handle 'insn_read' for an '8254' counter subdevice. |
1036 | */ | 1036 | */ |
1037 | static int | 1037 | static int |
1038 | dio200_subdev_8254_read(struct comedi_device * dev, struct comedi_subdevice * s, | 1038 | dio200_subdev_8254_read(struct comedi_device *dev, struct comedi_subdevice *s, |
1039 | struct comedi_insn * insn, unsigned int * data) | 1039 | struct comedi_insn *insn, unsigned int *data) |
1040 | { | 1040 | { |
1041 | struct dio200_subdev_8254 *subpriv = s->private; | 1041 | struct dio200_subdev_8254 *subpriv = s->private; |
1042 | int chan = CR_CHAN(insn->chanspec); | 1042 | int chan = CR_CHAN(insn->chanspec); |
@@ -1050,8 +1050,8 @@ dio200_subdev_8254_read(struct comedi_device * dev, struct comedi_subdevice * s, | |||
1050 | * Handle 'insn_write' for an '8254' counter subdevice. | 1050 | * Handle 'insn_write' for an '8254' counter subdevice. |
1051 | */ | 1051 | */ |
1052 | static int | 1052 | static int |
1053 | dio200_subdev_8254_write(struct comedi_device * dev, struct comedi_subdevice * s, | 1053 | dio200_subdev_8254_write(struct comedi_device *dev, struct comedi_subdevice *s, |
1054 | struct comedi_insn * insn, unsigned int * data) | 1054 | struct comedi_insn *insn, unsigned int *data) |
1055 | { | 1055 | { |
1056 | struct dio200_subdev_8254 *subpriv = s->private; | 1056 | struct dio200_subdev_8254 *subpriv = s->private; |
1057 | int chan = CR_CHAN(insn->chanspec); | 1057 | int chan = CR_CHAN(insn->chanspec); |
@@ -1065,7 +1065,7 @@ dio200_subdev_8254_write(struct comedi_device * dev, struct comedi_subdevice * s | |||
1065 | * Set gate source for an '8254' counter subdevice channel. | 1065 | * Set gate source for an '8254' counter subdevice channel. |
1066 | */ | 1066 | */ |
1067 | static int | 1067 | static int |
1068 | dio200_set_gate_src(struct dio200_subdev_8254 * subpriv, unsigned int counter_number, | 1068 | dio200_set_gate_src(struct dio200_subdev_8254 *subpriv, unsigned int counter_number, |
1069 | unsigned int gate_src) | 1069 | unsigned int gate_src) |
1070 | { | 1070 | { |
1071 | unsigned char byte; | 1071 | unsigned char byte; |
@@ -1088,7 +1088,7 @@ dio200_set_gate_src(struct dio200_subdev_8254 * subpriv, unsigned int counter_nu | |||
1088 | * Get gate source for an '8254' counter subdevice channel. | 1088 | * Get gate source for an '8254' counter subdevice channel. |
1089 | */ | 1089 | */ |
1090 | static int | 1090 | static int |
1091 | dio200_get_gate_src(struct dio200_subdev_8254 * subpriv, unsigned int counter_number) | 1091 | dio200_get_gate_src(struct dio200_subdev_8254 *subpriv, unsigned int counter_number) |
1092 | { | 1092 | { |
1093 | if (!subpriv->has_clk_gat_sce) | 1093 | if (!subpriv->has_clk_gat_sce) |
1094 | return -1; | 1094 | return -1; |
@@ -1102,7 +1102,7 @@ dio200_get_gate_src(struct dio200_subdev_8254 * subpriv, unsigned int counter_nu | |||
1102 | * Set clock source for an '8254' counter subdevice channel. | 1102 | * Set clock source for an '8254' counter subdevice channel. |
1103 | */ | 1103 | */ |
1104 | static int | 1104 | static int |
1105 | dio200_set_clock_src(struct dio200_subdev_8254 * subpriv, unsigned int counter_number, | 1105 | dio200_set_clock_src(struct dio200_subdev_8254 *subpriv, unsigned int counter_number, |
1106 | unsigned int clock_src) | 1106 | unsigned int clock_src) |
1107 | { | 1107 | { |
1108 | unsigned char byte; | 1108 | unsigned char byte; |
@@ -1125,8 +1125,8 @@ dio200_set_clock_src(struct dio200_subdev_8254 * subpriv, unsigned int counter_n | |||
1125 | * Get clock source for an '8254' counter subdevice channel. | 1125 | * Get clock source for an '8254' counter subdevice channel. |
1126 | */ | 1126 | */ |
1127 | static int | 1127 | static int |
1128 | dio200_get_clock_src(struct dio200_subdev_8254 * subpriv, unsigned int counter_number, | 1128 | dio200_get_clock_src(struct dio200_subdev_8254 *subpriv, unsigned int counter_number, |
1129 | unsigned int * period_ns) | 1129 | unsigned int *period_ns) |
1130 | { | 1130 | { |
1131 | unsigned clock_src; | 1131 | unsigned clock_src; |
1132 | 1132 | ||
@@ -1144,8 +1144,8 @@ dio200_get_clock_src(struct dio200_subdev_8254 * subpriv, unsigned int counter_n | |||
1144 | * Handle 'insn_config' for an '8254' counter subdevice. | 1144 | * Handle 'insn_config' for an '8254' counter subdevice. |
1145 | */ | 1145 | */ |
1146 | static int | 1146 | static int |
1147 | dio200_subdev_8254_config(struct comedi_device * dev, struct comedi_subdevice * s, | 1147 | dio200_subdev_8254_config(struct comedi_device *dev, struct comedi_subdevice *s, |
1148 | struct comedi_insn * insn, unsigned int * data) | 1148 | struct comedi_insn *insn, unsigned int *data) |
1149 | { | 1149 | { |
1150 | struct dio200_subdev_8254 *subpriv = s->private; | 1150 | struct dio200_subdev_8254 *subpriv = s->private; |
1151 | int ret; | 1151 | int ret; |
@@ -1196,7 +1196,7 @@ dio200_subdev_8254_config(struct comedi_device * dev, struct comedi_subdevice * | |||
1196 | * offset is the offset to the 8254 chip. | 1196 | * offset is the offset to the 8254 chip. |
1197 | */ | 1197 | */ |
1198 | static int | 1198 | static int |
1199 | dio200_subdev_8254_init(struct comedi_device * dev, struct comedi_subdevice * s, | 1199 | dio200_subdev_8254_init(struct comedi_device *dev, struct comedi_subdevice *s, |
1200 | unsigned long iobase, unsigned offset, int has_clk_gat_sce) | 1200 | unsigned long iobase, unsigned offset, int has_clk_gat_sce) |
1201 | { | 1201 | { |
1202 | struct dio200_subdev_8254 *subpriv; | 1202 | struct dio200_subdev_8254 *subpriv; |
@@ -1249,7 +1249,7 @@ dio200_subdev_8254_init(struct comedi_device * dev, struct comedi_subdevice * s, | |||
1249 | * This function cleans up an '8254' counter subdevice. | 1249 | * This function cleans up an '8254' counter subdevice. |
1250 | */ | 1250 | */ |
1251 | static void | 1251 | static void |
1252 | dio200_subdev_8254_cleanup(struct comedi_device * dev, struct comedi_subdevice * s) | 1252 | dio200_subdev_8254_cleanup(struct comedi_device *dev, struct comedi_subdevice *s) |
1253 | { | 1253 | { |
1254 | struct dio200_subdev_intr *subpriv = s->private; | 1254 | struct dio200_subdev_intr *subpriv = s->private; |
1255 | 1255 | ||
@@ -1264,7 +1264,7 @@ dio200_subdev_8254_cleanup(struct comedi_device * dev, struct comedi_subdevice * | |||
1264 | * in the driver structure, dev->board_ptr contains that | 1264 | * in the driver structure, dev->board_ptr contains that |
1265 | * address. | 1265 | * address. |
1266 | */ | 1266 | */ |
1267 | static int dio200_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 1267 | static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
1268 | { | 1268 | { |
1269 | struct comedi_subdevice *s; | 1269 | struct comedi_subdevice *s; |
1270 | unsigned long iobase = 0; | 1270 | unsigned long iobase = 0; |
@@ -1431,7 +1431,7 @@ static int dio200_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
1431 | * allocated by _attach(). dev->private and dev->subdevices are | 1431 | * allocated by _attach(). dev->private and dev->subdevices are |
1432 | * deallocated automatically by the core. | 1432 | * deallocated automatically by the core. |
1433 | */ | 1433 | */ |
1434 | static int dio200_detach(struct comedi_device * dev) | 1434 | static int dio200_detach(struct comedi_device *dev) |
1435 | { | 1435 | { |
1436 | const struct dio200_layout_struct *layout; | 1436 | const struct dio200_layout_struct *layout; |
1437 | unsigned n; | 1437 | unsigned n; |
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c index fc1a8f1b611..c45cbf36f1e 100644 --- a/drivers/staging/comedi/drivers/amplc_pc236.c +++ b/drivers/staging/comedi/drivers/amplc_pc236.c | |||
@@ -167,8 +167,8 @@ struct pc236_private { | |||
167 | * the board, and also about the kernel module that contains | 167 | * the board, and also about the kernel module that contains |
168 | * the device code. | 168 | * the device code. |
169 | */ | 169 | */ |
170 | static int pc236_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 170 | static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
171 | static int pc236_detach(struct comedi_device * dev); | 171 | static int pc236_detach(struct comedi_device *dev); |
172 | static struct comedi_driver driver_amplc_pc236 = { | 172 | static struct comedi_driver driver_amplc_pc236 = { |
173 | driver_name:PC236_DRIVER_NAME, | 173 | driver_name:PC236_DRIVER_NAME, |
174 | module:THIS_MODULE, | 174 | module:THIS_MODULE, |
@@ -204,7 +204,7 @@ static irqreturn_t pc236_interrupt(int irq, void *d); | |||
204 | */ | 204 | */ |
205 | #ifdef CONFIG_COMEDI_PCI | 205 | #ifdef CONFIG_COMEDI_PCI |
206 | static int | 206 | static int |
207 | pc236_find_pci(struct comedi_device * dev, int bus, int slot, | 207 | pc236_find_pci(struct comedi_device *dev, int bus, int slot, |
208 | struct pci_dev **pci_dev_p) | 208 | struct pci_dev **pci_dev_p) |
209 | { | 209 | { |
210 | struct pci_dev *pci_dev = NULL; | 210 | struct pci_dev *pci_dev = NULL; |
@@ -266,7 +266,7 @@ pc236_find_pci(struct comedi_device * dev, int bus, int slot, | |||
266 | * in the driver structure, dev->board_ptr contains that | 266 | * in the driver structure, dev->board_ptr contains that |
267 | * address. | 267 | * address. |
268 | */ | 268 | */ |
269 | static int pc236_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 269 | static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
270 | { | 270 | { |
271 | struct comedi_subdevice *s; | 271 | struct comedi_subdevice *s; |
272 | unsigned long iobase = 0; | 272 | unsigned long iobase = 0; |
@@ -407,7 +407,7 @@ static int pc236_attach(struct comedi_device * dev, struct comedi_devconfig * it | |||
407 | * allocated by _attach(). dev->private and dev->subdevices are | 407 | * allocated by _attach(). dev->private and dev->subdevices are |
408 | * deallocated automatically by the core. | 408 | * deallocated automatically by the core. |
409 | */ | 409 | */ |
410 | static int pc236_detach(struct comedi_device * dev) | 410 | static int pc236_detach(struct comedi_device *dev) |
411 | { | 411 | { |
412 | printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor, | 412 | printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor, |
413 | PC236_DRIVER_NAME); | 413 | PC236_DRIVER_NAME); |
@@ -461,7 +461,7 @@ static int pc236_request_region(unsigned minor, unsigned long from, | |||
461 | * configured on subdevice 1) and to physically disable the interrupt | 461 | * configured on subdevice 1) and to physically disable the interrupt |
462 | * (not possible on the PC36AT, except by removing the IRQ jumper!). | 462 | * (not possible on the PC36AT, except by removing the IRQ jumper!). |
463 | */ | 463 | */ |
464 | static void pc236_intr_disable(struct comedi_device * dev) | 464 | static void pc236_intr_disable(struct comedi_device *dev) |
465 | { | 465 | { |
466 | unsigned long flags; | 466 | unsigned long flags; |
467 | 467 | ||
@@ -479,7 +479,7 @@ static void pc236_intr_disable(struct comedi_device * dev) | |||
479 | * configured on subdevice 1) and to physically enable the interrupt | 479 | * configured on subdevice 1) and to physically enable the interrupt |
480 | * (not possible on the PC36AT, except by (re)connecting the IRQ jumper!). | 480 | * (not possible on the PC36AT, except by (re)connecting the IRQ jumper!). |
481 | */ | 481 | */ |
482 | static void pc236_intr_enable(struct comedi_device * dev) | 482 | static void pc236_intr_enable(struct comedi_device *dev) |
483 | { | 483 | { |
484 | unsigned long flags; | 484 | unsigned long flags; |
485 | 485 | ||
@@ -499,7 +499,7 @@ static void pc236_intr_enable(struct comedi_device * dev) | |||
499 | * interrupt. | 499 | * interrupt. |
500 | * Returns 0 if the interrupt should be ignored. | 500 | * Returns 0 if the interrupt should be ignored. |
501 | */ | 501 | */ |
502 | static int pc236_intr_check(struct comedi_device * dev) | 502 | static int pc236_intr_check(struct comedi_device *dev) |
503 | { | 503 | { |
504 | int retval = 0; | 504 | int retval = 0; |
505 | unsigned long flags; | 505 | unsigned long flags; |
@@ -530,8 +530,8 @@ static int pc236_intr_check(struct comedi_device * dev) | |||
530 | * Input from subdevice 1. | 530 | * Input from subdevice 1. |
531 | * Copied from the comedi_parport driver. | 531 | * Copied from the comedi_parport driver. |
532 | */ | 532 | */ |
533 | static int pc236_intr_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 533 | static int pc236_intr_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
534 | struct comedi_insn * insn, unsigned int * data) | 534 | struct comedi_insn *insn, unsigned int *data) |
535 | { | 535 | { |
536 | data[1] = 0; | 536 | data[1] = 0; |
537 | return 2; | 537 | return 2; |
@@ -541,8 +541,8 @@ static int pc236_intr_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
541 | * Subdevice 1 command test. | 541 | * Subdevice 1 command test. |
542 | * Copied from the comedi_parport driver. | 542 | * Copied from the comedi_parport driver. |
543 | */ | 543 | */ |
544 | static int pc236_intr_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 544 | static int pc236_intr_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
545 | struct comedi_cmd * cmd) | 545 | struct comedi_cmd *cmd) |
546 | { | 546 | { |
547 | int err = 0; | 547 | int err = 0; |
548 | int tmp; | 548 | int tmp; |
@@ -619,7 +619,7 @@ static int pc236_intr_cmdtest(struct comedi_device * dev, struct comedi_subdevic | |||
619 | /* | 619 | /* |
620 | * Subdevice 1 command. | 620 | * Subdevice 1 command. |
621 | */ | 621 | */ |
622 | static int pc236_intr_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 622 | static int pc236_intr_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
623 | { | 623 | { |
624 | pc236_intr_enable(dev); | 624 | pc236_intr_enable(dev); |
625 | 625 | ||
@@ -629,7 +629,7 @@ static int pc236_intr_cmd(struct comedi_device * dev, struct comedi_subdevice * | |||
629 | /* | 629 | /* |
630 | * Subdevice 1 cancel command. | 630 | * Subdevice 1 cancel command. |
631 | */ | 631 | */ |
632 | static int pc236_intr_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 632 | static int pc236_intr_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
633 | { | 633 | { |
634 | pc236_intr_disable(dev); | 634 | pc236_intr_disable(dev); |
635 | 635 | ||
diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c index 97ac4157ada..1ca70476006 100644 --- a/drivers/staging/comedi/drivers/amplc_pc263.c +++ b/drivers/staging/comedi/drivers/amplc_pc263.c | |||
@@ -132,8 +132,8 @@ struct pc263_private { | |||
132 | * the board, and also about the kernel module that contains | 132 | * the board, and also about the kernel module that contains |
133 | * the device code. | 133 | * the device code. |
134 | */ | 134 | */ |
135 | static int pc263_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 135 | static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
136 | static int pc263_detach(struct comedi_device * dev); | 136 | static int pc263_detach(struct comedi_device *dev); |
137 | static struct comedi_driver driver_amplc_pc263 = { | 137 | static struct comedi_driver driver_amplc_pc263 = { |
138 | driver_name:PC263_DRIVER_NAME, | 138 | driver_name:PC263_DRIVER_NAME, |
139 | module:THIS_MODULE, | 139 | module:THIS_MODULE, |
@@ -146,10 +146,10 @@ static struct comedi_driver driver_amplc_pc263 = { | |||
146 | 146 | ||
147 | static int pc263_request_region(unsigned minor, unsigned long from, | 147 | static int pc263_request_region(unsigned minor, unsigned long from, |
148 | unsigned long extent); | 148 | unsigned long extent); |
149 | static int pc263_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 149 | static int pc263_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
150 | struct comedi_insn * insn, unsigned int * data); | 150 | struct comedi_insn *insn, unsigned int *data); |
151 | static int pc263_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 151 | static int pc263_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
152 | struct comedi_insn * insn, unsigned int * data); | 152 | struct comedi_insn *insn, unsigned int *data); |
153 | 153 | ||
154 | /* | 154 | /* |
155 | * This function looks for a PCI device matching the requested board name, | 155 | * This function looks for a PCI device matching the requested board name, |
@@ -157,7 +157,7 @@ static int pc263_dio_insn_config(struct comedi_device * dev, struct comedi_subde | |||
157 | */ | 157 | */ |
158 | #ifdef CONFIG_COMEDI_PCI | 158 | #ifdef CONFIG_COMEDI_PCI |
159 | static int | 159 | static int |
160 | pc263_find_pci(struct comedi_device * dev, int bus, int slot, | 160 | pc263_find_pci(struct comedi_device *dev, int bus, int slot, |
161 | struct pci_dev **pci_dev_p) | 161 | struct pci_dev **pci_dev_p) |
162 | { | 162 | { |
163 | struct pci_dev *pci_dev = NULL; | 163 | struct pci_dev *pci_dev = NULL; |
@@ -219,7 +219,7 @@ pc263_find_pci(struct comedi_device * dev, int bus, int slot, | |||
219 | * in the driver structure, dev->board_ptr contains that | 219 | * in the driver structure, dev->board_ptr contains that |
220 | * address. | 220 | * address. |
221 | */ | 221 | */ |
222 | static int pc263_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 222 | static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
223 | { | 223 | { |
224 | struct comedi_subdevice *s; | 224 | struct comedi_subdevice *s; |
225 | unsigned long iobase = 0; | 225 | unsigned long iobase = 0; |
@@ -337,7 +337,7 @@ static int pc263_attach(struct comedi_device * dev, struct comedi_devconfig * it | |||
337 | * allocated by _attach(). dev->private and dev->subdevices are | 337 | * allocated by _attach(). dev->private and dev->subdevices are |
338 | * deallocated automatically by the core. | 338 | * deallocated automatically by the core. |
339 | */ | 339 | */ |
340 | static int pc263_detach(struct comedi_device * dev) | 340 | static int pc263_detach(struct comedi_device *dev) |
341 | { | 341 | { |
342 | printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor, | 342 | printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor, |
343 | PC263_DRIVER_NAME); | 343 | PC263_DRIVER_NAME); |
@@ -387,8 +387,8 @@ static int pc263_request_region(unsigned minor, unsigned long from, | |||
387 | * useful to applications if you implement the insn_bits interface. | 387 | * useful to applications if you implement the insn_bits interface. |
388 | * This allows packed reading/writing of the DIO channels. The | 388 | * This allows packed reading/writing of the DIO channels. The |
389 | * comedi core can convert between insn_bits and insn_read/write */ | 389 | * comedi core can convert between insn_bits and insn_read/write */ |
390 | static int pc263_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 390 | static int pc263_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
391 | struct comedi_insn * insn, unsigned int * data) | 391 | struct comedi_insn *insn, unsigned int *data) |
392 | { | 392 | { |
393 | if (insn->n != 2) | 393 | if (insn->n != 2) |
394 | return -EINVAL; | 394 | return -EINVAL; |
@@ -412,8 +412,8 @@ static int pc263_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevi | |||
412 | return 2; | 412 | return 2; |
413 | } | 413 | } |
414 | 414 | ||
415 | static int pc263_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 415 | static int pc263_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
416 | struct comedi_insn * insn, unsigned int * data) | 416 | struct comedi_insn *insn, unsigned int *data) |
417 | { | 417 | { |
418 | if (insn->n != 1) | 418 | if (insn->n != 1) |
419 | return -EINVAL; | 419 | return -EINVAL; |
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c index 70381b5c015..9037ff4bf0e 100644 --- a/drivers/staging/comedi/drivers/amplc_pci224.c +++ b/drivers/staging/comedi/drivers/amplc_pci224.c | |||
@@ -428,8 +428,8 @@ struct pci224_private { | |||
428 | * the board, and also about the kernel module that contains | 428 | * the board, and also about the kernel module that contains |
429 | * the device code. | 429 | * the device code. |
430 | */ | 430 | */ |
431 | static int pci224_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 431 | static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
432 | static int pci224_detach(struct comedi_device * dev); | 432 | static int pci224_detach(struct comedi_device *dev); |
433 | static struct comedi_driver driver_amplc_pci224 = { | 433 | static struct comedi_driver driver_amplc_pci224 = { |
434 | driver_name:DRIVER_NAME, | 434 | driver_name:DRIVER_NAME, |
435 | module:THIS_MODULE, | 435 | module:THIS_MODULE, |
@@ -446,7 +446,7 @@ COMEDI_PCI_INITCLEANUP(driver_amplc_pci224, pci224_pci_table); | |||
446 | * Called from the 'insn_write' function to perform a single write. | 446 | * Called from the 'insn_write' function to perform a single write. |
447 | */ | 447 | */ |
448 | static void | 448 | static void |
449 | pci224_ao_set_data(struct comedi_device * dev, int chan, int range, unsigned int data) | 449 | pci224_ao_set_data(struct comedi_device *dev, int chan, int range, unsigned int data) |
450 | { | 450 | { |
451 | unsigned short mangled; | 451 | unsigned short mangled; |
452 | 452 | ||
@@ -479,8 +479,8 @@ pci224_ao_set_data(struct comedi_device * dev, int chan, int range, unsigned int | |||
479 | * 'insn_write' function for AO subdevice. | 479 | * 'insn_write' function for AO subdevice. |
480 | */ | 480 | */ |
481 | static int | 481 | static int |
482 | pci224_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 482 | pci224_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
483 | struct comedi_insn * insn, unsigned int * data) | 483 | struct comedi_insn *insn, unsigned int *data) |
484 | { | 484 | { |
485 | int i; | 485 | int i; |
486 | int chan, range; | 486 | int chan, range; |
@@ -506,8 +506,8 @@ pci224_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | |||
506 | * command. | 506 | * command. |
507 | */ | 507 | */ |
508 | static int | 508 | static int |
509 | pci224_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 509 | pci224_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
510 | struct comedi_insn * insn, unsigned int * data) | 510 | struct comedi_insn *insn, unsigned int *data) |
511 | { | 511 | { |
512 | int i; | 512 | int i; |
513 | int chan; | 513 | int chan; |
@@ -534,7 +534,7 @@ pci224_cascade_ns_to_timer(int osc_base, unsigned int *d1, unsigned int *d2, | |||
534 | /* | 534 | /* |
535 | * Kills a command running on the AO subdevice. | 535 | * Kills a command running on the AO subdevice. |
536 | */ | 536 | */ |
537 | static void pci224_ao_stop(struct comedi_device * dev, struct comedi_subdevice * s) | 537 | static void pci224_ao_stop(struct comedi_device *dev, struct comedi_subdevice *s) |
538 | { | 538 | { |
539 | unsigned long flags; | 539 | unsigned long flags; |
540 | 540 | ||
@@ -574,7 +574,7 @@ static void pci224_ao_stop(struct comedi_device * dev, struct comedi_subdevice * | |||
574 | /* | 574 | /* |
575 | * Handles start of acquisition for the AO subdevice. | 575 | * Handles start of acquisition for the AO subdevice. |
576 | */ | 576 | */ |
577 | static void pci224_ao_start(struct comedi_device * dev, struct comedi_subdevice * s) | 577 | static void pci224_ao_start(struct comedi_device *dev, struct comedi_subdevice *s) |
578 | { | 578 | { |
579 | struct comedi_cmd *cmd = &s->async->cmd; | 579 | struct comedi_cmd *cmd = &s->async->cmd; |
580 | unsigned long flags; | 580 | unsigned long flags; |
@@ -601,7 +601,7 @@ static void pci224_ao_start(struct comedi_device * dev, struct comedi_subdevice | |||
601 | /* | 601 | /* |
602 | * Handles interrupts from the DAC FIFO. | 602 | * Handles interrupts from the DAC FIFO. |
603 | */ | 603 | */ |
604 | static void pci224_ao_handle_fifo(struct comedi_device * dev, struct comedi_subdevice * s) | 604 | static void pci224_ao_handle_fifo(struct comedi_device *dev, struct comedi_subdevice *s) |
605 | { | 605 | { |
606 | struct comedi_cmd *cmd = &s->async->cmd; | 606 | struct comedi_cmd *cmd = &s->async->cmd; |
607 | unsigned int num_scans; | 607 | unsigned int num_scans; |
@@ -730,7 +730,7 @@ static void pci224_ao_handle_fifo(struct comedi_device * dev, struct comedi_subd | |||
730 | * Internal trigger function to start acquisition on AO subdevice. | 730 | * Internal trigger function to start acquisition on AO subdevice. |
731 | */ | 731 | */ |
732 | static int | 732 | static int |
733 | pci224_ao_inttrig_start(struct comedi_device * dev, struct comedi_subdevice * s, | 733 | pci224_ao_inttrig_start(struct comedi_device *dev, struct comedi_subdevice *s, |
734 | unsigned int trignum) | 734 | unsigned int trignum) |
735 | { | 735 | { |
736 | if (trignum != 0) | 736 | if (trignum != 0) |
@@ -750,7 +750,7 @@ pci224_ao_inttrig_start(struct comedi_device * dev, struct comedi_subdevice * s, | |||
750 | * 'do_cmdtest' function for AO subdevice. | 750 | * 'do_cmdtest' function for AO subdevice. |
751 | */ | 751 | */ |
752 | static int | 752 | static int |
753 | pci224_ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, struct comedi_cmd * cmd) | 753 | pci224_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd) |
754 | { | 754 | { |
755 | int err = 0; | 755 | int err = 0; |
756 | unsigned int tmp; | 756 | unsigned int tmp; |
@@ -1017,7 +1017,7 @@ pci224_ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, struc | |||
1017 | /* | 1017 | /* |
1018 | * 'do_cmd' function for AO subdevice. | 1018 | * 'do_cmd' function for AO subdevice. |
1019 | */ | 1019 | */ |
1020 | static int pci224_ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 1020 | static int pci224_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
1021 | { | 1021 | { |
1022 | struct comedi_cmd *cmd = &s->async->cmd; | 1022 | struct comedi_cmd *cmd = &s->async->cmd; |
1023 | int range; | 1023 | int range; |
@@ -1174,7 +1174,7 @@ static int pci224_ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s | |||
1174 | /* | 1174 | /* |
1175 | * 'cancel' function for AO subdevice. | 1175 | * 'cancel' function for AO subdevice. |
1176 | */ | 1176 | */ |
1177 | static int pci224_ao_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 1177 | static int pci224_ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
1178 | { | 1178 | { |
1179 | pci224_ao_stop(dev, s); | 1179 | pci224_ao_stop(dev, s); |
1180 | return 0; | 1180 | return 0; |
@@ -1184,7 +1184,7 @@ static int pci224_ao_cancel(struct comedi_device * dev, struct comedi_subdevice | |||
1184 | * 'munge' data for AO command. | 1184 | * 'munge' data for AO command. |
1185 | */ | 1185 | */ |
1186 | static void | 1186 | static void |
1187 | pci224_ao_munge(struct comedi_device * dev, struct comedi_subdevice * s, void *data, | 1187 | pci224_ao_munge(struct comedi_device *dev, struct comedi_subdevice *s, void *data, |
1188 | unsigned int num_bytes, unsigned int chan_index) | 1188 | unsigned int num_bytes, unsigned int chan_index) |
1189 | { | 1189 | { |
1190 | struct comedi_async *async = s->async; | 1190 | struct comedi_async *async = s->async; |
@@ -1266,7 +1266,7 @@ static irqreturn_t pci224_interrupt(int irq, void *d) | |||
1266 | * bus and slot. | 1266 | * bus and slot. |
1267 | */ | 1267 | */ |
1268 | static int | 1268 | static int |
1269 | pci224_find_pci(struct comedi_device * dev, int bus, int slot, | 1269 | pci224_find_pci(struct comedi_device *dev, int bus, int slot, |
1270 | struct pci_dev **pci_dev_p) | 1270 | struct pci_dev **pci_dev_p) |
1271 | { | 1271 | { |
1272 | struct pci_dev *pci_dev = NULL; | 1272 | struct pci_dev *pci_dev = NULL; |
@@ -1325,7 +1325,7 @@ pci224_find_pci(struct comedi_device * dev, int bus, int slot, | |||
1325 | * in the driver structure, dev->board_ptr contains that | 1325 | * in the driver structure, dev->board_ptr contains that |
1326 | * address. | 1326 | * address. |
1327 | */ | 1327 | */ |
1328 | static int pci224_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 1328 | static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
1329 | { | 1329 | { |
1330 | struct comedi_subdevice *s; | 1330 | struct comedi_subdevice *s; |
1331 | struct pci_dev *pci_dev; | 1331 | struct pci_dev *pci_dev; |
@@ -1505,7 +1505,7 @@ static int pci224_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
1505 | * allocated by _attach(). dev->private and dev->subdevices are | 1505 | * allocated by _attach(). dev->private and dev->subdevices are |
1506 | * deallocated automatically by the core. | 1506 | * deallocated automatically by the core. |
1507 | */ | 1507 | */ |
1508 | static int pci224_detach(struct comedi_device * dev) | 1508 | static int pci224_detach(struct comedi_device *dev) |
1509 | { | 1509 | { |
1510 | printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor, DRIVER_NAME); | 1510 | printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor, DRIVER_NAME); |
1511 | 1511 | ||
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c index 0fa228f6edc..570ad457fe5 100644 --- a/drivers/staging/comedi/drivers/amplc_pci230.c +++ b/drivers/staging/comedi/drivers/amplc_pci230.c | |||
@@ -603,8 +603,8 @@ static const unsigned char pci230_ao_bipolar[2] = { 0, 1 }; | |||
603 | * the board, and also about the kernel module that contains | 603 | * the board, and also about the kernel module that contains |
604 | * the device code. | 604 | * the device code. |
605 | */ | 605 | */ |
606 | static int pci230_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 606 | static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
607 | static int pci230_detach(struct comedi_device * dev); | 607 | static int pci230_detach(struct comedi_device *dev); |
608 | static struct comedi_driver driver_amplc_pci230 = { | 608 | static struct comedi_driver driver_amplc_pci230 = { |
609 | driver_name:"amplc_pci230", | 609 | driver_name:"amplc_pci230", |
610 | module:THIS_MODULE, | 610 | module:THIS_MODULE, |
@@ -660,7 +660,7 @@ static short pci230_ai_read(struct comedi_device * dev) | |||
660 | return data; | 660 | return data; |
661 | } | 661 | } |
662 | 662 | ||
663 | static inline unsigned short pci230_ao_mangle_datum(struct comedi_device * dev, | 663 | static inline unsigned short pci230_ao_mangle_datum(struct comedi_device *dev, |
664 | short datum) | 664 | short datum) |
665 | { | 665 | { |
666 | /* If a bipolar range was specified, mangle it (straight binary->twos | 666 | /* If a bipolar range was specified, mangle it (straight binary->twos |
@@ -676,7 +676,7 @@ static inline unsigned short pci230_ao_mangle_datum(struct comedi_device * dev, | |||
676 | return (unsigned short)datum; | 676 | return (unsigned short)datum; |
677 | } | 677 | } |
678 | 678 | ||
679 | static inline void pci230_ao_write_nofifo(struct comedi_device * dev, short datum, | 679 | static inline void pci230_ao_write_nofifo(struct comedi_device *dev, short datum, |
680 | unsigned int chan) | 680 | unsigned int chan) |
681 | { | 681 | { |
682 | /* Store unmangled datum to be read back later. */ | 682 | /* Store unmangled datum to be read back later. */ |
@@ -687,7 +687,7 @@ static inline void pci230_ao_write_nofifo(struct comedi_device * dev, short datu | |||
687 | ? PCI230_DACOUT1 : PCI230_DACOUT2)); | 687 | ? PCI230_DACOUT1 : PCI230_DACOUT2)); |
688 | } | 688 | } |
689 | 689 | ||
690 | static inline void pci230_ao_write_fifo(struct comedi_device * dev, short datum, | 690 | static inline void pci230_ao_write_fifo(struct comedi_device *dev, short datum, |
691 | unsigned int chan) | 691 | unsigned int chan) |
692 | { | 692 | { |
693 | /* Store unmangled datum to be read back later. */ | 693 | /* Store unmangled datum to be read back later. */ |
@@ -704,7 +704,7 @@ static inline void pci230_ao_write_fifo(struct comedi_device * dev, short datum, | |||
704 | * in the driver structure, dev->board_ptr contains that | 704 | * in the driver structure, dev->board_ptr contains that |
705 | * address. | 705 | * address. |
706 | */ | 706 | */ |
707 | static int pci230_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 707 | static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
708 | { | 708 | { |
709 | struct comedi_subdevice *s; | 709 | struct comedi_subdevice *s; |
710 | unsigned long iobase1, iobase2; | 710 | unsigned long iobase1, iobase2; |
@@ -961,7 +961,7 @@ static int pci230_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
961 | * allocated by _attach(). dev->private and dev->subdevices are | 961 | * allocated by _attach(). dev->private and dev->subdevices are |
962 | * deallocated automatically by the core. | 962 | * deallocated automatically by the core. |
963 | */ | 963 | */ |
964 | static int pci230_detach(struct comedi_device * dev) | 964 | static int pci230_detach(struct comedi_device *dev) |
965 | { | 965 | { |
966 | printk("comedi%d: amplc_pci230: remove\n", dev->minor); | 966 | printk("comedi%d: amplc_pci230: remove\n", dev->minor); |
967 | 967 | ||
@@ -984,7 +984,7 @@ static int pci230_detach(struct comedi_device * dev) | |||
984 | return 0; | 984 | return 0; |
985 | } | 985 | } |
986 | 986 | ||
987 | static int get_resources(struct comedi_device * dev, unsigned int res_mask, | 987 | static int get_resources(struct comedi_device *dev, unsigned int res_mask, |
988 | unsigned char owner) | 988 | unsigned char owner) |
989 | { | 989 | { |
990 | int ok; | 990 | int ok; |
@@ -1020,13 +1020,13 @@ static int get_resources(struct comedi_device * dev, unsigned int res_mask, | |||
1020 | return ok; | 1020 | return ok; |
1021 | } | 1021 | } |
1022 | 1022 | ||
1023 | static inline int get_one_resource(struct comedi_device * dev, unsigned int resource, | 1023 | static inline int get_one_resource(struct comedi_device *dev, unsigned int resource, |
1024 | unsigned char owner) | 1024 | unsigned char owner) |
1025 | { | 1025 | { |
1026 | return get_resources(dev, (1U << resource), owner); | 1026 | return get_resources(dev, (1U << resource), owner); |
1027 | } | 1027 | } |
1028 | 1028 | ||
1029 | static void put_resources(struct comedi_device * dev, unsigned int res_mask, | 1029 | static void put_resources(struct comedi_device *dev, unsigned int res_mask, |
1030 | unsigned char owner) | 1030 | unsigned char owner) |
1031 | { | 1031 | { |
1032 | unsigned int i; | 1032 | unsigned int i; |
@@ -1046,13 +1046,13 @@ static void put_resources(struct comedi_device * dev, unsigned int res_mask, | |||
1046 | comedi_spin_unlock_irqrestore(&devpriv->res_spinlock, irqflags); | 1046 | comedi_spin_unlock_irqrestore(&devpriv->res_spinlock, irqflags); |
1047 | } | 1047 | } |
1048 | 1048 | ||
1049 | static inline void put_one_resource(struct comedi_device * dev, unsigned int resource, | 1049 | static inline void put_one_resource(struct comedi_device *dev, unsigned int resource, |
1050 | unsigned char owner) | 1050 | unsigned char owner) |
1051 | { | 1051 | { |
1052 | put_resources(dev, (1U << resource), owner); | 1052 | put_resources(dev, (1U << resource), owner); |
1053 | } | 1053 | } |
1054 | 1054 | ||
1055 | static inline void put_all_resources(struct comedi_device * dev, unsigned char owner) | 1055 | static inline void put_all_resources(struct comedi_device *dev, unsigned char owner) |
1056 | { | 1056 | { |
1057 | put_resources(dev, (1U << NUM_RESOURCES) - 1, owner); | 1057 | put_resources(dev, (1U << NUM_RESOURCES) - 1, owner); |
1058 | } | 1058 | } |
@@ -1060,8 +1060,8 @@ static inline void put_all_resources(struct comedi_device * dev, unsigned char o | |||
1060 | /* | 1060 | /* |
1061 | * COMEDI_SUBD_AI instruction; | 1061 | * COMEDI_SUBD_AI instruction; |
1062 | */ | 1062 | */ |
1063 | static int pci230_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 1063 | static int pci230_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
1064 | struct comedi_insn * insn, unsigned int * data) | 1064 | struct comedi_insn *insn, unsigned int *data) |
1065 | { | 1065 | { |
1066 | unsigned int n, i; | 1066 | unsigned int n, i; |
1067 | unsigned int chan, range, aref; | 1067 | unsigned int chan, range, aref; |
@@ -1165,8 +1165,8 @@ static int pci230_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * | |||
1165 | /* | 1165 | /* |
1166 | * COMEDI_SUBD_AO instructions; | 1166 | * COMEDI_SUBD_AO instructions; |
1167 | */ | 1167 | */ |
1168 | static int pci230_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 1168 | static int pci230_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
1169 | struct comedi_insn * insn, unsigned int * data) | 1169 | struct comedi_insn *insn, unsigned int *data) |
1170 | { | 1170 | { |
1171 | int i; | 1171 | int i; |
1172 | int chan, range; | 1172 | int chan, range; |
@@ -1193,8 +1193,8 @@ static int pci230_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * | |||
1193 | 1193 | ||
1194 | /* AO subdevices should have a read insn as well as a write insn. | 1194 | /* AO subdevices should have a read insn as well as a write insn. |
1195 | * Usually this means copying a value stored in devpriv. */ | 1195 | * Usually this means copying a value stored in devpriv. */ |
1196 | static int pci230_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 1196 | static int pci230_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
1197 | struct comedi_insn * insn, unsigned int * data) | 1197 | struct comedi_insn *insn, unsigned int *data) |
1198 | { | 1198 | { |
1199 | int i; | 1199 | int i; |
1200 | int chan = CR_CHAN(insn->chanspec); | 1200 | int chan = CR_CHAN(insn->chanspec); |
@@ -1205,8 +1205,8 @@ static int pci230_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * | |||
1205 | return i; | 1205 | return i; |
1206 | } | 1206 | } |
1207 | 1207 | ||
1208 | static int pci230_ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 1208 | static int pci230_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
1209 | struct comedi_cmd * cmd) | 1209 | struct comedi_cmd *cmd) |
1210 | { | 1210 | { |
1211 | int err = 0; | 1211 | int err = 0; |
1212 | unsigned int tmp; | 1212 | unsigned int tmp; |
@@ -1418,8 +1418,8 @@ static int pci230_ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice | |||
1418 | return 0; | 1418 | return 0; |
1419 | } | 1419 | } |
1420 | 1420 | ||
1421 | static int pci230_ao_inttrig_scan_begin(struct comedi_device * dev, | 1421 | static int pci230_ao_inttrig_scan_begin(struct comedi_device *dev, |
1422 | struct comedi_subdevice * s, unsigned int trig_num) | 1422 | struct comedi_subdevice *s, unsigned int trig_num) |
1423 | { | 1423 | { |
1424 | unsigned long irqflags; | 1424 | unsigned long irqflags; |
1425 | 1425 | ||
@@ -1450,7 +1450,7 @@ static int pci230_ao_inttrig_scan_begin(struct comedi_device * dev, | |||
1450 | return 1; | 1450 | return 1; |
1451 | } | 1451 | } |
1452 | 1452 | ||
1453 | static void pci230_ao_start(struct comedi_device * dev, struct comedi_subdevice * s) | 1453 | static void pci230_ao_start(struct comedi_device *dev, struct comedi_subdevice *s) |
1454 | { | 1454 | { |
1455 | struct comedi_async *async = s->async; | 1455 | struct comedi_async *async = s->async; |
1456 | struct comedi_cmd *cmd = &async->cmd; | 1456 | struct comedi_cmd *cmd = &async->cmd; |
@@ -1538,7 +1538,7 @@ static void pci230_ao_start(struct comedi_device * dev, struct comedi_subdevice | |||
1538 | } | 1538 | } |
1539 | } | 1539 | } |
1540 | 1540 | ||
1541 | static int pci230_ao_inttrig_start(struct comedi_device * dev, struct comedi_subdevice * s, | 1541 | static int pci230_ao_inttrig_start(struct comedi_device *dev, struct comedi_subdevice *s, |
1542 | unsigned int trig_num) | 1542 | unsigned int trig_num) |
1543 | { | 1543 | { |
1544 | if (trig_num != 0) | 1544 | if (trig_num != 0) |
@@ -1550,7 +1550,7 @@ static int pci230_ao_inttrig_start(struct comedi_device * dev, struct comedi_sub | |||
1550 | return 1; | 1550 | return 1; |
1551 | } | 1551 | } |
1552 | 1552 | ||
1553 | static int pci230_ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 1553 | static int pci230_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
1554 | { | 1554 | { |
1555 | unsigned short daccon; | 1555 | unsigned short daccon; |
1556 | unsigned int range; | 1556 | unsigned int range; |
@@ -1626,7 +1626,7 @@ static int pci230_ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s | |||
1626 | return 0; | 1626 | return 0; |
1627 | } | 1627 | } |
1628 | 1628 | ||
1629 | static int pci230_ai_check_scan_period(struct comedi_cmd * cmd) | 1629 | static int pci230_ai_check_scan_period(struct comedi_cmd *cmd) |
1630 | { | 1630 | { |
1631 | unsigned int min_scan_period, chanlist_len; | 1631 | unsigned int min_scan_period, chanlist_len; |
1632 | int err = 0; | 1632 | int err = 0; |
@@ -1650,8 +1650,8 @@ static int pci230_ai_check_scan_period(struct comedi_cmd * cmd) | |||
1650 | return !err; | 1650 | return !err; |
1651 | } | 1651 | } |
1652 | 1652 | ||
1653 | static int pci230_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 1653 | static int pci230_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
1654 | struct comedi_cmd * cmd) | 1654 | struct comedi_cmd *cmd) |
1655 | { | 1655 | { |
1656 | int err = 0; | 1656 | int err = 0; |
1657 | unsigned int tmp; | 1657 | unsigned int tmp; |
@@ -2036,8 +2036,8 @@ static int pci230_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice | |||
2036 | return 0; | 2036 | return 0; |
2037 | } | 2037 | } |
2038 | 2038 | ||
2039 | static void pci230_ai_update_fifo_trigger_level(struct comedi_device * dev, | 2039 | static void pci230_ai_update_fifo_trigger_level(struct comedi_device *dev, |
2040 | struct comedi_subdevice * s) | 2040 | struct comedi_subdevice *s) |
2041 | { | 2041 | { |
2042 | struct comedi_cmd *cmd = &s->async->cmd; | 2042 | struct comedi_cmd *cmd = &s->async->cmd; |
2043 | unsigned int scanlen = cmd->scan_end_arg; | 2043 | unsigned int scanlen = cmd->scan_end_arg; |
@@ -2080,7 +2080,7 @@ static void pci230_ai_update_fifo_trigger_level(struct comedi_device * dev, | |||
2080 | } | 2080 | } |
2081 | } | 2081 | } |
2082 | 2082 | ||
2083 | static int pci230_ai_inttrig_convert(struct comedi_device * dev, struct comedi_subdevice * s, | 2083 | static int pci230_ai_inttrig_convert(struct comedi_device *dev, struct comedi_subdevice *s, |
2084 | unsigned int trig_num) | 2084 | unsigned int trig_num) |
2085 | { | 2085 | { |
2086 | unsigned long irqflags; | 2086 | unsigned long irqflags; |
@@ -2123,8 +2123,8 @@ static int pci230_ai_inttrig_convert(struct comedi_device * dev, struct comedi_s | |||
2123 | return 1; | 2123 | return 1; |
2124 | } | 2124 | } |
2125 | 2125 | ||
2126 | static int pci230_ai_inttrig_scan_begin(struct comedi_device * dev, | 2126 | static int pci230_ai_inttrig_scan_begin(struct comedi_device *dev, |
2127 | struct comedi_subdevice * s, unsigned int trig_num) | 2127 | struct comedi_subdevice *s, unsigned int trig_num) |
2128 | { | 2128 | { |
2129 | unsigned long irqflags; | 2129 | unsigned long irqflags; |
2130 | unsigned char zgat; | 2130 | unsigned char zgat; |
@@ -2145,7 +2145,7 @@ static int pci230_ai_inttrig_scan_begin(struct comedi_device * dev, | |||
2145 | return 1; | 2145 | return 1; |
2146 | } | 2146 | } |
2147 | 2147 | ||
2148 | static void pci230_ai_start(struct comedi_device * dev, struct comedi_subdevice * s) | 2148 | static void pci230_ai_start(struct comedi_device *dev, struct comedi_subdevice *s) |
2149 | { | 2149 | { |
2150 | unsigned long irqflags; | 2150 | unsigned long irqflags; |
2151 | unsigned short conv; | 2151 | unsigned short conv; |
@@ -2282,7 +2282,7 @@ static void pci230_ai_start(struct comedi_device * dev, struct comedi_subdevice | |||
2282 | } | 2282 | } |
2283 | } | 2283 | } |
2284 | 2284 | ||
2285 | static int pci230_ai_inttrig_start(struct comedi_device * dev, struct comedi_subdevice * s, | 2285 | static int pci230_ai_inttrig_start(struct comedi_device *dev, struct comedi_subdevice *s, |
2286 | unsigned int trig_num) | 2286 | unsigned int trig_num) |
2287 | { | 2287 | { |
2288 | if (trig_num != 0) | 2288 | if (trig_num != 0) |
@@ -2294,7 +2294,7 @@ static int pci230_ai_inttrig_start(struct comedi_device * dev, struct comedi_sub | |||
2294 | return 1; | 2294 | return 1; |
2295 | } | 2295 | } |
2296 | 2296 | ||
2297 | static int pci230_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 2297 | static int pci230_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
2298 | { | 2298 | { |
2299 | unsigned int i, chan, range, diff; | 2299 | unsigned int i, chan, range, diff; |
2300 | unsigned int res_mask; | 2300 | unsigned int res_mask; |
@@ -2534,7 +2534,7 @@ static void pci230_ns_to_single_timer(unsigned int *ns, unsigned int round) | |||
2534 | return; | 2534 | return; |
2535 | } | 2535 | } |
2536 | 2536 | ||
2537 | static void pci230_ct_setup_ns_mode(struct comedi_device * dev, unsigned int ct, | 2537 | static void pci230_ct_setup_ns_mode(struct comedi_device *dev, unsigned int ct, |
2538 | unsigned int mode, uint64_t ns, unsigned int round) | 2538 | unsigned int mode, uint64_t ns, unsigned int round) |
2539 | { | 2539 | { |
2540 | unsigned int clk_src; | 2540 | unsigned int clk_src; |
@@ -2553,7 +2553,7 @@ static void pci230_ct_setup_ns_mode(struct comedi_device * dev, unsigned int ct, | |||
2553 | i8254_write(devpriv->iobase1 + PCI230_Z2_CT_BASE, 0, ct, count); | 2553 | i8254_write(devpriv->iobase1 + PCI230_Z2_CT_BASE, 0, ct, count); |
2554 | } | 2554 | } |
2555 | 2555 | ||
2556 | static void pci230_cancel_ct(struct comedi_device * dev, unsigned int ct) | 2556 | static void pci230_cancel_ct(struct comedi_device *dev, unsigned int ct) |
2557 | { | 2557 | { |
2558 | i8254_set_mode(devpriv->iobase1 + PCI230_Z2_CT_BASE, 0, ct, | 2558 | i8254_set_mode(devpriv->iobase1 + PCI230_Z2_CT_BASE, 0, ct, |
2559 | I8254_MODE1); | 2559 | I8254_MODE1); |
@@ -2624,7 +2624,7 @@ static irqreturn_t pci230_interrupt(int irq, void *d) | |||
2624 | return IRQ_HANDLED; | 2624 | return IRQ_HANDLED; |
2625 | } | 2625 | } |
2626 | 2626 | ||
2627 | static void pci230_handle_ao_nofifo(struct comedi_device * dev, struct comedi_subdevice * s) | 2627 | static void pci230_handle_ao_nofifo(struct comedi_device *dev, struct comedi_subdevice *s) |
2628 | { | 2628 | { |
2629 | short data; | 2629 | short data; |
2630 | int i, ret; | 2630 | int i, ret; |
@@ -2661,7 +2661,7 @@ static void pci230_handle_ao_nofifo(struct comedi_device * dev, struct comedi_su | |||
2661 | 2661 | ||
2662 | /* Loads DAC FIFO (if using it) from buffer. */ | 2662 | /* Loads DAC FIFO (if using it) from buffer. */ |
2663 | /* Returns 0 if AO finished due to completion or error, 1 if still going. */ | 2663 | /* Returns 0 if AO finished due to completion or error, 1 if still going. */ |
2664 | static int pci230_handle_ao_fifo(struct comedi_device * dev, struct comedi_subdevice * s) | 2664 | static int pci230_handle_ao_fifo(struct comedi_device *dev, struct comedi_subdevice *s) |
2665 | { | 2665 | { |
2666 | struct comedi_async *async = s->async; | 2666 | struct comedi_async *async = s->async; |
2667 | struct comedi_cmd *cmd = &async->cmd; | 2667 | struct comedi_cmd *cmd = &async->cmd; |
@@ -2764,7 +2764,7 @@ static int pci230_handle_ao_fifo(struct comedi_device * dev, struct comedi_subde | |||
2764 | return running; | 2764 | return running; |
2765 | } | 2765 | } |
2766 | 2766 | ||
2767 | static void pci230_handle_ai(struct comedi_device * dev, struct comedi_subdevice * s) | 2767 | static void pci230_handle_ai(struct comedi_device *dev, struct comedi_subdevice *s) |
2768 | { | 2768 | { |
2769 | unsigned int events = 0; | 2769 | unsigned int events = 0; |
2770 | unsigned int status_fifo; | 2770 | unsigned int status_fifo; |
@@ -2863,7 +2863,7 @@ static void pci230_handle_ai(struct comedi_device * dev, struct comedi_subdevice | |||
2863 | } | 2863 | } |
2864 | } | 2864 | } |
2865 | 2865 | ||
2866 | static void pci230_ao_stop(struct comedi_device * dev, struct comedi_subdevice * s) | 2866 | static void pci230_ao_stop(struct comedi_device *dev, struct comedi_subdevice *s) |
2867 | { | 2867 | { |
2868 | unsigned long irqflags; | 2868 | unsigned long irqflags; |
2869 | unsigned char intsrc; | 2869 | unsigned char intsrc; |
@@ -2918,13 +2918,13 @@ static void pci230_ao_stop(struct comedi_device * dev, struct comedi_subdevice * | |||
2918 | put_all_resources(dev, OWNER_AOCMD); | 2918 | put_all_resources(dev, OWNER_AOCMD); |
2919 | } | 2919 | } |
2920 | 2920 | ||
2921 | static int pci230_ao_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 2921 | static int pci230_ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
2922 | { | 2922 | { |
2923 | pci230_ao_stop(dev, s); | 2923 | pci230_ao_stop(dev, s); |
2924 | return 0; | 2924 | return 0; |
2925 | } | 2925 | } |
2926 | 2926 | ||
2927 | static void pci230_ai_stop(struct comedi_device * dev, struct comedi_subdevice * s) | 2927 | static void pci230_ai_stop(struct comedi_device *dev, struct comedi_subdevice *s) |
2928 | { | 2928 | { |
2929 | unsigned long irqflags; | 2929 | unsigned long irqflags; |
2930 | struct comedi_cmd *cmd; | 2930 | struct comedi_cmd *cmd; |
@@ -2972,7 +2972,7 @@ static void pci230_ai_stop(struct comedi_device * dev, struct comedi_subdevice * | |||
2972 | put_all_resources(dev, OWNER_AICMD); | 2972 | put_all_resources(dev, OWNER_AICMD); |
2973 | } | 2973 | } |
2974 | 2974 | ||
2975 | static int pci230_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 2975 | static int pci230_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
2976 | { | 2976 | { |
2977 | pci230_ai_stop(dev, s); | 2977 | pci230_ai_stop(dev, s); |
2978 | return 0; | 2978 | return 0; |
diff --git a/drivers/staging/comedi/drivers/c6xdigio.c b/drivers/staging/comedi/drivers/c6xdigio.c index c8ffddf4add..23263ed5753 100644 --- a/drivers/staging/comedi/drivers/c6xdigio.c +++ b/drivers/staging/comedi/drivers/c6xdigio.c | |||
@@ -97,8 +97,8 @@ union encvaluetype { | |||
97 | 97 | ||
98 | #define C6XDIGIO_TIME_OUT 20 | 98 | #define C6XDIGIO_TIME_OUT 20 |
99 | 99 | ||
100 | static int c6xdigio_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 100 | static int c6xdigio_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
101 | static int c6xdigio_detach(struct comedi_device * dev); | 101 | static int c6xdigio_detach(struct comedi_device *dev); |
102 | struct comedi_driver driver_c6xdigio = { | 102 | struct comedi_driver driver_c6xdigio = { |
103 | driver_name:"c6xdigio", | 103 | driver_name:"c6xdigio", |
104 | module:THIS_MODULE, | 104 | module:THIS_MODULE, |
@@ -338,15 +338,15 @@ static void C6X_encResetAll(unsigned long baseAddr) | |||
338 | } | 338 | } |
339 | } | 339 | } |
340 | 340 | ||
341 | static int c6xdigio_pwmo_insn_read(struct comedi_device * dev, | 341 | static int c6xdigio_pwmo_insn_read(struct comedi_device *dev, |
342 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 342 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
343 | { | 343 | { |
344 | printk("c6xdigio_pwmo_insn_read %x\n", insn->n); | 344 | printk("c6xdigio_pwmo_insn_read %x\n", insn->n); |
345 | return insn->n; | 345 | return insn->n; |
346 | } | 346 | } |
347 | 347 | ||
348 | static int c6xdigio_pwmo_insn_write(struct comedi_device * dev, | 348 | static int c6xdigio_pwmo_insn_write(struct comedi_device *dev, |
349 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 349 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
350 | { | 350 | { |
351 | int i; | 351 | int i; |
352 | int chan = CR_CHAN(insn->chanspec); | 352 | int chan = CR_CHAN(insn->chanspec); |
@@ -379,8 +379,8 @@ static int c6xdigio_pwmo_insn_write(struct comedi_device * dev, | |||
379 | /* *//* return insn->n; */ | 379 | /* *//* return insn->n; */ |
380 | /* } */ | 380 | /* } */ |
381 | 381 | ||
382 | static int c6xdigio_ei_insn_read(struct comedi_device * dev, | 382 | static int c6xdigio_ei_insn_read(struct comedi_device *dev, |
383 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 383 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
384 | { | 384 | { |
385 | /* printk("c6xdigio_ei__insn_read %x\n", insn->n); */ | 385 | /* printk("c6xdigio_ei__insn_read %x\n", insn->n); */ |
386 | int n; | 386 | int n; |
@@ -393,7 +393,7 @@ static int c6xdigio_ei_insn_read(struct comedi_device * dev, | |||
393 | return n; | 393 | return n; |
394 | } | 394 | } |
395 | 395 | ||
396 | static void board_init(struct comedi_device * dev) | 396 | static void board_init(struct comedi_device *dev) |
397 | { | 397 | { |
398 | 398 | ||
399 | /* printk("Inside board_init\n"); */ | 399 | /* printk("Inside board_init\n"); */ |
@@ -426,7 +426,7 @@ static struct pnp_driver c6xdigio_pnp_driver = { | |||
426 | .id_table = c6xdigio_pnp_tbl, | 426 | .id_table = c6xdigio_pnp_tbl, |
427 | }; | 427 | }; |
428 | 428 | ||
429 | static int c6xdigio_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 429 | static int c6xdigio_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
430 | { | 430 | { |
431 | int result = 0; | 431 | int result = 0; |
432 | unsigned long iobase; | 432 | unsigned long iobase; |
@@ -495,7 +495,7 @@ static int c6xdigio_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
495 | return 0; | 495 | return 0; |
496 | } | 496 | } |
497 | 497 | ||
498 | static int c6xdigio_detach(struct comedi_device * dev) | 498 | static int c6xdigio_detach(struct comedi_device *dev) |
499 | { | 499 | { |
500 | /* board_halt(dev); may not need this */ | 500 | /* board_halt(dev); may not need this */ |
501 | 501 | ||
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c index e7ba3e4288a..8e07a52e4d1 100644 --- a/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/drivers/staging/comedi/drivers/cb_das16_cs.c | |||
@@ -89,8 +89,8 @@ struct das16cs_private { | |||
89 | }; | 89 | }; |
90 | #define devpriv ((struct das16cs_private *)dev->private) | 90 | #define devpriv ((struct das16cs_private *)dev->private) |
91 | 91 | ||
92 | static int das16cs_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 92 | static int das16cs_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
93 | static int das16cs_detach(struct comedi_device * dev); | 93 | static int das16cs_detach(struct comedi_device *dev); |
94 | static struct comedi_driver driver_das16cs = { | 94 | static struct comedi_driver driver_das16cs = { |
95 | driver_name:"cb_das16_cs", | 95 | driver_name:"cb_das16_cs", |
96 | module:THIS_MODULE, | 96 | module:THIS_MODULE, |
@@ -165,7 +165,7 @@ static const struct das16cs_board *das16cs_probe(struct comedi_device * dev, | |||
165 | return NULL; | 165 | return NULL; |
166 | } | 166 | } |
167 | 167 | ||
168 | static int das16cs_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 168 | static int das16cs_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
169 | { | 169 | { |
170 | struct pcmcia_device *link; | 170 | struct pcmcia_device *link; |
171 | struct comedi_subdevice *s; | 171 | struct comedi_subdevice *s; |
@@ -265,7 +265,7 @@ static int das16cs_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
265 | return 1; | 265 | return 1; |
266 | } | 266 | } |
267 | 267 | ||
268 | static int das16cs_detach(struct comedi_device * dev) | 268 | static int das16cs_detach(struct comedi_device *dev) |
269 | { | 269 | { |
270 | printk("comedi%d: das16cs: remove\n", dev->minor); | 270 | printk("comedi%d: das16cs: remove\n", dev->minor); |
271 | 271 | ||
@@ -286,8 +286,8 @@ static irqreturn_t das16cs_interrupt(int irq, void *d) | |||
286 | * "instructions" read/write data in "one-shot" or "software-triggered" | 286 | * "instructions" read/write data in "one-shot" or "software-triggered" |
287 | * mode. | 287 | * mode. |
288 | */ | 288 | */ |
289 | static int das16cs_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 289 | static int das16cs_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
290 | struct comedi_insn * insn, unsigned int * data) | 290 | struct comedi_insn *insn, unsigned int *data) |
291 | { | 291 | { |
292 | int i; | 292 | int i; |
293 | int to; | 293 | int to; |
@@ -328,13 +328,13 @@ static int das16cs_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice | |||
328 | return i; | 328 | return i; |
329 | } | 329 | } |
330 | 330 | ||
331 | static int das16cs_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 331 | static int das16cs_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
332 | { | 332 | { |
333 | return -EINVAL; | 333 | return -EINVAL; |
334 | } | 334 | } |
335 | 335 | ||
336 | static int das16cs_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 336 | static int das16cs_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
337 | struct comedi_cmd * cmd) | 337 | struct comedi_cmd *cmd) |
338 | { | 338 | { |
339 | int err = 0; | 339 | int err = 0; |
340 | int tmp; | 340 | int tmp; |
@@ -489,8 +489,8 @@ static int das16cs_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevic | |||
489 | return 0; | 489 | return 0; |
490 | } | 490 | } |
491 | 491 | ||
492 | static int das16cs_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 492 | static int das16cs_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
493 | struct comedi_insn * insn, unsigned int * data) | 493 | struct comedi_insn *insn, unsigned int *data) |
494 | { | 494 | { |
495 | int i; | 495 | int i; |
496 | int chan = CR_CHAN(insn->chanspec); | 496 | int chan = CR_CHAN(insn->chanspec); |
@@ -535,8 +535,8 @@ static int das16cs_ao_winsn(struct comedi_device * dev, struct comedi_subdevice | |||
535 | 535 | ||
536 | /* AO subdevices should have a read insn as well as a write insn. | 536 | /* AO subdevices should have a read insn as well as a write insn. |
537 | * Usually this means copying a value stored in devpriv. */ | 537 | * Usually this means copying a value stored in devpriv. */ |
538 | static int das16cs_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 538 | static int das16cs_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
539 | struct comedi_insn * insn, unsigned int * data) | 539 | struct comedi_insn *insn, unsigned int *data) |
540 | { | 540 | { |
541 | int i; | 541 | int i; |
542 | int chan = CR_CHAN(insn->chanspec); | 542 | int chan = CR_CHAN(insn->chanspec); |
@@ -552,8 +552,8 @@ static int das16cs_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice | |||
552 | * useful to applications if you implement the insn_bits interface. | 552 | * useful to applications if you implement the insn_bits interface. |
553 | * This allows packed reading/writing of the DIO channels. The | 553 | * This allows packed reading/writing of the DIO channels. The |
554 | * comedi core can convert between insn_bits and insn_read/write */ | 554 | * comedi core can convert between insn_bits and insn_read/write */ |
555 | static int das16cs_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 555 | static int das16cs_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
556 | struct comedi_insn * insn, unsigned int * data) | 556 | struct comedi_insn *insn, unsigned int *data) |
557 | { | 557 | { |
558 | if (insn->n != 2) | 558 | if (insn->n != 2) |
559 | return -EINVAL; | 559 | return -EINVAL; |
@@ -572,8 +572,8 @@ static int das16cs_dio_insn_bits(struct comedi_device * dev, struct comedi_subde | |||
572 | return 2; | 572 | return 2; |
573 | } | 573 | } |
574 | 574 | ||
575 | static int das16cs_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 575 | static int das16cs_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
576 | struct comedi_insn * insn, unsigned int * data) | 576 | struct comedi_insn *insn, unsigned int *data) |
577 | { | 577 | { |
578 | int chan = CR_CHAN(insn->chanspec); | 578 | int chan = CR_CHAN(insn->chanspec); |
579 | int bits; | 579 | int bits; |
@@ -610,14 +610,14 @@ static int das16cs_dio_insn_config(struct comedi_device * dev, struct comedi_sub | |||
610 | return insn->n; | 610 | return insn->n; |
611 | } | 611 | } |
612 | 612 | ||
613 | static int das16cs_timer_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 613 | static int das16cs_timer_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
614 | struct comedi_insn * insn, unsigned int * data) | 614 | struct comedi_insn *insn, unsigned int *data) |
615 | { | 615 | { |
616 | return -EINVAL; | 616 | return -EINVAL; |
617 | } | 617 | } |
618 | 618 | ||
619 | static int das16cs_timer_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 619 | static int das16cs_timer_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
620 | struct comedi_insn * insn, unsigned int * data) | 620 | struct comedi_insn *insn, unsigned int *data) |
621 | { | 621 | { |
622 | return -EINVAL; | 622 | return -EINVAL; |
623 | } | 623 | } |
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c index 0b09fc9bd4f..a7b75808bda 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas.c +++ b/drivers/staging/comedi/drivers/cb_pcidas.c | |||
@@ -441,8 +441,8 @@ struct cb_pcidas_private { | |||
441 | * the board, and also about the kernel module that contains | 441 | * the board, and also about the kernel module that contains |
442 | * the device code. | 442 | * the device code. |
443 | */ | 443 | */ |
444 | static int cb_pcidas_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 444 | static int cb_pcidas_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
445 | static int cb_pcidas_detach(struct comedi_device * dev); | 445 | static int cb_pcidas_detach(struct comedi_device *dev); |
446 | static struct comedi_driver driver_cb_pcidas = { | 446 | static struct comedi_driver driver_cb_pcidas = { |
447 | driver_name:"cb_pcidas", | 447 | driver_name:"cb_pcidas", |
448 | module:THIS_MODULE, | 448 | module:THIS_MODULE, |
@@ -509,7 +509,7 @@ static inline unsigned int cal_enable_bits(struct comedi_device * dev) | |||
509 | * Attach is called by the Comedi core to configure the driver | 509 | * Attach is called by the Comedi core to configure the driver |
510 | * for a particular board. | 510 | * for a particular board. |
511 | */ | 511 | */ |
512 | static int cb_pcidas_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 512 | static int cb_pcidas_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
513 | { | 513 | { |
514 | struct comedi_subdevice *s; | 514 | struct comedi_subdevice *s; |
515 | struct pci_dev *pcidev; | 515 | struct pci_dev *pcidev; |
@@ -720,7 +720,7 @@ static int cb_pcidas_attach(struct comedi_device * dev, struct comedi_devconfig | |||
720 | * allocated by _attach(). dev->private and dev->subdevices are | 720 | * allocated by _attach(). dev->private and dev->subdevices are |
721 | * deallocated automatically by the core. | 721 | * deallocated automatically by the core. |
722 | */ | 722 | */ |
723 | static int cb_pcidas_detach(struct comedi_device * dev) | 723 | static int cb_pcidas_detach(struct comedi_device *dev) |
724 | { | 724 | { |
725 | printk("comedi%d: cb_pcidas: remove\n", dev->minor); | 725 | printk("comedi%d: cb_pcidas: remove\n", dev->minor); |
726 | 726 | ||
@@ -754,8 +754,8 @@ static int cb_pcidas_detach(struct comedi_device * dev) | |||
754 | * "instructions" read/write data in "one-shot" or "software-triggered" | 754 | * "instructions" read/write data in "one-shot" or "software-triggered" |
755 | * mode. | 755 | * mode. |
756 | */ | 756 | */ |
757 | static int cb_pcidas_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 757 | static int cb_pcidas_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
758 | struct comedi_insn * insn, unsigned int * data) | 758 | struct comedi_insn *insn, unsigned int *data) |
759 | { | 759 | { |
760 | int n, i; | 760 | int n, i; |
761 | unsigned int bits; | 761 | unsigned int bits; |
@@ -806,7 +806,7 @@ static int cb_pcidas_ai_rinsn(struct comedi_device * dev, struct comedi_subdevic | |||
806 | return n; | 806 | return n; |
807 | } | 807 | } |
808 | 808 | ||
809 | static int ai_config_calibration_source(struct comedi_device * dev, unsigned int * data) | 809 | static int ai_config_calibration_source(struct comedi_device *dev, unsigned int *data) |
810 | { | 810 | { |
811 | static const int num_calibration_sources = 8; | 811 | static const int num_calibration_sources = 8; |
812 | unsigned int source = data[1]; | 812 | unsigned int source = data[1]; |
@@ -821,8 +821,8 @@ static int ai_config_calibration_source(struct comedi_device * dev, unsigned int | |||
821 | return 2; | 821 | return 2; |
822 | } | 822 | } |
823 | 823 | ||
824 | static int ai_config_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 824 | static int ai_config_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
825 | struct comedi_insn * insn, unsigned int * data) | 825 | struct comedi_insn *insn, unsigned int *data) |
826 | { | 826 | { |
827 | int id = data[0]; | 827 | int id = data[0]; |
828 | 828 | ||
@@ -838,8 +838,8 @@ static int ai_config_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
838 | } | 838 | } |
839 | 839 | ||
840 | /* analog output insn for pcidas-1000 and 1200 series */ | 840 | /* analog output insn for pcidas-1000 and 1200 series */ |
841 | static int cb_pcidas_ao_nofifo_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 841 | static int cb_pcidas_ao_nofifo_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
842 | struct comedi_insn * insn, unsigned int * data) | 842 | struct comedi_insn *insn, unsigned int *data) |
843 | { | 843 | { |
844 | int channel; | 844 | int channel; |
845 | unsigned long flags; | 845 | unsigned long flags; |
@@ -863,8 +863,8 @@ static int cb_pcidas_ao_nofifo_winsn(struct comedi_device * dev, struct comedi_s | |||
863 | } | 863 | } |
864 | 864 | ||
865 | /* analog output insn for pcidas-1602 series */ | 865 | /* analog output insn for pcidas-1602 series */ |
866 | static int cb_pcidas_ao_fifo_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 866 | static int cb_pcidas_ao_fifo_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
867 | struct comedi_insn * insn, unsigned int * data) | 867 | struct comedi_insn *insn, unsigned int *data) |
868 | { | 868 | { |
869 | int channel; | 869 | int channel; |
870 | unsigned long flags; | 870 | unsigned long flags; |
@@ -894,16 +894,16 @@ static int cb_pcidas_ao_fifo_winsn(struct comedi_device * dev, struct comedi_sub | |||
894 | 894 | ||
895 | /* analog output readback insn */ | 895 | /* analog output readback insn */ |
896 | /* XXX loses track of analog output value back after an analog ouput command is executed */ | 896 | /* XXX loses track of analog output value back after an analog ouput command is executed */ |
897 | static int cb_pcidas_ao_readback_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 897 | static int cb_pcidas_ao_readback_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
898 | struct comedi_insn * insn, unsigned int * data) | 898 | struct comedi_insn *insn, unsigned int *data) |
899 | { | 899 | { |
900 | data[0] = devpriv->ao_value[CR_CHAN(insn->chanspec)]; | 900 | data[0] = devpriv->ao_value[CR_CHAN(insn->chanspec)]; |
901 | 901 | ||
902 | return 1; | 902 | return 1; |
903 | } | 903 | } |
904 | 904 | ||
905 | static int eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 905 | static int eeprom_read_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
906 | struct comedi_insn * insn, unsigned int * data) | 906 | struct comedi_insn *insn, unsigned int *data) |
907 | { | 907 | { |
908 | uint8_t nvram_data; | 908 | uint8_t nvram_data; |
909 | int retval; | 909 | int retval; |
@@ -917,16 +917,16 @@ static int eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice | |||
917 | return 1; | 917 | return 1; |
918 | } | 918 | } |
919 | 919 | ||
920 | static int caldac_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 920 | static int caldac_write_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
921 | struct comedi_insn * insn, unsigned int * data) | 921 | struct comedi_insn *insn, unsigned int *data) |
922 | { | 922 | { |
923 | const unsigned int channel = CR_CHAN(insn->chanspec); | 923 | const unsigned int channel = CR_CHAN(insn->chanspec); |
924 | 924 | ||
925 | return caldac_8800_write(dev, channel, data[0]); | 925 | return caldac_8800_write(dev, channel, data[0]); |
926 | } | 926 | } |
927 | 927 | ||
928 | static int caldac_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 928 | static int caldac_read_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
929 | struct comedi_insn * insn, unsigned int * data) | 929 | struct comedi_insn *insn, unsigned int *data) |
930 | { | 930 | { |
931 | data[0] = devpriv->caldac_value[CR_CHAN(insn->chanspec)]; | 931 | data[0] = devpriv->caldac_value[CR_CHAN(insn->chanspec)]; |
932 | 932 | ||
@@ -934,7 +934,7 @@ static int caldac_read_insn(struct comedi_device * dev, struct comedi_subdevice | |||
934 | } | 934 | } |
935 | 935 | ||
936 | /* 1602/16 pregain offset */ | 936 | /* 1602/16 pregain offset */ |
937 | static int dac08_write(struct comedi_device * dev, unsigned int value) | 937 | static int dac08_write(struct comedi_device *dev, unsigned int value) |
938 | { | 938 | { |
939 | if (devpriv->dac08_value == value) | 939 | if (devpriv->dac08_value == value) |
940 | return 1; | 940 | return 1; |
@@ -954,21 +954,21 @@ static int dac08_write(struct comedi_device * dev, unsigned int value) | |||
954 | return 1; | 954 | return 1; |
955 | } | 955 | } |
956 | 956 | ||
957 | static int dac08_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 957 | static int dac08_write_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
958 | struct comedi_insn * insn, unsigned int * data) | 958 | struct comedi_insn *insn, unsigned int *data) |
959 | { | 959 | { |
960 | return dac08_write(dev, data[0]); | 960 | return dac08_write(dev, data[0]); |
961 | } | 961 | } |
962 | 962 | ||
963 | static int dac08_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 963 | static int dac08_read_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
964 | struct comedi_insn * insn, unsigned int * data) | 964 | struct comedi_insn *insn, unsigned int *data) |
965 | { | 965 | { |
966 | data[0] = devpriv->dac08_value; | 966 | data[0] = devpriv->dac08_value; |
967 | 967 | ||
968 | return 1; | 968 | return 1; |
969 | } | 969 | } |
970 | 970 | ||
971 | static int cb_pcidas_trimpot_write(struct comedi_device * dev, | 971 | static int cb_pcidas_trimpot_write(struct comedi_device *dev, |
972 | unsigned int channel, unsigned int value) | 972 | unsigned int channel, unsigned int value) |
973 | { | 973 | { |
974 | if (devpriv->trimpot_value[channel] == value) | 974 | if (devpriv->trimpot_value[channel] == value) |
@@ -991,16 +991,16 @@ static int cb_pcidas_trimpot_write(struct comedi_device * dev, | |||
991 | return 1; | 991 | return 1; |
992 | } | 992 | } |
993 | 993 | ||
994 | static int trimpot_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 994 | static int trimpot_write_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
995 | struct comedi_insn * insn, unsigned int * data) | 995 | struct comedi_insn *insn, unsigned int *data) |
996 | { | 996 | { |
997 | unsigned int channel = CR_CHAN(insn->chanspec); | 997 | unsigned int channel = CR_CHAN(insn->chanspec); |
998 | 998 | ||
999 | return cb_pcidas_trimpot_write(dev, channel, data[0]); | 999 | return cb_pcidas_trimpot_write(dev, channel, data[0]); |
1000 | } | 1000 | } |
1001 | 1001 | ||
1002 | static int trimpot_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 1002 | static int trimpot_read_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
1003 | struct comedi_insn * insn, unsigned int * data) | 1003 | struct comedi_insn *insn, unsigned int *data) |
1004 | { | 1004 | { |
1005 | unsigned int channel = CR_CHAN(insn->chanspec); | 1005 | unsigned int channel = CR_CHAN(insn->chanspec); |
1006 | 1006 | ||
@@ -1009,8 +1009,8 @@ static int trimpot_read_insn(struct comedi_device * dev, struct comedi_subdevice | |||
1009 | return 1; | 1009 | return 1; |
1010 | } | 1010 | } |
1011 | 1011 | ||
1012 | static int cb_pcidas_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 1012 | static int cb_pcidas_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
1013 | struct comedi_cmd * cmd) | 1013 | struct comedi_cmd *cmd) |
1014 | { | 1014 | { |
1015 | int err = 0; | 1015 | int err = 0; |
1016 | int tmp; | 1016 | int tmp; |
@@ -1164,7 +1164,7 @@ static int cb_pcidas_ai_cmdtest(struct comedi_device * dev, struct comedi_subdev | |||
1164 | return 0; | 1164 | return 0; |
1165 | } | 1165 | } |
1166 | 1166 | ||
1167 | static int cb_pcidas_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 1167 | static int cb_pcidas_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
1168 | { | 1168 | { |
1169 | struct comedi_async *async = s->async; | 1169 | struct comedi_async *async = s->async; |
1170 | struct comedi_cmd *cmd = &async->cmd; | 1170 | struct comedi_cmd *cmd = &async->cmd; |
@@ -1251,8 +1251,8 @@ static int cb_pcidas_ai_cmd(struct comedi_device * dev, struct comedi_subdevice | |||
1251 | return 0; | 1251 | return 0; |
1252 | } | 1252 | } |
1253 | 1253 | ||
1254 | static int cb_pcidas_ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 1254 | static int cb_pcidas_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
1255 | struct comedi_cmd * cmd) | 1255 | struct comedi_cmd *cmd) |
1256 | { | 1256 | { |
1257 | int err = 0; | 1257 | int err = 0; |
1258 | int tmp; | 1258 | int tmp; |
@@ -1364,7 +1364,7 @@ static int cb_pcidas_ao_cmdtest(struct comedi_device * dev, struct comedi_subdev | |||
1364 | return 0; | 1364 | return 0; |
1365 | } | 1365 | } |
1366 | 1366 | ||
1367 | static int cb_pcidas_ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 1367 | static int cb_pcidas_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
1368 | { | 1368 | { |
1369 | struct comedi_async *async = s->async; | 1369 | struct comedi_async *async = s->async; |
1370 | struct comedi_cmd *cmd = &async->cmd; | 1370 | struct comedi_cmd *cmd = &async->cmd; |
@@ -1589,7 +1589,7 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d) | |||
1589 | return IRQ_HANDLED; | 1589 | return IRQ_HANDLED; |
1590 | } | 1590 | } |
1591 | 1591 | ||
1592 | static void handle_ao_interrupt(struct comedi_device * dev, unsigned int status) | 1592 | static void handle_ao_interrupt(struct comedi_device *dev, unsigned int status) |
1593 | { | 1593 | { |
1594 | struct comedi_subdevice *s = dev->write_subdev; | 1594 | struct comedi_subdevice *s = dev->write_subdev; |
1595 | struct comedi_async *async = s->async; | 1595 | struct comedi_async *async = s->async; |
@@ -1646,7 +1646,7 @@ static void handle_ao_interrupt(struct comedi_device * dev, unsigned int status) | |||
1646 | } | 1646 | } |
1647 | 1647 | ||
1648 | /* cancel analog input command */ | 1648 | /* cancel analog input command */ |
1649 | static int cb_pcidas_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 1649 | static int cb_pcidas_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
1650 | { | 1650 | { |
1651 | unsigned long flags; | 1651 | unsigned long flags; |
1652 | 1652 | ||
@@ -1683,7 +1683,7 @@ static int cb_pcidas_ao_cancel(struct comedi_device *dev, | |||
1683 | return 0; | 1683 | return 0; |
1684 | } | 1684 | } |
1685 | 1685 | ||
1686 | static void cb_pcidas_load_counters(struct comedi_device * dev, unsigned int *ns, | 1686 | static void cb_pcidas_load_counters(struct comedi_device *dev, unsigned int *ns, |
1687 | int rounding_flags) | 1687 | int rounding_flags) |
1688 | { | 1688 | { |
1689 | i8253_cascade_ns_to_timer_2div(TIMER_BASE, &(devpriv->divisor1), | 1689 | i8253_cascade_ns_to_timer_2div(TIMER_BASE, &(devpriv->divisor1), |
@@ -1696,7 +1696,7 @@ static void cb_pcidas_load_counters(struct comedi_device * dev, unsigned int *ns | |||
1696 | devpriv->divisor2, 2); | 1696 | devpriv->divisor2, 2); |
1697 | } | 1697 | } |
1698 | 1698 | ||
1699 | static void write_calibration_bitstream(struct comedi_device * dev, | 1699 | static void write_calibration_bitstream(struct comedi_device *dev, |
1700 | unsigned int register_bits, unsigned int bitstream, | 1700 | unsigned int register_bits, unsigned int bitstream, |
1701 | unsigned int bitstream_length) | 1701 | unsigned int bitstream_length) |
1702 | { | 1702 | { |
@@ -1713,7 +1713,7 @@ static void write_calibration_bitstream(struct comedi_device * dev, | |||
1713 | } | 1713 | } |
1714 | } | 1714 | } |
1715 | 1715 | ||
1716 | static int caldac_8800_write(struct comedi_device * dev, unsigned int address, | 1716 | static int caldac_8800_write(struct comedi_device *dev, unsigned int address, |
1717 | uint8_t value) | 1717 | uint8_t value) |
1718 | { | 1718 | { |
1719 | static const int num_caldac_channels = 8; | 1719 | static const int num_caldac_channels = 8; |
@@ -1743,7 +1743,7 @@ static int caldac_8800_write(struct comedi_device * dev, unsigned int address, | |||
1743 | return 1; | 1743 | return 1; |
1744 | } | 1744 | } |
1745 | 1745 | ||
1746 | static int trimpot_7376_write(struct comedi_device * dev, uint8_t value) | 1746 | static int trimpot_7376_write(struct comedi_device *dev, uint8_t value) |
1747 | { | 1747 | { |
1748 | static const int bitstream_length = 7; | 1748 | static const int bitstream_length = 7; |
1749 | unsigned int bitstream = value & 0x7f; | 1749 | unsigned int bitstream = value & 0x7f; |
@@ -1766,7 +1766,7 @@ static int trimpot_7376_write(struct comedi_device * dev, uint8_t value) | |||
1766 | /* For 1602/16 only | 1766 | /* For 1602/16 only |
1767 | * ch 0 : adc gain | 1767 | * ch 0 : adc gain |
1768 | * ch 1 : adc postgain offset */ | 1768 | * ch 1 : adc postgain offset */ |
1769 | static int trimpot_8402_write(struct comedi_device * dev, unsigned int channel, | 1769 | static int trimpot_8402_write(struct comedi_device *dev, unsigned int channel, |
1770 | uint8_t value) | 1770 | uint8_t value) |
1771 | { | 1771 | { |
1772 | static const int bitstream_length = 10; | 1772 | static const int bitstream_length = 10; |
@@ -1802,7 +1802,7 @@ static int wait_for_nvram_ready(unsigned long s5933_base_addr) | |||
1802 | return -1; | 1802 | return -1; |
1803 | } | 1803 | } |
1804 | 1804 | ||
1805 | static int nvram_read(struct comedi_device * dev, unsigned int address, uint8_t * data) | 1805 | static int nvram_read(struct comedi_device *dev, unsigned int address, uint8_t *data) |
1806 | { | 1806 | { |
1807 | unsigned long iobase = devpriv->s5933_config; | 1807 | unsigned long iobase = devpriv->s5933_config; |
1808 | 1808 | ||
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c index 10401d91113..ba465c43240 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/drivers/staging/comedi/drivers/cb_pcidas64.c | |||
@@ -585,7 +585,7 @@ static const struct hw_fifo_info ai_fifo_60xx = { | |||
585 | #define MAX_AI_DMA_RING_COUNT (0x80000 / DMA_BUFFER_SIZE) | 585 | #define MAX_AI_DMA_RING_COUNT (0x80000 / DMA_BUFFER_SIZE) |
586 | #define MIN_AI_DMA_RING_COUNT (0x10000 / DMA_BUFFER_SIZE) | 586 | #define MIN_AI_DMA_RING_COUNT (0x10000 / DMA_BUFFER_SIZE) |
587 | #define AO_DMA_RING_COUNT (0x10000 / DMA_BUFFER_SIZE) | 587 | #define AO_DMA_RING_COUNT (0x10000 / DMA_BUFFER_SIZE) |
588 | static inline unsigned int ai_dma_ring_count(struct pcidas64_board * board) | 588 | static inline unsigned int ai_dma_ring_count(struct pcidas64_board *board) |
589 | { | 589 | { |
590 | if (board->layout == LAYOUT_4020) | 590 | if (board->layout == LAYOUT_4020) |
591 | return MAX_AI_DMA_RING_COUNT; | 591 | return MAX_AI_DMA_RING_COUNT; |
@@ -1050,7 +1050,7 @@ static inline struct pcidas64_board *board(const struct comedi_device * dev) | |||
1050 | return (struct pcidas64_board *) dev->board_ptr; | 1050 | return (struct pcidas64_board *) dev->board_ptr; |
1051 | } | 1051 | } |
1052 | 1052 | ||
1053 | static inline unsigned short se_diff_bit_6xxx(struct comedi_device * dev, | 1053 | static inline unsigned short se_diff_bit_6xxx(struct comedi_device *dev, |
1054 | int use_differential) | 1054 | int use_differential) |
1055 | { | 1055 | { |
1056 | if ((board(dev)->layout == LAYOUT_64XX && !use_differential) || | 1056 | if ((board(dev)->layout == LAYOUT_64XX && !use_differential) || |
@@ -1128,8 +1128,8 @@ static inline struct pcidas64_private *priv(struct comedi_device * dev) | |||
1128 | * the board, and also about the kernel module that contains | 1128 | * the board, and also about the kernel module that contains |
1129 | * the device code. | 1129 | * the device code. |
1130 | */ | 1130 | */ |
1131 | static int attach(struct comedi_device * dev, struct comedi_devconfig * it); | 1131 | static int attach(struct comedi_device *dev, struct comedi_devconfig *it); |
1132 | static int detach(struct comedi_device * dev); | 1132 | static int detach(struct comedi_device *dev); |
1133 | static struct comedi_driver driver_cb_pcidas = { | 1133 | static struct comedi_driver driver_cb_pcidas = { |
1134 | driver_name:"cb_pcidas64", | 1134 | driver_name:"cb_pcidas64", |
1135 | module:THIS_MODULE, | 1135 | module:THIS_MODULE, |
@@ -1247,7 +1247,7 @@ static unsigned int ai_range_bits_6xxx(const struct comedi_device * dev, | |||
1247 | return bits; | 1247 | return bits; |
1248 | } | 1248 | } |
1249 | 1249 | ||
1250 | static unsigned int hw_revision(const struct comedi_device * dev, | 1250 | static unsigned int hw_revision(const struct comedi_device *dev, |
1251 | uint16_t hw_status_bits) | 1251 | uint16_t hw_status_bits) |
1252 | { | 1252 | { |
1253 | if (board(dev)->layout == LAYOUT_4020) | 1253 | if (board(dev)->layout == LAYOUT_4020) |
@@ -1256,7 +1256,7 @@ static unsigned int hw_revision(const struct comedi_device * dev, | |||
1256 | return (hw_status_bits >> 12) & 0xf; | 1256 | return (hw_status_bits >> 12) & 0xf; |
1257 | } | 1257 | } |
1258 | 1258 | ||
1259 | static void set_dac_range_bits(struct comedi_device * dev, volatile uint16_t * bits, | 1259 | static void set_dac_range_bits(struct comedi_device *dev, volatile uint16_t *bits, |
1260 | unsigned int channel, unsigned int range) | 1260 | unsigned int channel, unsigned int range) |
1261 | { | 1261 | { |
1262 | unsigned int code = board(dev)->ao_range_code[range]; | 1262 | unsigned int code = board(dev)->ao_range_code[range]; |
@@ -1270,13 +1270,13 @@ static void set_dac_range_bits(struct comedi_device * dev, volatile uint16_t * b | |||
1270 | *bits |= code << (2 * channel); | 1270 | *bits |= code << (2 * channel); |
1271 | }; | 1271 | }; |
1272 | 1272 | ||
1273 | static inline int ao_cmd_is_supported(const struct pcidas64_board * board) | 1273 | static inline int ao_cmd_is_supported(const struct pcidas64_board *board) |
1274 | { | 1274 | { |
1275 | return board->ao_nchan && board->layout != LAYOUT_4020; | 1275 | return board->ao_nchan && board->layout != LAYOUT_4020; |
1276 | } | 1276 | } |
1277 | 1277 | ||
1278 | /* initialize plx9080 chip */ | 1278 | /* initialize plx9080 chip */ |
1279 | static void init_plx9080(struct comedi_device * dev) | 1279 | static void init_plx9080(struct comedi_device *dev) |
1280 | { | 1280 | { |
1281 | uint32_t bits; | 1281 | uint32_t bits; |
1282 | void *plx_iobase = priv(dev)->plx9080_iobase; | 1282 | void *plx_iobase = priv(dev)->plx9080_iobase; |
@@ -1366,7 +1366,7 @@ static void init_plx9080(struct comedi_device * dev) | |||
1366 | 1366 | ||
1367 | /* Allocate and initialize the subdevice structures. | 1367 | /* Allocate and initialize the subdevice structures. |
1368 | */ | 1368 | */ |
1369 | static int setup_subdevices(struct comedi_device * dev) | 1369 | static int setup_subdevices(struct comedi_device *dev) |
1370 | { | 1370 | { |
1371 | struct comedi_subdevice *s; | 1371 | struct comedi_subdevice *s; |
1372 | void *dio_8255_iobase; | 1372 | void *dio_8255_iobase; |
@@ -1529,14 +1529,14 @@ static int setup_subdevices(struct comedi_device * dev) | |||
1529 | return 0; | 1529 | return 0; |
1530 | } | 1530 | } |
1531 | 1531 | ||
1532 | static void disable_plx_interrupts(struct comedi_device * dev) | 1532 | static void disable_plx_interrupts(struct comedi_device *dev) |
1533 | { | 1533 | { |
1534 | priv(dev)->plx_intcsr_bits = 0; | 1534 | priv(dev)->plx_intcsr_bits = 0; |
1535 | writel(priv(dev)->plx_intcsr_bits, | 1535 | writel(priv(dev)->plx_intcsr_bits, |
1536 | priv(dev)->plx9080_iobase + PLX_INTRCS_REG); | 1536 | priv(dev)->plx9080_iobase + PLX_INTRCS_REG); |
1537 | } | 1537 | } |
1538 | 1538 | ||
1539 | static void init_stc_registers(struct comedi_device * dev) | 1539 | static void init_stc_registers(struct comedi_device *dev) |
1540 | { | 1540 | { |
1541 | uint16_t bits; | 1541 | uint16_t bits; |
1542 | unsigned long flags; | 1542 | unsigned long flags; |
@@ -1578,7 +1578,7 @@ static void init_stc_registers(struct comedi_device * dev) | |||
1578 | disable_ai_pacing(dev); | 1578 | disable_ai_pacing(dev); |
1579 | }; | 1579 | }; |
1580 | 1580 | ||
1581 | int alloc_and_init_dma_members(struct comedi_device * dev) | 1581 | int alloc_and_init_dma_members(struct comedi_device *dev) |
1582 | { | 1582 | { |
1583 | int i; | 1583 | int i; |
1584 | 1584 | ||
@@ -1664,7 +1664,7 @@ int alloc_and_init_dma_members(struct comedi_device * dev) | |||
1664 | return 0; | 1664 | return 0; |
1665 | } | 1665 | } |
1666 | 1666 | ||
1667 | static inline void warn_external_queue(struct comedi_device * dev) | 1667 | static inline void warn_external_queue(struct comedi_device *dev) |
1668 | { | 1668 | { |
1669 | comedi_error(dev, | 1669 | comedi_error(dev, |
1670 | "AO command and AI external channel queue cannot be used simultaneously."); | 1670 | "AO command and AI external channel queue cannot be used simultaneously."); |
@@ -1824,7 +1824,7 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
1824 | * allocated by _attach(). dev->private and dev->subdevices are | 1824 | * allocated by _attach(). dev->private and dev->subdevices are |
1825 | * deallocated automatically by the core. | 1825 | * deallocated automatically by the core. |
1826 | */ | 1826 | */ |
1827 | static int detach(struct comedi_device * dev) | 1827 | static int detach(struct comedi_device *dev) |
1828 | { | 1828 | { |
1829 | unsigned int i; | 1829 | unsigned int i; |
1830 | 1830 | ||
@@ -1884,8 +1884,8 @@ static int detach(struct comedi_device * dev) | |||
1884 | return 0; | 1884 | return 0; |
1885 | } | 1885 | } |
1886 | 1886 | ||
1887 | static int ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 1887 | static int ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
1888 | struct comedi_insn * insn, unsigned int * data) | 1888 | struct comedi_insn *insn, unsigned int *data) |
1889 | { | 1889 | { |
1890 | unsigned int bits = 0, n, i; | 1890 | unsigned int bits = 0, n, i; |
1891 | unsigned int channel, range, aref; | 1891 | unsigned int channel, range, aref; |
@@ -2021,7 +2021,7 @@ static int ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | |||
2021 | return n; | 2021 | return n; |
2022 | } | 2022 | } |
2023 | 2023 | ||
2024 | static int ai_config_calibration_source(struct comedi_device * dev, unsigned int * data) | 2024 | static int ai_config_calibration_source(struct comedi_device *dev, unsigned int *data) |
2025 | { | 2025 | { |
2026 | unsigned int source = data[1]; | 2026 | unsigned int source = data[1]; |
2027 | int num_calibration_sources; | 2027 | int num_calibration_sources; |
@@ -2041,7 +2041,7 @@ static int ai_config_calibration_source(struct comedi_device * dev, unsigned int | |||
2041 | return 2; | 2041 | return 2; |
2042 | } | 2042 | } |
2043 | 2043 | ||
2044 | static int ai_config_block_size(struct comedi_device * dev, unsigned int * data) | 2044 | static int ai_config_block_size(struct comedi_device *dev, unsigned int *data) |
2045 | { | 2045 | { |
2046 | int fifo_size; | 2046 | int fifo_size; |
2047 | const struct hw_fifo_info *const fifo = board(dev)->ai_fifo; | 2047 | const struct hw_fifo_info *const fifo = board(dev)->ai_fifo; |
@@ -2068,7 +2068,7 @@ static int ai_config_block_size(struct comedi_device * dev, unsigned int * data) | |||
2068 | return 2; | 2068 | return 2; |
2069 | } | 2069 | } |
2070 | 2070 | ||
2071 | static int ai_config_master_clock_4020(struct comedi_device * dev, unsigned int * data) | 2071 | static int ai_config_master_clock_4020(struct comedi_device *dev, unsigned int *data) |
2072 | { | 2072 | { |
2073 | unsigned int divisor = data[4]; | 2073 | unsigned int divisor = data[4]; |
2074 | int retval = 0; | 2074 | int retval = 0; |
@@ -2094,7 +2094,7 @@ static int ai_config_master_clock_4020(struct comedi_device * dev, unsigned int | |||
2094 | } | 2094 | } |
2095 | 2095 | ||
2096 | /* XXX could add support for 60xx series */ | 2096 | /* XXX could add support for 60xx series */ |
2097 | static int ai_config_master_clock(struct comedi_device * dev, unsigned int * data) | 2097 | static int ai_config_master_clock(struct comedi_device *dev, unsigned int *data) |
2098 | { | 2098 | { |
2099 | 2099 | ||
2100 | switch (board(dev)->layout) { | 2100 | switch (board(dev)->layout) { |
@@ -2109,8 +2109,8 @@ static int ai_config_master_clock(struct comedi_device * dev, unsigned int * dat | |||
2109 | return -EINVAL; | 2109 | return -EINVAL; |
2110 | } | 2110 | } |
2111 | 2111 | ||
2112 | static int ai_config_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 2112 | static int ai_config_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
2113 | struct comedi_insn * insn, unsigned int * data) | 2113 | struct comedi_insn *insn, unsigned int *data) |
2114 | { | 2114 | { |
2115 | int id = data[0]; | 2115 | int id = data[0]; |
2116 | 2116 | ||
@@ -2131,8 +2131,8 @@ static int ai_config_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
2131 | return -EINVAL; | 2131 | return -EINVAL; |
2132 | } | 2132 | } |
2133 | 2133 | ||
2134 | static int ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 2134 | static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
2135 | struct comedi_cmd * cmd) | 2135 | struct comedi_cmd *cmd) |
2136 | { | 2136 | { |
2137 | int err = 0; | 2137 | int err = 0; |
2138 | int tmp; | 2138 | int tmp; |
@@ -2316,7 +2316,7 @@ static int ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | |||
2316 | return 0; | 2316 | return 0; |
2317 | } | 2317 | } |
2318 | 2318 | ||
2319 | static int use_hw_sample_counter(struct comedi_cmd * cmd) | 2319 | static int use_hw_sample_counter(struct comedi_cmd *cmd) |
2320 | { | 2320 | { |
2321 | /* disable for now until I work out a race */ | 2321 | /* disable for now until I work out a race */ |
2322 | return 0; | 2322 | return 0; |
@@ -2327,7 +2327,7 @@ static int use_hw_sample_counter(struct comedi_cmd * cmd) | |||
2327 | return 0; | 2327 | return 0; |
2328 | } | 2328 | } |
2329 | 2329 | ||
2330 | static void setup_sample_counters(struct comedi_device * dev, struct comedi_cmd * cmd) | 2330 | static void setup_sample_counters(struct comedi_device *dev, struct comedi_cmd *cmd) |
2331 | { | 2331 | { |
2332 | if (cmd->stop_src == TRIG_COUNT) { | 2332 | if (cmd->stop_src == TRIG_COUNT) { |
2333 | /* set software count */ | 2333 | /* set software count */ |
@@ -2344,7 +2344,7 @@ static void setup_sample_counters(struct comedi_device * dev, struct comedi_cmd | |||
2344 | } | 2344 | } |
2345 | } | 2345 | } |
2346 | 2346 | ||
2347 | static inline unsigned int dma_transfer_size(struct comedi_device * dev) | 2347 | static inline unsigned int dma_transfer_size(struct comedi_device *dev) |
2348 | { | 2348 | { |
2349 | unsigned int num_samples; | 2349 | unsigned int num_samples; |
2350 | 2350 | ||
@@ -2357,7 +2357,7 @@ static inline unsigned int dma_transfer_size(struct comedi_device * dev) | |||
2357 | return num_samples; | 2357 | return num_samples; |
2358 | } | 2358 | } |
2359 | 2359 | ||
2360 | static void disable_ai_pacing(struct comedi_device * dev) | 2360 | static void disable_ai_pacing(struct comedi_device *dev) |
2361 | { | 2361 | { |
2362 | unsigned long flags; | 2362 | unsigned long flags; |
2363 | 2363 | ||
@@ -2374,7 +2374,7 @@ static void disable_ai_pacing(struct comedi_device * dev) | |||
2374 | priv(dev)->main_iobase + ADC_CONTROL0_REG); | 2374 | priv(dev)->main_iobase + ADC_CONTROL0_REG); |
2375 | } | 2375 | } |
2376 | 2376 | ||
2377 | static void disable_ai_interrupts(struct comedi_device * dev) | 2377 | static void disable_ai_interrupts(struct comedi_device *dev) |
2378 | { | 2378 | { |
2379 | unsigned long flags; | 2379 | unsigned long flags; |
2380 | 2380 | ||
@@ -2390,7 +2390,7 @@ static void disable_ai_interrupts(struct comedi_device * dev) | |||
2390 | DEBUG_PRINT("intr enable bits 0x%x\n", priv(dev)->intr_enable_bits); | 2390 | DEBUG_PRINT("intr enable bits 0x%x\n", priv(dev)->intr_enable_bits); |
2391 | } | 2391 | } |
2392 | 2392 | ||
2393 | static void enable_ai_interrupts(struct comedi_device * dev, const struct comedi_cmd * cmd) | 2393 | static void enable_ai_interrupts(struct comedi_device *dev, const struct comedi_cmd *cmd) |
2394 | { | 2394 | { |
2395 | uint32_t bits; | 2395 | uint32_t bits; |
2396 | unsigned long flags; | 2396 | unsigned long flags; |
@@ -2411,14 +2411,14 @@ static void enable_ai_interrupts(struct comedi_device * dev, const struct comedi | |||
2411 | comedi_spin_unlock_irqrestore(&dev->spinlock, flags); | 2411 | comedi_spin_unlock_irqrestore(&dev->spinlock, flags); |
2412 | } | 2412 | } |
2413 | 2413 | ||
2414 | static uint32_t ai_convert_counter_6xxx(const struct comedi_device * dev, | 2414 | static uint32_t ai_convert_counter_6xxx(const struct comedi_device *dev, |
2415 | const struct comedi_cmd * cmd) | 2415 | const struct comedi_cmd *cmd) |
2416 | { | 2416 | { |
2417 | /* supposed to load counter with desired divisor minus 3 */ | 2417 | /* supposed to load counter with desired divisor minus 3 */ |
2418 | return cmd->convert_arg / TIMER_BASE - 3; | 2418 | return cmd->convert_arg / TIMER_BASE - 3; |
2419 | } | 2419 | } |
2420 | 2420 | ||
2421 | static uint32_t ai_scan_counter_6xxx(struct comedi_device * dev, struct comedi_cmd * cmd) | 2421 | static uint32_t ai_scan_counter_6xxx(struct comedi_device *dev, struct comedi_cmd *cmd) |
2422 | { | 2422 | { |
2423 | uint32_t count; | 2423 | uint32_t count; |
2424 | /* figure out how long we need to delay at end of scan */ | 2424 | /* figure out how long we need to delay at end of scan */ |
@@ -2438,7 +2438,7 @@ static uint32_t ai_scan_counter_6xxx(struct comedi_device * dev, struct comedi_c | |||
2438 | return count - 3; | 2438 | return count - 3; |
2439 | } | 2439 | } |
2440 | 2440 | ||
2441 | static uint32_t ai_convert_counter_4020(struct comedi_device * dev, struct comedi_cmd * cmd) | 2441 | static uint32_t ai_convert_counter_4020(struct comedi_device *dev, struct comedi_cmd *cmd) |
2442 | { | 2442 | { |
2443 | unsigned int divisor; | 2443 | unsigned int divisor; |
2444 | 2444 | ||
@@ -2459,8 +2459,8 @@ static uint32_t ai_convert_counter_4020(struct comedi_device * dev, struct comed | |||
2459 | return divisor - 2; | 2459 | return divisor - 2; |
2460 | } | 2460 | } |
2461 | 2461 | ||
2462 | static void select_master_clock_4020(struct comedi_device * dev, | 2462 | static void select_master_clock_4020(struct comedi_device *dev, |
2463 | const struct comedi_cmd * cmd) | 2463 | const struct comedi_cmd *cmd) |
2464 | { | 2464 | { |
2465 | /* select internal/external master clock */ | 2465 | /* select internal/external master clock */ |
2466 | priv(dev)->hw_config_bits &= ~MASTER_CLOCK_4020_MASK; | 2466 | priv(dev)->hw_config_bits &= ~MASTER_CLOCK_4020_MASK; |
@@ -2478,7 +2478,7 @@ static void select_master_clock_4020(struct comedi_device * dev, | |||
2478 | priv(dev)->main_iobase + HW_CONFIG_REG); | 2478 | priv(dev)->main_iobase + HW_CONFIG_REG); |
2479 | } | 2479 | } |
2480 | 2480 | ||
2481 | static void select_master_clock(struct comedi_device * dev, const struct comedi_cmd * cmd) | 2481 | static void select_master_clock(struct comedi_device *dev, const struct comedi_cmd *cmd) |
2482 | { | 2482 | { |
2483 | switch (board(dev)->layout) { | 2483 | switch (board(dev)->layout) { |
2484 | case LAYOUT_4020: | 2484 | case LAYOUT_4020: |
@@ -2489,7 +2489,7 @@ static void select_master_clock(struct comedi_device * dev, const struct comedi_ | |||
2489 | } | 2489 | } |
2490 | } | 2490 | } |
2491 | 2491 | ||
2492 | static inline void dma_start_sync(struct comedi_device * dev, unsigned int channel) | 2492 | static inline void dma_start_sync(struct comedi_device *dev, unsigned int channel) |
2493 | { | 2493 | { |
2494 | unsigned long flags; | 2494 | unsigned long flags; |
2495 | 2495 | ||
@@ -2506,7 +2506,7 @@ static inline void dma_start_sync(struct comedi_device * dev, unsigned int chann | |||
2506 | comedi_spin_unlock_irqrestore(&dev->spinlock, flags); | 2506 | comedi_spin_unlock_irqrestore(&dev->spinlock, flags); |
2507 | } | 2507 | } |
2508 | 2508 | ||
2509 | static void set_ai_pacing(struct comedi_device * dev, struct comedi_cmd * cmd) | 2509 | static void set_ai_pacing(struct comedi_device *dev, struct comedi_cmd *cmd) |
2510 | { | 2510 | { |
2511 | uint32_t convert_counter = 0, scan_counter = 0; | 2511 | uint32_t convert_counter = 0, scan_counter = 0; |
2512 | 2512 | ||
@@ -2537,7 +2537,7 @@ static void set_ai_pacing(struct comedi_device * dev, struct comedi_cmd * cmd) | |||
2537 | DEBUG_PRINT("scan counter 0x%x\n", scan_counter); | 2537 | DEBUG_PRINT("scan counter 0x%x\n", scan_counter); |
2538 | } | 2538 | } |
2539 | 2539 | ||
2540 | static int use_internal_queue_6xxx(const struct comedi_cmd * cmd) | 2540 | static int use_internal_queue_6xxx(const struct comedi_cmd *cmd) |
2541 | { | 2541 | { |
2542 | int i; | 2542 | int i; |
2543 | for (i = 0; i + 1 < cmd->chanlist_len; i++) { | 2543 | for (i = 0; i + 1 < cmd->chanlist_len; i++) { |
@@ -2553,7 +2553,7 @@ static int use_internal_queue_6xxx(const struct comedi_cmd * cmd) | |||
2553 | return 1; | 2553 | return 1; |
2554 | } | 2554 | } |
2555 | 2555 | ||
2556 | static int setup_channel_queue(struct comedi_device * dev, const struct comedi_cmd * cmd) | 2556 | static int setup_channel_queue(struct comedi_device *dev, const struct comedi_cmd *cmd) |
2557 | { | 2557 | { |
2558 | unsigned short bits; | 2558 | unsigned short bits; |
2559 | int i; | 2559 | int i; |
@@ -2655,7 +2655,7 @@ static int setup_channel_queue(struct comedi_device * dev, const struct comedi_c | |||
2655 | return 0; | 2655 | return 0; |
2656 | } | 2656 | } |
2657 | 2657 | ||
2658 | static inline void load_first_dma_descriptor(struct comedi_device * dev, | 2658 | static inline void load_first_dma_descriptor(struct comedi_device *dev, |
2659 | unsigned int dma_channel, unsigned int descriptor_bits) | 2659 | unsigned int dma_channel, unsigned int descriptor_bits) |
2660 | { | 2660 | { |
2661 | /* The transfer size, pci address, and local address registers | 2661 | /* The transfer size, pci address, and local address registers |
@@ -2682,7 +2682,7 @@ static inline void load_first_dma_descriptor(struct comedi_device * dev, | |||
2682 | } | 2682 | } |
2683 | } | 2683 | } |
2684 | 2684 | ||
2685 | static int ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 2685 | static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
2686 | { | 2686 | { |
2687 | struct comedi_async *async = s->async; | 2687 | struct comedi_async *async = s->async; |
2688 | struct comedi_cmd *cmd = &async->cmd; | 2688 | struct comedi_cmd *cmd = &async->cmd; |
@@ -2800,7 +2800,7 @@ static int ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
2800 | } | 2800 | } |
2801 | 2801 | ||
2802 | /* read num_samples from 16 bit wide ai fifo */ | 2802 | /* read num_samples from 16 bit wide ai fifo */ |
2803 | static void pio_drain_ai_fifo_16(struct comedi_device * dev) | 2803 | static void pio_drain_ai_fifo_16(struct comedi_device *dev) |
2804 | { | 2804 | { |
2805 | struct comedi_subdevice *s = dev->read_subdev; | 2805 | struct comedi_subdevice *s = dev->read_subdev; |
2806 | struct comedi_async *async = s->async; | 2806 | struct comedi_async *async = s->async; |
@@ -2867,7 +2867,7 @@ static void pio_drain_ai_fifo_16(struct comedi_device * dev) | |||
2867 | * dma transfers (it only supports the use of pio for draining the last remaining | 2867 | * dma transfers (it only supports the use of pio for draining the last remaining |
2868 | * points from the fifo when a data aquisition operation has completed). | 2868 | * points from the fifo when a data aquisition operation has completed). |
2869 | */ | 2869 | */ |
2870 | static void pio_drain_ai_fifo_32(struct comedi_device * dev) | 2870 | static void pio_drain_ai_fifo_32(struct comedi_device *dev) |
2871 | { | 2871 | { |
2872 | struct comedi_subdevice *s = dev->read_subdev; | 2872 | struct comedi_subdevice *s = dev->read_subdev; |
2873 | struct comedi_async *async = s->async; | 2873 | struct comedi_async *async = s->async; |
@@ -2901,7 +2901,7 @@ static void pio_drain_ai_fifo_32(struct comedi_device * dev) | |||
2901 | } | 2901 | } |
2902 | 2902 | ||
2903 | /* empty fifo */ | 2903 | /* empty fifo */ |
2904 | static void pio_drain_ai_fifo(struct comedi_device * dev) | 2904 | static void pio_drain_ai_fifo(struct comedi_device *dev) |
2905 | { | 2905 | { |
2906 | if (board(dev)->layout == LAYOUT_4020) { | 2906 | if (board(dev)->layout == LAYOUT_4020) { |
2907 | pio_drain_ai_fifo_32(dev); | 2907 | pio_drain_ai_fifo_32(dev); |
@@ -2909,7 +2909,7 @@ static void pio_drain_ai_fifo(struct comedi_device * dev) | |||
2909 | pio_drain_ai_fifo_16(dev); | 2909 | pio_drain_ai_fifo_16(dev); |
2910 | } | 2910 | } |
2911 | 2911 | ||
2912 | static void drain_dma_buffers(struct comedi_device * dev, unsigned int channel) | 2912 | static void drain_dma_buffers(struct comedi_device *dev, unsigned int channel) |
2913 | { | 2913 | { |
2914 | struct comedi_async *async = dev->read_subdev->async; | 2914 | struct comedi_async *async = dev->read_subdev->async; |
2915 | uint32_t next_transfer_addr; | 2915 | uint32_t next_transfer_addr; |
@@ -2955,7 +2955,7 @@ static void drain_dma_buffers(struct comedi_device * dev, unsigned int channel) | |||
2955 | * unused buffer) */ | 2955 | * unused buffer) */ |
2956 | } | 2956 | } |
2957 | 2957 | ||
2958 | void handle_ai_interrupt(struct comedi_device * dev, unsigned short status, | 2958 | void handle_ai_interrupt(struct comedi_device *dev, unsigned short status, |
2959 | unsigned int plx_status) | 2959 | unsigned int plx_status) |
2960 | { | 2960 | { |
2961 | struct comedi_subdevice *s = dev->read_subdev; | 2961 | struct comedi_subdevice *s = dev->read_subdev; |
@@ -3009,7 +3009,7 @@ void handle_ai_interrupt(struct comedi_device * dev, unsigned short status, | |||
3009 | cfc_handle_events(dev, s); | 3009 | cfc_handle_events(dev, s); |
3010 | } | 3010 | } |
3011 | 3011 | ||
3012 | static inline unsigned int prev_ao_dma_index(struct comedi_device * dev) | 3012 | static inline unsigned int prev_ao_dma_index(struct comedi_device *dev) |
3013 | { | 3013 | { |
3014 | unsigned int buffer_index; | 3014 | unsigned int buffer_index; |
3015 | 3015 | ||
@@ -3020,7 +3020,7 @@ static inline unsigned int prev_ao_dma_index(struct comedi_device * dev) | |||
3020 | return buffer_index; | 3020 | return buffer_index; |
3021 | } | 3021 | } |
3022 | 3022 | ||
3023 | static int last_ao_dma_load_completed(struct comedi_device * dev) | 3023 | static int last_ao_dma_load_completed(struct comedi_device *dev) |
3024 | { | 3024 | { |
3025 | unsigned int buffer_index; | 3025 | unsigned int buffer_index; |
3026 | unsigned int transfer_address; | 3026 | unsigned int transfer_address; |
@@ -3039,7 +3039,7 @@ static int last_ao_dma_load_completed(struct comedi_device * dev) | |||
3039 | return 1; | 3039 | return 1; |
3040 | } | 3040 | } |
3041 | 3041 | ||
3042 | static int ao_stopped_by_error(struct comedi_device * dev, const struct comedi_cmd * cmd) | 3042 | static int ao_stopped_by_error(struct comedi_device *dev, const struct comedi_cmd *cmd) |
3043 | { | 3043 | { |
3044 | if (cmd->stop_src == TRIG_NONE) | 3044 | if (cmd->stop_src == TRIG_NONE) |
3045 | return 1; | 3045 | return 1; |
@@ -3052,7 +3052,7 @@ static int ao_stopped_by_error(struct comedi_device * dev, const struct comedi_c | |||
3052 | return 0; | 3052 | return 0; |
3053 | } | 3053 | } |
3054 | 3054 | ||
3055 | static inline int ao_dma_needs_restart(struct comedi_device * dev, | 3055 | static inline int ao_dma_needs_restart(struct comedi_device *dev, |
3056 | unsigned short dma_status) | 3056 | unsigned short dma_status) |
3057 | { | 3057 | { |
3058 | if ((dma_status & PLX_DMA_DONE_BIT) == 0 || | 3058 | if ((dma_status & PLX_DMA_DONE_BIT) == 0 || |
@@ -3064,7 +3064,7 @@ static inline int ao_dma_needs_restart(struct comedi_device * dev, | |||
3064 | return 1; | 3064 | return 1; |
3065 | } | 3065 | } |
3066 | 3066 | ||
3067 | static void restart_ao_dma(struct comedi_device * dev) | 3067 | static void restart_ao_dma(struct comedi_device *dev) |
3068 | { | 3068 | { |
3069 | unsigned int dma_desc_bits; | 3069 | unsigned int dma_desc_bits; |
3070 | 3070 | ||
@@ -3077,7 +3077,7 @@ static void restart_ao_dma(struct comedi_device * dev) | |||
3077 | dma_start_sync(dev, 0); | 3077 | dma_start_sync(dev, 0); |
3078 | } | 3078 | } |
3079 | 3079 | ||
3080 | static void handle_ao_interrupt(struct comedi_device * dev, unsigned short status, | 3080 | static void handle_ao_interrupt(struct comedi_device *dev, unsigned short status, |
3081 | unsigned int plx_status) | 3081 | unsigned int plx_status) |
3082 | { | 3082 | { |
3083 | struct comedi_subdevice *s = dev->write_subdev; | 3083 | struct comedi_subdevice *s = dev->write_subdev; |
@@ -3165,7 +3165,7 @@ static irqreturn_t handle_interrupt(int irq, void *d) | |||
3165 | return IRQ_HANDLED; | 3165 | return IRQ_HANDLED; |
3166 | } | 3166 | } |
3167 | 3167 | ||
3168 | void abort_dma(struct comedi_device * dev, unsigned int channel) | 3168 | void abort_dma(struct comedi_device *dev, unsigned int channel) |
3169 | { | 3169 | { |
3170 | unsigned long flags; | 3170 | unsigned long flags; |
3171 | 3171 | ||
@@ -3177,7 +3177,7 @@ void abort_dma(struct comedi_device * dev, unsigned int channel) | |||
3177 | comedi_spin_unlock_irqrestore(&dev->spinlock, flags); | 3177 | comedi_spin_unlock_irqrestore(&dev->spinlock, flags); |
3178 | } | 3178 | } |
3179 | 3179 | ||
3180 | static int ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 3180 | static int ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
3181 | { | 3181 | { |
3182 | unsigned long flags; | 3182 | unsigned long flags; |
3183 | 3183 | ||
@@ -3197,8 +3197,8 @@ static int ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | |||
3197 | return 0; | 3197 | return 0; |
3198 | } | 3198 | } |
3199 | 3199 | ||
3200 | static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 3200 | static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
3201 | struct comedi_insn * insn, unsigned int * data) | 3201 | struct comedi_insn *insn, unsigned int *data) |
3202 | { | 3202 | { |
3203 | int chan = CR_CHAN(insn->chanspec); | 3203 | int chan = CR_CHAN(insn->chanspec); |
3204 | int range = CR_RANGE(insn->chanspec); | 3204 | int range = CR_RANGE(insn->chanspec); |
@@ -3227,15 +3227,15 @@ static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | |||
3227 | return 1; | 3227 | return 1; |
3228 | } | 3228 | } |
3229 | 3229 | ||
3230 | static int ao_readback_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 3230 | static int ao_readback_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
3231 | struct comedi_insn * insn, unsigned int * data) | 3231 | struct comedi_insn *insn, unsigned int *data) |
3232 | { | 3232 | { |
3233 | data[0] = priv(dev)->ao_value[CR_CHAN(insn->chanspec)]; | 3233 | data[0] = priv(dev)->ao_value[CR_CHAN(insn->chanspec)]; |
3234 | 3234 | ||
3235 | return 1; | 3235 | return 1; |
3236 | } | 3236 | } |
3237 | 3237 | ||
3238 | static void set_dac_control0_reg(struct comedi_device * dev, const struct comedi_cmd * cmd) | 3238 | static void set_dac_control0_reg(struct comedi_device *dev, const struct comedi_cmd *cmd) |
3239 | { | 3239 | { |
3240 | unsigned int bits = DAC_ENABLE_BIT | WAVEFORM_GATE_LEVEL_BIT | | 3240 | unsigned int bits = DAC_ENABLE_BIT | WAVEFORM_GATE_LEVEL_BIT | |
3241 | WAVEFORM_GATE_ENABLE_BIT | WAVEFORM_GATE_SELECT_BIT; | 3241 | WAVEFORM_GATE_ENABLE_BIT | WAVEFORM_GATE_SELECT_BIT; |
@@ -3255,7 +3255,7 @@ static void set_dac_control0_reg(struct comedi_device * dev, const struct comedi | |||
3255 | writew(bits, priv(dev)->main_iobase + DAC_CONTROL0_REG); | 3255 | writew(bits, priv(dev)->main_iobase + DAC_CONTROL0_REG); |
3256 | } | 3256 | } |
3257 | 3257 | ||
3258 | static void set_dac_control1_reg(struct comedi_device * dev, const struct comedi_cmd * cmd) | 3258 | static void set_dac_control1_reg(struct comedi_device *dev, const struct comedi_cmd *cmd) |
3259 | { | 3259 | { |
3260 | int i; | 3260 | int i; |
3261 | 3261 | ||
@@ -3272,7 +3272,7 @@ static void set_dac_control1_reg(struct comedi_device * dev, const struct comedi | |||
3272 | priv(dev)->main_iobase + DAC_CONTROL1_REG); | 3272 | priv(dev)->main_iobase + DAC_CONTROL1_REG); |
3273 | } | 3273 | } |
3274 | 3274 | ||
3275 | static void set_dac_select_reg(struct comedi_device * dev, const struct comedi_cmd * cmd) | 3275 | static void set_dac_select_reg(struct comedi_device *dev, const struct comedi_cmd *cmd) |
3276 | { | 3276 | { |
3277 | uint16_t bits; | 3277 | uint16_t bits; |
3278 | unsigned int first_channel, last_channel; | 3278 | unsigned int first_channel, last_channel; |
@@ -3287,7 +3287,7 @@ static void set_dac_select_reg(struct comedi_device * dev, const struct comedi_c | |||
3287 | writew(bits, priv(dev)->main_iobase + DAC_SELECT_REG); | 3287 | writew(bits, priv(dev)->main_iobase + DAC_SELECT_REG); |
3288 | } | 3288 | } |
3289 | 3289 | ||
3290 | static void set_dac_interval_regs(struct comedi_device * dev, const struct comedi_cmd * cmd) | 3290 | static void set_dac_interval_regs(struct comedi_device *dev, const struct comedi_cmd *cmd) |
3291 | { | 3291 | { |
3292 | unsigned int divisor; | 3292 | unsigned int divisor; |
3293 | 3293 | ||
@@ -3305,8 +3305,8 @@ static void set_dac_interval_regs(struct comedi_device * dev, const struct comed | |||
3305 | priv(dev)->main_iobase + DAC_SAMPLE_INTERVAL_UPPER_REG); | 3305 | priv(dev)->main_iobase + DAC_SAMPLE_INTERVAL_UPPER_REG); |
3306 | } | 3306 | } |
3307 | 3307 | ||
3308 | static unsigned int load_ao_dma_buffer(struct comedi_device * dev, | 3308 | static unsigned int load_ao_dma_buffer(struct comedi_device *dev, |
3309 | const struct comedi_cmd * cmd) | 3309 | const struct comedi_cmd *cmd) |
3310 | { | 3310 | { |
3311 | unsigned int num_bytes, buffer_index, prev_buffer_index; | 3311 | unsigned int num_bytes, buffer_index, prev_buffer_index; |
3312 | unsigned int next_bits; | 3312 | unsigned int next_bits; |
@@ -3349,7 +3349,7 @@ static unsigned int load_ao_dma_buffer(struct comedi_device * dev, | |||
3349 | return num_bytes; | 3349 | return num_bytes; |
3350 | } | 3350 | } |
3351 | 3351 | ||
3352 | static void load_ao_dma(struct comedi_device * dev, const struct comedi_cmd * cmd) | 3352 | static void load_ao_dma(struct comedi_device *dev, const struct comedi_cmd *cmd) |
3353 | { | 3353 | { |
3354 | unsigned int num_bytes; | 3354 | unsigned int num_bytes; |
3355 | unsigned int next_transfer_addr; | 3355 | unsigned int next_transfer_addr; |
@@ -3371,7 +3371,7 @@ static void load_ao_dma(struct comedi_device * dev, const struct comedi_cmd * cm | |||
3371 | } while (num_bytes >= DMA_BUFFER_SIZE); | 3371 | } while (num_bytes >= DMA_BUFFER_SIZE); |
3372 | } | 3372 | } |
3373 | 3373 | ||
3374 | static int prep_ao_dma(struct comedi_device * dev, const struct comedi_cmd * cmd) | 3374 | static int prep_ao_dma(struct comedi_device *dev, const struct comedi_cmd *cmd) |
3375 | { | 3375 | { |
3376 | unsigned int num_bytes; | 3376 | unsigned int num_bytes; |
3377 | int i; | 3377 | int i; |
@@ -3405,7 +3405,7 @@ static int prep_ao_dma(struct comedi_device * dev, const struct comedi_cmd * cmd | |||
3405 | return 0; | 3405 | return 0; |
3406 | } | 3406 | } |
3407 | 3407 | ||
3408 | static inline int external_ai_queue_in_use(struct comedi_device * dev) | 3408 | static inline int external_ai_queue_in_use(struct comedi_device *dev) |
3409 | { | 3409 | { |
3410 | if (dev->read_subdev->busy) | 3410 | if (dev->read_subdev->busy) |
3411 | return 0; | 3411 | return 0; |
@@ -3416,7 +3416,7 @@ static inline int external_ai_queue_in_use(struct comedi_device * dev) | |||
3416 | return 1; | 3416 | return 1; |
3417 | } | 3417 | } |
3418 | 3418 | ||
3419 | static int ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 3419 | static int ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
3420 | { | 3420 | { |
3421 | struct comedi_cmd *cmd = &s->async->cmd; | 3421 | struct comedi_cmd *cmd = &s->async->cmd; |
3422 | 3422 | ||
@@ -3441,7 +3441,7 @@ static int ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
3441 | return 0; | 3441 | return 0; |
3442 | } | 3442 | } |
3443 | 3443 | ||
3444 | static int ao_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, | 3444 | static int ao_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, |
3445 | unsigned int trig_num) | 3445 | unsigned int trig_num) |
3446 | { | 3446 | { |
3447 | struct comedi_cmd *cmd = &s->async->cmd; | 3447 | struct comedi_cmd *cmd = &s->async->cmd; |
@@ -3464,8 +3464,8 @@ static int ao_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, | |||
3464 | return 0; | 3464 | return 0; |
3465 | } | 3465 | } |
3466 | 3466 | ||
3467 | static int ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 3467 | static int ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
3468 | struct comedi_cmd * cmd) | 3468 | struct comedi_cmd *cmd) |
3469 | { | 3469 | { |
3470 | int err = 0; | 3470 | int err = 0; |
3471 | int tmp; | 3471 | int tmp; |
@@ -3580,7 +3580,7 @@ static int ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | |||
3580 | return 0; | 3580 | return 0; |
3581 | } | 3581 | } |
3582 | 3582 | ||
3583 | static int ao_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 3583 | static int ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
3584 | { | 3584 | { |
3585 | writew(0x0, priv(dev)->main_iobase + DAC_CONTROL0_REG); | 3585 | writew(0x0, priv(dev)->main_iobase + DAC_CONTROL0_REG); |
3586 | abort_dma(dev, 0); | 3586 | abort_dma(dev, 0); |
@@ -3608,8 +3608,8 @@ static int dio_callback_4020(int dir, int port, int data, unsigned long iobase) | |||
3608 | } | 3608 | } |
3609 | } | 3609 | } |
3610 | 3610 | ||
3611 | static int di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, | 3611 | static int di_rbits(struct comedi_device *dev, struct comedi_subdevice *s, |
3612 | struct comedi_insn * insn, unsigned int * data) | 3612 | struct comedi_insn *insn, unsigned int *data) |
3613 | { | 3613 | { |
3614 | unsigned int bits; | 3614 | unsigned int bits; |
3615 | 3615 | ||
@@ -3621,8 +3621,8 @@ static int di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, | |||
3621 | return 2; | 3621 | return 2; |
3622 | } | 3622 | } |
3623 | 3623 | ||
3624 | static int do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, | 3624 | static int do_wbits(struct comedi_device *dev, struct comedi_subdevice *s, |
3625 | struct comedi_insn * insn, unsigned int * data) | 3625 | struct comedi_insn *insn, unsigned int *data) |
3626 | { | 3626 | { |
3627 | data[0] &= 0xf; | 3627 | data[0] &= 0xf; |
3628 | /* zero bits we are going to change */ | 3628 | /* zero bits we are going to change */ |
@@ -3637,8 +3637,8 @@ static int do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, | |||
3637 | return 2; | 3637 | return 2; |
3638 | } | 3638 | } |
3639 | 3639 | ||
3640 | static int dio_60xx_config_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 3640 | static int dio_60xx_config_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
3641 | struct comedi_insn * insn, unsigned int * data) | 3641 | struct comedi_insn *insn, unsigned int *data) |
3642 | { | 3642 | { |
3643 | unsigned int mask; | 3643 | unsigned int mask; |
3644 | 3644 | ||
@@ -3664,8 +3664,8 @@ static int dio_60xx_config_insn(struct comedi_device * dev, struct comedi_subdev | |||
3664 | return 1; | 3664 | return 1; |
3665 | } | 3665 | } |
3666 | 3666 | ||
3667 | static int dio_60xx_wbits(struct comedi_device * dev, struct comedi_subdevice * s, | 3667 | static int dio_60xx_wbits(struct comedi_device *dev, struct comedi_subdevice *s, |
3668 | struct comedi_insn * insn, unsigned int * data) | 3668 | struct comedi_insn *insn, unsigned int *data) |
3669 | { | 3669 | { |
3670 | if (data[0]) { | 3670 | if (data[0]) { |
3671 | s->state &= ~data[0]; | 3671 | s->state &= ~data[0]; |
@@ -3679,7 +3679,7 @@ static int dio_60xx_wbits(struct comedi_device * dev, struct comedi_subdevice * | |||
3679 | return 2; | 3679 | return 2; |
3680 | } | 3680 | } |
3681 | 3681 | ||
3682 | static void caldac_write(struct comedi_device * dev, unsigned int channel, | 3682 | static void caldac_write(struct comedi_device *dev, unsigned int channel, |
3683 | unsigned int value) | 3683 | unsigned int value) |
3684 | { | 3684 | { |
3685 | priv(dev)->caldac_state[channel] = value; | 3685 | priv(dev)->caldac_state[channel] = value; |
@@ -3697,8 +3697,8 @@ static void caldac_write(struct comedi_device * dev, unsigned int channel, | |||
3697 | } | 3697 | } |
3698 | } | 3698 | } |
3699 | 3699 | ||
3700 | static int calib_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 3700 | static int calib_write_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
3701 | struct comedi_insn * insn, unsigned int * data) | 3701 | struct comedi_insn *insn, unsigned int *data) |
3702 | { | 3702 | { |
3703 | int channel = CR_CHAN(insn->chanspec); | 3703 | int channel = CR_CHAN(insn->chanspec); |
3704 | 3704 | ||
@@ -3712,8 +3712,8 @@ static int calib_write_insn(struct comedi_device * dev, struct comedi_subdevice | |||
3712 | return 1; | 3712 | return 1; |
3713 | } | 3713 | } |
3714 | 3714 | ||
3715 | static int calib_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 3715 | static int calib_read_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
3716 | struct comedi_insn * insn, unsigned int * data) | 3716 | struct comedi_insn *insn, unsigned int *data) |
3717 | { | 3717 | { |
3718 | unsigned int channel = CR_CHAN(insn->chanspec); | 3718 | unsigned int channel = CR_CHAN(insn->chanspec); |
3719 | 3719 | ||
@@ -3722,7 +3722,7 @@ static int calib_read_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
3722 | return 1; | 3722 | return 1; |
3723 | } | 3723 | } |
3724 | 3724 | ||
3725 | static void ad8402_write(struct comedi_device * dev, unsigned int channel, | 3725 | static void ad8402_write(struct comedi_device *dev, unsigned int channel, |
3726 | unsigned int value) | 3726 | unsigned int value) |
3727 | { | 3727 | { |
3728 | static const int bitstream_length = 10; | 3728 | static const int bitstream_length = 10; |
@@ -3753,8 +3753,8 @@ static void ad8402_write(struct comedi_device * dev, unsigned int channel, | |||
3753 | } | 3753 | } |
3754 | 3754 | ||
3755 | /* for pci-das6402/16, channel 0 is analog input gain and channel 1 is offset */ | 3755 | /* for pci-das6402/16, channel 0 is analog input gain and channel 1 is offset */ |
3756 | static int ad8402_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 3756 | static int ad8402_write_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
3757 | struct comedi_insn * insn, unsigned int * data) | 3757 | struct comedi_insn *insn, unsigned int *data) |
3758 | { | 3758 | { |
3759 | int channel = CR_CHAN(insn->chanspec); | 3759 | int channel = CR_CHAN(insn->chanspec); |
3760 | 3760 | ||
@@ -3770,8 +3770,8 @@ static int ad8402_write_insn(struct comedi_device * dev, struct comedi_subdevice | |||
3770 | return 1; | 3770 | return 1; |
3771 | } | 3771 | } |
3772 | 3772 | ||
3773 | static int ad8402_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 3773 | static int ad8402_read_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
3774 | struct comedi_insn * insn, unsigned int * data) | 3774 | struct comedi_insn *insn, unsigned int *data) |
3775 | { | 3775 | { |
3776 | unsigned int channel = CR_CHAN(insn->chanspec); | 3776 | unsigned int channel = CR_CHAN(insn->chanspec); |
3777 | 3777 | ||
@@ -3780,7 +3780,7 @@ static int ad8402_read_insn(struct comedi_device * dev, struct comedi_subdevice | |||
3780 | return 1; | 3780 | return 1; |
3781 | } | 3781 | } |
3782 | 3782 | ||
3783 | static uint16_t read_eeprom(struct comedi_device * dev, uint8_t address) | 3783 | static uint16_t read_eeprom(struct comedi_device *dev, uint8_t address) |
3784 | { | 3784 | { |
3785 | static const int bitstream_length = 11; | 3785 | static const int bitstream_length = 11; |
3786 | static const int read_command = 0x6; | 3786 | static const int read_command = 0x6; |
@@ -3842,8 +3842,8 @@ static uint16_t read_eeprom(struct comedi_device * dev, uint8_t address) | |||
3842 | return value; | 3842 | return value; |
3843 | } | 3843 | } |
3844 | 3844 | ||
3845 | static int eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 3845 | static int eeprom_read_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
3846 | struct comedi_insn * insn, unsigned int * data) | 3846 | struct comedi_insn *insn, unsigned int *data) |
3847 | { | 3847 | { |
3848 | data[0] = read_eeprom(dev, CR_CHAN(insn->chanspec)); | 3848 | data[0] = read_eeprom(dev, CR_CHAN(insn->chanspec)); |
3849 | 3849 | ||
@@ -3928,7 +3928,7 @@ static unsigned int get_ao_divisor(unsigned int ns, unsigned int flags) | |||
3928 | } | 3928 | } |
3929 | 3929 | ||
3930 | /* adjusts the size of hardware fifo (which determines block size for dma xfers) */ | 3930 | /* adjusts the size of hardware fifo (which determines block size for dma xfers) */ |
3931 | static int set_ai_fifo_size(struct comedi_device * dev, unsigned int num_samples) | 3931 | static int set_ai_fifo_size(struct comedi_device *dev, unsigned int num_samples) |
3932 | { | 3932 | { |
3933 | unsigned int num_fifo_entries; | 3933 | unsigned int num_fifo_entries; |
3934 | int retval; | 3934 | int retval; |
@@ -3949,14 +3949,14 @@ static int set_ai_fifo_size(struct comedi_device * dev, unsigned int num_samples | |||
3949 | } | 3949 | } |
3950 | 3950 | ||
3951 | /* query length of fifo */ | 3951 | /* query length of fifo */ |
3952 | static unsigned int ai_fifo_size(struct comedi_device * dev) | 3952 | static unsigned int ai_fifo_size(struct comedi_device *dev) |
3953 | { | 3953 | { |
3954 | return priv(dev)->ai_fifo_segment_length * | 3954 | return priv(dev)->ai_fifo_segment_length * |
3955 | board(dev)->ai_fifo->num_segments * | 3955 | board(dev)->ai_fifo->num_segments * |
3956 | board(dev)->ai_fifo->sample_packing_ratio; | 3956 | board(dev)->ai_fifo->sample_packing_ratio; |
3957 | } | 3957 | } |
3958 | 3958 | ||
3959 | static int set_ai_fifo_segment_length(struct comedi_device * dev, | 3959 | static int set_ai_fifo_segment_length(struct comedi_device *dev, |
3960 | unsigned int num_entries) | 3960 | unsigned int num_entries) |
3961 | { | 3961 | { |
3962 | static const int increment_size = 0x100; | 3962 | static const int increment_size = 0x100; |
@@ -4007,7 +4007,7 @@ static int set_ai_fifo_segment_length(struct comedi_device * dev, | |||
4007 | * address 7 == dac channel 1 fine offset | 4007 | * address 7 == dac channel 1 fine offset |
4008 | */ | 4008 | */ |
4009 | 4009 | ||
4010 | static int caldac_8800_write(struct comedi_device * dev, unsigned int address, | 4010 | static int caldac_8800_write(struct comedi_device *dev, unsigned int address, |
4011 | uint8_t value) | 4011 | uint8_t value) |
4012 | { | 4012 | { |
4013 | static const int num_caldac_channels = 8; | 4013 | static const int num_caldac_channels = 8; |
@@ -4039,7 +4039,7 @@ static int caldac_8800_write(struct comedi_device * dev, unsigned int address, | |||
4039 | } | 4039 | } |
4040 | 4040 | ||
4041 | /* 4020 caldacs */ | 4041 | /* 4020 caldacs */ |
4042 | static int caldac_i2c_write(struct comedi_device * dev, unsigned int caldac_channel, | 4042 | static int caldac_i2c_write(struct comedi_device *dev, unsigned int caldac_channel, |
4043 | unsigned int value) | 4043 | unsigned int value) |
4044 | { | 4044 | { |
4045 | uint8_t serial_bytes[3]; | 4045 | uint8_t serial_bytes[3]; |
@@ -4104,7 +4104,7 @@ static const int i2c_high_comedi_udelay = 1000; | |||
4104 | static const int i2c_low_comedi_udelay = 10; | 4104 | static const int i2c_low_comedi_udelay = 10; |
4105 | 4105 | ||
4106 | /* set i2c data line high or low */ | 4106 | /* set i2c data line high or low */ |
4107 | static void i2c_set_sda(struct comedi_device * dev, int state) | 4107 | static void i2c_set_sda(struct comedi_device *dev, int state) |
4108 | { | 4108 | { |
4109 | static const int data_bit = CTL_EE_W; | 4109 | static const int data_bit = CTL_EE_W; |
4110 | void *plx_control_addr = priv(dev)->plx9080_iobase + PLX_CONTROL_REG; | 4110 | void *plx_control_addr = priv(dev)->plx9080_iobase + PLX_CONTROL_REG; |
@@ -4123,7 +4123,7 @@ static void i2c_set_sda(struct comedi_device * dev, int state) | |||
4123 | } | 4123 | } |
4124 | 4124 | ||
4125 | /* set i2c clock line high or low */ | 4125 | /* set i2c clock line high or low */ |
4126 | static void i2c_set_scl(struct comedi_device * dev, int state) | 4126 | static void i2c_set_scl(struct comedi_device *dev, int state) |
4127 | { | 4127 | { |
4128 | static const int clock_bit = CTL_USERO; | 4128 | static const int clock_bit = CTL_USERO; |
4129 | void *plx_control_addr = priv(dev)->plx9080_iobase + PLX_CONTROL_REG; | 4129 | void *plx_control_addr = priv(dev)->plx9080_iobase + PLX_CONTROL_REG; |
@@ -4141,7 +4141,7 @@ static void i2c_set_scl(struct comedi_device * dev, int state) | |||
4141 | } | 4141 | } |
4142 | } | 4142 | } |
4143 | 4143 | ||
4144 | static void i2c_write_byte(struct comedi_device * dev, uint8_t byte) | 4144 | static void i2c_write_byte(struct comedi_device *dev, uint8_t byte) |
4145 | { | 4145 | { |
4146 | uint8_t bit; | 4146 | uint8_t bit; |
4147 | unsigned int num_bits = 8; | 4147 | unsigned int num_bits = 8; |
@@ -4159,7 +4159,7 @@ static void i2c_write_byte(struct comedi_device * dev, uint8_t byte) | |||
4159 | } | 4159 | } |
4160 | 4160 | ||
4161 | /* we can't really read the lines, so fake it */ | 4161 | /* we can't really read the lines, so fake it */ |
4162 | static int i2c_read_ack(struct comedi_device * dev) | 4162 | static int i2c_read_ack(struct comedi_device *dev) |
4163 | { | 4163 | { |
4164 | i2c_set_scl(dev, 0); | 4164 | i2c_set_scl(dev, 0); |
4165 | i2c_set_sda(dev, 1); | 4165 | i2c_set_sda(dev, 1); |
@@ -4169,7 +4169,7 @@ static int i2c_read_ack(struct comedi_device * dev) | |||
4169 | } | 4169 | } |
4170 | 4170 | ||
4171 | /* send start bit */ | 4171 | /* send start bit */ |
4172 | static void i2c_start(struct comedi_device * dev) | 4172 | static void i2c_start(struct comedi_device *dev) |
4173 | { | 4173 | { |
4174 | i2c_set_scl(dev, 1); | 4174 | i2c_set_scl(dev, 1); |
4175 | i2c_set_sda(dev, 1); | 4175 | i2c_set_sda(dev, 1); |
@@ -4177,7 +4177,7 @@ static void i2c_start(struct comedi_device * dev) | |||
4177 | } | 4177 | } |
4178 | 4178 | ||
4179 | /* send stop bit */ | 4179 | /* send stop bit */ |
4180 | static void i2c_stop(struct comedi_device * dev) | 4180 | static void i2c_stop(struct comedi_device *dev) |
4181 | { | 4181 | { |
4182 | i2c_set_scl(dev, 0); | 4182 | i2c_set_scl(dev, 0); |
4183 | i2c_set_sda(dev, 0); | 4183 | i2c_set_sda(dev, 0); |
@@ -4185,8 +4185,8 @@ static void i2c_stop(struct comedi_device * dev) | |||
4185 | i2c_set_sda(dev, 1); | 4185 | i2c_set_sda(dev, 1); |
4186 | } | 4186 | } |
4187 | 4187 | ||
4188 | static void i2c_write(struct comedi_device * dev, unsigned int address, | 4188 | static void i2c_write(struct comedi_device *dev, unsigned int address, |
4189 | const uint8_t * data, unsigned int length) | 4189 | const uint8_t *data, unsigned int length) |
4190 | { | 4190 | { |
4191 | unsigned int i; | 4191 | unsigned int i; |
4192 | uint8_t bitstream; | 4192 | uint8_t bitstream; |
diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c index 581ff7a81ce..d87b04c9f93 100644 --- a/drivers/staging/comedi/drivers/cb_pcidda.c +++ b/drivers/staging/comedi/drivers/cb_pcidda.c | |||
@@ -239,22 +239,22 @@ struct cb_pcidda_private { | |||
239 | */ | 239 | */ |
240 | #define devpriv ((struct cb_pcidda_private *)dev->private) | 240 | #define devpriv ((struct cb_pcidda_private *)dev->private) |
241 | 241 | ||
242 | static int cb_pcidda_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 242 | static int cb_pcidda_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
243 | static int cb_pcidda_detach(struct comedi_device * dev); | 243 | static int cb_pcidda_detach(struct comedi_device *dev); |
244 | /* static int cb_pcidda_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data); */ | 244 | /* static int cb_pcidda_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data); */ |
245 | static int cb_pcidda_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 245 | static int cb_pcidda_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
246 | struct comedi_insn * insn, unsigned int * data); | 246 | struct comedi_insn *insn, unsigned int *data); |
247 | 247 | ||
248 | /* static int cb_pcidda_ai_cmd(struct comedi_device *dev, struct *comedi_subdevice *s);*/ | 248 | /* static int cb_pcidda_ai_cmd(struct comedi_device *dev, struct *comedi_subdevice *s);*/ |
249 | /* static int cb_pcidda_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd); */ | 249 | /* static int cb_pcidda_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd); */ |
250 | /* static int cb_pcidda_ns_to_timer(unsigned int *ns,int *round); */ | 250 | /* static int cb_pcidda_ns_to_timer(unsigned int *ns,int *round); */ |
251 | 251 | ||
252 | static unsigned int cb_pcidda_serial_in(struct comedi_device * dev); | 252 | static unsigned int cb_pcidda_serial_in(struct comedi_device *dev); |
253 | static void cb_pcidda_serial_out(struct comedi_device * dev, unsigned int value, | 253 | static void cb_pcidda_serial_out(struct comedi_device *dev, unsigned int value, |
254 | unsigned int num_bits); | 254 | unsigned int num_bits); |
255 | static unsigned int cb_pcidda_read_eeprom(struct comedi_device * dev, | 255 | static unsigned int cb_pcidda_read_eeprom(struct comedi_device *dev, |
256 | unsigned int address); | 256 | unsigned int address); |
257 | static void cb_pcidda_calibrate(struct comedi_device * dev, unsigned int channel, | 257 | static void cb_pcidda_calibrate(struct comedi_device *dev, unsigned int channel, |
258 | unsigned int range); | 258 | unsigned int range); |
259 | 259 | ||
260 | /* | 260 | /* |
@@ -274,7 +274,7 @@ static struct comedi_driver driver_cb_pcidda = { | |||
274 | * Attach is called by the Comedi core to configure the driver | 274 | * Attach is called by the Comedi core to configure the driver |
275 | * for a particular board. | 275 | * for a particular board. |
276 | */ | 276 | */ |
277 | static int cb_pcidda_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 277 | static int cb_pcidda_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
278 | { | 278 | { |
279 | struct comedi_subdevice *s; | 279 | struct comedi_subdevice *s; |
280 | struct pci_dev *pcidev; | 280 | struct pci_dev *pcidev; |
@@ -395,7 +395,7 @@ static int cb_pcidda_attach(struct comedi_device * dev, struct comedi_devconfig | |||
395 | * allocated by _attach(). dev->private and dev->subdevices are | 395 | * allocated by _attach(). dev->private and dev->subdevices are |
396 | * deallocated automatically by the core. | 396 | * deallocated automatically by the core. |
397 | */ | 397 | */ |
398 | static int cb_pcidda_detach(struct comedi_device * dev) | 398 | static int cb_pcidda_detach(struct comedi_device *dev) |
399 | { | 399 | { |
400 | /* | 400 | /* |
401 | * Deallocate the I/O ports. | 401 | * Deallocate the I/O ports. |
@@ -423,7 +423,7 @@ static int cb_pcidda_detach(struct comedi_device * dev) | |||
423 | * I will program this later... ;-) | 423 | * I will program this later... ;-) |
424 | */ | 424 | */ |
425 | #if 0 | 425 | #if 0 |
426 | static int cb_pcidda_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 426 | static int cb_pcidda_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
427 | { | 427 | { |
428 | printk("cb_pcidda_ai_cmd\n"); | 428 | printk("cb_pcidda_ai_cmd\n"); |
429 | printk("subdev: %d\n", cmd->subdev); | 429 | printk("subdev: %d\n", cmd->subdev); |
@@ -442,8 +442,8 @@ static int cb_pcidda_ai_cmd(struct comedi_device * dev, struct comedi_subdevice | |||
442 | #endif | 442 | #endif |
443 | 443 | ||
444 | #if 0 | 444 | #if 0 |
445 | static int cb_pcidda_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 445 | static int cb_pcidda_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
446 | struct comedi_cmd * cmd) | 446 | struct comedi_cmd *cmd) |
447 | { | 447 | { |
448 | int err = 0; | 448 | int err = 0; |
449 | int tmp; | 449 | int tmp; |
@@ -608,8 +608,8 @@ static int cb_pcidda_ns_to_timer(unsigned int *ns, int round) | |||
608 | } | 608 | } |
609 | #endif | 609 | #endif |
610 | 610 | ||
611 | static int cb_pcidda_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 611 | static int cb_pcidda_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
612 | struct comedi_insn * insn, unsigned int * data) | 612 | struct comedi_insn *insn, unsigned int *data) |
613 | { | 613 | { |
614 | unsigned int command; | 614 | unsigned int command; |
615 | unsigned int channel, range; | 615 | unsigned int channel, range; |
@@ -658,7 +658,7 @@ static int cb_pcidda_ao_winsn(struct comedi_device * dev, struct comedi_subdevic | |||
658 | } | 658 | } |
659 | 659 | ||
660 | /* lowlevel read from eeprom */ | 660 | /* lowlevel read from eeprom */ |
661 | static unsigned int cb_pcidda_serial_in(struct comedi_device * dev) | 661 | static unsigned int cb_pcidda_serial_in(struct comedi_device *dev) |
662 | { | 662 | { |
663 | unsigned int value = 0; | 663 | unsigned int value = 0; |
664 | int i; | 664 | int i; |
@@ -675,7 +675,7 @@ static unsigned int cb_pcidda_serial_in(struct comedi_device * dev) | |||
675 | } | 675 | } |
676 | 676 | ||
677 | /* lowlevel write to eeprom/dac */ | 677 | /* lowlevel write to eeprom/dac */ |
678 | static void cb_pcidda_serial_out(struct comedi_device * dev, unsigned int value, | 678 | static void cb_pcidda_serial_out(struct comedi_device *dev, unsigned int value, |
679 | unsigned int num_bits) | 679 | unsigned int num_bits) |
680 | { | 680 | { |
681 | int i; | 681 | int i; |
@@ -691,7 +691,7 @@ static void cb_pcidda_serial_out(struct comedi_device * dev, unsigned int value, | |||
691 | } | 691 | } |
692 | 692 | ||
693 | /* reads a 16 bit value from board's eeprom */ | 693 | /* reads a 16 bit value from board's eeprom */ |
694 | static unsigned int cb_pcidda_read_eeprom(struct comedi_device * dev, | 694 | static unsigned int cb_pcidda_read_eeprom(struct comedi_device *dev, |
695 | unsigned int address) | 695 | unsigned int address) |
696 | { | 696 | { |
697 | unsigned int i; | 697 | unsigned int i; |
@@ -725,7 +725,7 @@ static unsigned int cb_pcidda_read_eeprom(struct comedi_device * dev, | |||
725 | } | 725 | } |
726 | 726 | ||
727 | /* writes to 8 bit calibration dacs */ | 727 | /* writes to 8 bit calibration dacs */ |
728 | static void cb_pcidda_write_caldac(struct comedi_device * dev, unsigned int caldac, | 728 | static void cb_pcidda_write_caldac(struct comedi_device *dev, unsigned int caldac, |
729 | unsigned int channel, unsigned int value) | 729 | unsigned int channel, unsigned int value) |
730 | { | 730 | { |
731 | unsigned int cal2_bits; | 731 | unsigned int cal2_bits; |
@@ -812,7 +812,7 @@ static unsigned int eeprom_fine_byte(unsigned int word) | |||
812 | } | 812 | } |
813 | 813 | ||
814 | /* set caldacs to eeprom values for given channel and range */ | 814 | /* set caldacs to eeprom values for given channel and range */ |
815 | static void cb_pcidda_calibrate(struct comedi_device * dev, unsigned int channel, | 815 | static void cb_pcidda_calibrate(struct comedi_device *dev, unsigned int channel, |
816 | unsigned int range) | 816 | unsigned int range) |
817 | { | 817 | { |
818 | unsigned int coarse_offset, fine_offset, coarse_gain, fine_gain; | 818 | unsigned int coarse_offset, fine_offset, coarse_gain, fine_gain; |
diff --git a/drivers/staging/comedi/drivers/cb_pcidio.c b/drivers/staging/comedi/drivers/cb_pcidio.c index eeda0b3dc5b..ec7b2e21c05 100644 --- a/drivers/staging/comedi/drivers/cb_pcidio.c +++ b/drivers/staging/comedi/drivers/cb_pcidio.c | |||
@@ -127,8 +127,8 @@ struct pcidio_private { | |||
127 | * the board, and also about the kernel module that contains | 127 | * the board, and also about the kernel module that contains |
128 | * the device code. | 128 | * the device code. |
129 | */ | 129 | */ |
130 | static int pcidio_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 130 | static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
131 | static int pcidio_detach(struct comedi_device * dev); | 131 | static int pcidio_detach(struct comedi_device *dev); |
132 | static struct comedi_driver driver_cb_pcidio = { | 132 | static struct comedi_driver driver_cb_pcidio = { |
133 | driver_name:"cb_pcidio", | 133 | driver_name:"cb_pcidio", |
134 | module:THIS_MODULE, | 134 | module:THIS_MODULE, |
@@ -173,7 +173,7 @@ static struct comedi_driver driver_cb_pcidio = { | |||
173 | * in the driver structure, dev->board_ptr contains that | 173 | * in the driver structure, dev->board_ptr contains that |
174 | * address. | 174 | * address. |
175 | */ | 175 | */ |
176 | static int pcidio_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 176 | static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
177 | { | 177 | { |
178 | struct pci_dev *pcidev = NULL; | 178 | struct pci_dev *pcidev = NULL; |
179 | int index; | 179 | int index; |
@@ -274,7 +274,7 @@ static int pcidio_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
274 | * allocated by _attach(). dev->private and dev->subdevices are | 274 | * allocated by _attach(). dev->private and dev->subdevices are |
275 | * deallocated automatically by the core. | 275 | * deallocated automatically by the core. |
276 | */ | 276 | */ |
277 | static int pcidio_detach(struct comedi_device * dev) | 277 | static int pcidio_detach(struct comedi_device *dev) |
278 | { | 278 | { |
279 | printk("comedi%d: cb_pcidio: remove\n", dev->minor); | 279 | printk("comedi%d: cb_pcidio: remove\n", dev->minor); |
280 | if (devpriv) { | 280 | if (devpriv) { |
diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c index 49d32fb4a4b..0e20eadac2d 100644 --- a/drivers/staging/comedi/drivers/cb_pcimdas.c +++ b/drivers/staging/comedi/drivers/cb_pcimdas.c | |||
@@ -175,8 +175,8 @@ struct cb_pcimdas_private { | |||
175 | * the board, and also about the kernel module that contains | 175 | * the board, and also about the kernel module that contains |
176 | * the device code. | 176 | * the device code. |
177 | */ | 177 | */ |
178 | static int cb_pcimdas_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 178 | static int cb_pcimdas_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
179 | static int cb_pcimdas_detach(struct comedi_device * dev); | 179 | static int cb_pcimdas_detach(struct comedi_device *dev); |
180 | static struct comedi_driver driver_cb_pcimdas = { | 180 | static struct comedi_driver driver_cb_pcimdas = { |
181 | driver_name:"cb_pcimdas", | 181 | driver_name:"cb_pcimdas", |
182 | module:THIS_MODULE, | 182 | module:THIS_MODULE, |
@@ -184,12 +184,12 @@ static struct comedi_driver driver_cb_pcimdas = { | |||
184 | detach:cb_pcimdas_detach, | 184 | detach:cb_pcimdas_detach, |
185 | }; | 185 | }; |
186 | 186 | ||
187 | static int cb_pcimdas_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 187 | static int cb_pcimdas_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
188 | struct comedi_insn * insn, unsigned int * data); | 188 | struct comedi_insn *insn, unsigned int *data); |
189 | static int cb_pcimdas_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 189 | static int cb_pcimdas_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
190 | struct comedi_insn * insn, unsigned int * data); | 190 | struct comedi_insn *insn, unsigned int *data); |
191 | static int cb_pcimdas_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 191 | static int cb_pcimdas_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
192 | struct comedi_insn * insn, unsigned int * data); | 192 | struct comedi_insn *insn, unsigned int *data); |
193 | 193 | ||
194 | /* | 194 | /* |
195 | * Attach is called by the Comedi core to configure the driver | 195 | * Attach is called by the Comedi core to configure the driver |
@@ -197,7 +197,7 @@ static int cb_pcimdas_ao_rinsn(struct comedi_device * dev, struct comedi_subdevi | |||
197 | * in the driver structure, dev->board_ptr contains that | 197 | * in the driver structure, dev->board_ptr contains that |
198 | * address. | 198 | * address. |
199 | */ | 199 | */ |
200 | static int cb_pcimdas_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 200 | static int cb_pcimdas_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
201 | { | 201 | { |
202 | struct comedi_subdevice *s; | 202 | struct comedi_subdevice *s; |
203 | struct pci_dev *pcidev; | 203 | struct pci_dev *pcidev; |
@@ -342,7 +342,7 @@ static int cb_pcimdas_attach(struct comedi_device * dev, struct comedi_devconfig | |||
342 | * allocated by _attach(). dev->private and dev->subdevices are | 342 | * allocated by _attach(). dev->private and dev->subdevices are |
343 | * deallocated automatically by the core. | 343 | * deallocated automatically by the core. |
344 | */ | 344 | */ |
345 | static int cb_pcimdas_detach(struct comedi_device * dev) | 345 | static int cb_pcimdas_detach(struct comedi_device *dev) |
346 | { | 346 | { |
347 | #ifdef CBPCIMDAS_DEBUG | 347 | #ifdef CBPCIMDAS_DEBUG |
348 | if (devpriv) { | 348 | if (devpriv) { |
@@ -372,8 +372,8 @@ static int cb_pcimdas_detach(struct comedi_device * dev) | |||
372 | * "instructions" read/write data in "one-shot" or "software-triggered" | 372 | * "instructions" read/write data in "one-shot" or "software-triggered" |
373 | * mode. | 373 | * mode. |
374 | */ | 374 | */ |
375 | static int cb_pcimdas_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 375 | static int cb_pcimdas_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
376 | struct comedi_insn * insn, unsigned int * data) | 376 | struct comedi_insn *insn, unsigned int *data) |
377 | { | 377 | { |
378 | int n, i; | 378 | int n, i; |
379 | unsigned int d; | 379 | unsigned int d; |
@@ -437,8 +437,8 @@ static int cb_pcimdas_ai_rinsn(struct comedi_device * dev, struct comedi_subdevi | |||
437 | return n; | 437 | return n; |
438 | } | 438 | } |
439 | 439 | ||
440 | static int cb_pcimdas_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 440 | static int cb_pcimdas_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
441 | struct comedi_insn * insn, unsigned int * data) | 441 | struct comedi_insn *insn, unsigned int *data) |
442 | { | 442 | { |
443 | int i; | 443 | int i; |
444 | int chan = CR_CHAN(insn->chanspec); | 444 | int chan = CR_CHAN(insn->chanspec); |
@@ -465,8 +465,8 @@ static int cb_pcimdas_ao_winsn(struct comedi_device * dev, struct comedi_subdevi | |||
465 | 465 | ||
466 | /* AO subdevices should have a read insn as well as a write insn. | 466 | /* AO subdevices should have a read insn as well as a write insn. |
467 | * Usually this means copying a value stored in devpriv. */ | 467 | * Usually this means copying a value stored in devpriv. */ |
468 | static int cb_pcimdas_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 468 | static int cb_pcimdas_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
469 | struct comedi_insn * insn, unsigned int * data) | 469 | struct comedi_insn *insn, unsigned int *data) |
470 | { | 470 | { |
471 | int i; | 471 | int i; |
472 | int chan = CR_CHAN(insn->chanspec); | 472 | 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 4e6002c8dfb..1afedd8e7cc 100644 --- a/drivers/staging/comedi/drivers/cb_pcimdda.c +++ b/drivers/staging/comedi/drivers/cb_pcimdda.c | |||
@@ -181,8 +181,8 @@ struct board_private_struct { | |||
181 | * the board, and also about the kernel module that contains | 181 | * the board, and also about the kernel module that contains |
182 | * the device code. | 182 | * the device code. |
183 | */ | 183 | */ |
184 | static int attach(struct comedi_device * dev, struct comedi_devconfig * it); | 184 | static int attach(struct comedi_device *dev, struct comedi_devconfig *it); |
185 | static int detach(struct comedi_device * dev); | 185 | static int detach(struct comedi_device *dev); |
186 | static struct comedi_driver cb_pcimdda_driver = { | 186 | static struct comedi_driver cb_pcimdda_driver = { |
187 | driver_name:"cb_pcimdda", | 187 | driver_name:"cb_pcimdda", |
188 | module:THIS_MODULE, | 188 | module:THIS_MODULE, |
@@ -197,10 +197,10 @@ MODULE_DESCRIPTION("Comedi low-level driver for the Computerboards PCIM-DDA " | |||
197 | MODULE_LICENSE("GPL"); | 197 | MODULE_LICENSE("GPL"); |
198 | COMEDI_PCI_INITCLEANUP_NOMODULE(cb_pcimdda_driver, pci_table); | 198 | COMEDI_PCI_INITCLEANUP_NOMODULE(cb_pcimdda_driver, pci_table); |
199 | 199 | ||
200 | static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 200 | static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
201 | struct comedi_insn * insn, unsigned int * data); | 201 | struct comedi_insn *insn, unsigned int *data); |
202 | static int ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 202 | static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
203 | struct comedi_insn * insn, unsigned int * data); | 203 | struct comedi_insn *insn, unsigned int *data); |
204 | 204 | ||
205 | /*--------------------------------------------------------------------------- | 205 | /*--------------------------------------------------------------------------- |
206 | HELPER FUNCTION DECLARATIONS | 206 | HELPER FUNCTION DECLARATIONS |
@@ -226,7 +226,7 @@ static inline unsigned int figure_out_maxdata(int bits) | |||
226 | * | 226 | * |
227 | * Otherwise, returns a -errno on error | 227 | * Otherwise, returns a -errno on error |
228 | */ | 228 | */ |
229 | static int probe(struct comedi_device * dev, const struct comedi_devconfig * it); | 229 | static int probe(struct comedi_device *dev, const struct comedi_devconfig *it); |
230 | 230 | ||
231 | /*--------------------------------------------------------------------------- | 231 | /*--------------------------------------------------------------------------- |
232 | FUNCTION DEFINITIONS | 232 | FUNCTION DEFINITIONS |
@@ -238,7 +238,7 @@ static int probe(struct comedi_device * dev, const struct comedi_devconfig * it) | |||
238 | * in the driver structure, dev->board_ptr contains that | 238 | * in the driver structure, dev->board_ptr contains that |
239 | * address. | 239 | * address. |
240 | */ | 240 | */ |
241 | static int attach(struct comedi_device * dev, struct comedi_devconfig * it) | 241 | static int attach(struct comedi_device *dev, struct comedi_devconfig *it) |
242 | { | 242 | { |
243 | struct comedi_subdevice *s; | 243 | struct comedi_subdevice *s; |
244 | int err; | 244 | int err; |
@@ -326,7 +326,7 @@ static int attach(struct comedi_device * dev, struct comedi_devconfig * it) | |||
326 | * allocated by _attach(). dev->private and dev->subdevices are | 326 | * allocated by _attach(). dev->private and dev->subdevices are |
327 | * deallocated automatically by the core. | 327 | * deallocated automatically by the core. |
328 | */ | 328 | */ |
329 | static int detach(struct comedi_device * dev) | 329 | static int detach(struct comedi_device *dev) |
330 | { | 330 | { |
331 | if (devpriv) { | 331 | if (devpriv) { |
332 | 332 | ||
@@ -352,8 +352,8 @@ static int detach(struct comedi_device * dev) | |||
352 | return 0; | 352 | return 0; |
353 | } | 353 | } |
354 | 354 | ||
355 | static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 355 | static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
356 | struct comedi_insn * insn, unsigned int * data) | 356 | struct comedi_insn *insn, unsigned int *data) |
357 | { | 357 | { |
358 | int i; | 358 | int i; |
359 | int chan = CR_CHAN(insn->chanspec); | 359 | int chan = CR_CHAN(insn->chanspec); |
@@ -391,8 +391,8 @@ static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | |||
391 | all AO channels update simultaneously. This is useful for some control | 391 | all AO channels update simultaneously. This is useful for some control |
392 | applications, I would imagine. | 392 | applications, I would imagine. |
393 | */ | 393 | */ |
394 | static int ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 394 | static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
395 | struct comedi_insn * insn, unsigned int * data) | 395 | struct comedi_insn *insn, unsigned int *data) |
396 | { | 396 | { |
397 | int i; | 397 | int i; |
398 | int chan = CR_CHAN(insn->chanspec); | 398 | int chan = CR_CHAN(insn->chanspec); |
@@ -425,7 +425,7 @@ static int ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | |||
425 | * | 425 | * |
426 | * Otherwise, returns a -errno on error | 426 | * Otherwise, returns a -errno on error |
427 | */ | 427 | */ |
428 | static int probe(struct comedi_device * dev, const struct comedi_devconfig * it) | 428 | static int probe(struct comedi_device *dev, const struct comedi_devconfig *it) |
429 | { | 429 | { |
430 | struct pci_dev *pcidev; | 430 | struct pci_dev *pcidev; |
431 | int index; | 431 | int index; |
diff --git a/drivers/staging/comedi/drivers/comedi_rt_timer.c b/drivers/staging/comedi/drivers/comedi_rt_timer.c index c19ca8d3fb9..ba1f485f305 100644 --- a/drivers/staging/comedi/drivers/comedi_rt_timer.c +++ b/drivers/staging/comedi/drivers/comedi_rt_timer.c | |||
@@ -145,11 +145,11 @@ static inline RTIME nano2count(long long ns) | |||
145 | * task period because analog input tends to be slow. */ | 145 | * task period because analog input tends to be slow. */ |
146 | #define SPEED_LIMIT 100000 /* in nanoseconds */ | 146 | #define SPEED_LIMIT 100000 /* in nanoseconds */ |
147 | 147 | ||
148 | static int timer_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 148 | static int timer_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
149 | static int timer_detach(struct comedi_device * dev); | 149 | static int timer_detach(struct comedi_device *dev); |
150 | static int timer_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, | 150 | static int timer_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, |
151 | unsigned int trig_num); | 151 | unsigned int trig_num); |
152 | static int timer_start_cmd(struct comedi_device * dev, struct comedi_subdevice * s); | 152 | static int timer_start_cmd(struct comedi_device *dev, struct comedi_subdevice *s); |
153 | 153 | ||
154 | static struct comedi_driver driver_timer = { | 154 | static struct comedi_driver driver_timer = { |
155 | module:THIS_MODULE, | 155 | module:THIS_MODULE, |
@@ -168,7 +168,7 @@ struct timer_private { | |||
168 | RT_TASK *scan_task; /* rt task that controls conversion timing in a scan */ | 168 | RT_TASK *scan_task; /* rt task that controls conversion timing in a scan */ |
169 | /* io_function can point to either an input or output function | 169 | /* io_function can point to either an input or output function |
170 | * depending on what kind of subdevice we are emulating for */ | 170 | * depending on what kind of subdevice we are emulating for */ |
171 | int (*io_function) (struct comedi_device * dev, struct comedi_cmd * cmd, | 171 | int (*io_function) (struct comedi_device *dev, struct comedi_cmd *cmd, |
172 | unsigned int index); | 172 | unsigned int index); |
173 | /* | 173 | /* |
174 | * RTIME has units of 1 = 838 nanoseconds time at which first scan | 174 | * RTIME has units of 1 = 838 nanoseconds time at which first scan |
@@ -187,7 +187,7 @@ struct timer_private { | |||
187 | }; | 187 | }; |
188 | #define devpriv ((struct timer_private *)dev->private) | 188 | #define devpriv ((struct timer_private *)dev->private) |
189 | 189 | ||
190 | static int timer_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 190 | static int timer_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
191 | { | 191 | { |
192 | devpriv->stop = 1; | 192 | devpriv->stop = 1; |
193 | 193 | ||
@@ -195,7 +195,7 @@ static int timer_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | |||
195 | } | 195 | } |
196 | 196 | ||
197 | /* checks for scan timing error */ | 197 | /* checks for scan timing error */ |
198 | inline static int check_scan_timing(struct comedi_device * dev, | 198 | inline static int check_scan_timing(struct comedi_device *dev, |
199 | unsigned long long scan) | 199 | unsigned long long scan) |
200 | { | 200 | { |
201 | RTIME now, timing_error; | 201 | RTIME now, timing_error; |
@@ -212,7 +212,7 @@ inline static int check_scan_timing(struct comedi_device * dev, | |||
212 | } | 212 | } |
213 | 213 | ||
214 | /* checks for conversion timing error */ | 214 | /* checks for conversion timing error */ |
215 | inline static int check_conversion_timing(struct comedi_device * dev, | 215 | inline static int check_conversion_timing(struct comedi_device *dev, |
216 | RTIME scan_start, unsigned int conversion) | 216 | RTIME scan_start, unsigned int conversion) |
217 | { | 217 | { |
218 | RTIME now, timing_error; | 218 | RTIME now, timing_error; |
@@ -231,7 +231,7 @@ inline static int check_conversion_timing(struct comedi_device * dev, | |||
231 | } | 231 | } |
232 | 232 | ||
233 | /* devpriv->io_function for an input subdevice */ | 233 | /* devpriv->io_function for an input subdevice */ |
234 | static int timer_data_read(struct comedi_device * dev, struct comedi_cmd * cmd, | 234 | static int timer_data_read(struct comedi_device *dev, struct comedi_cmd *cmd, |
235 | unsigned int index) | 235 | unsigned int index) |
236 | { | 236 | { |
237 | struct comedi_subdevice *s = dev->read_subdev; | 237 | struct comedi_subdevice *s = dev->read_subdev; |
@@ -256,7 +256,7 @@ static int timer_data_read(struct comedi_device * dev, struct comedi_cmd * cmd, | |||
256 | } | 256 | } |
257 | 257 | ||
258 | /* devpriv->io_function for an output subdevice */ | 258 | /* devpriv->io_function for an output subdevice */ |
259 | static int timer_data_write(struct comedi_device * dev, struct comedi_cmd * cmd, | 259 | static int timer_data_write(struct comedi_device *dev, struct comedi_cmd *cmd, |
260 | unsigned int index) | 260 | unsigned int index) |
261 | { | 261 | { |
262 | struct comedi_subdevice *s = dev->write_subdev; | 262 | struct comedi_subdevice *s = dev->write_subdev; |
@@ -291,7 +291,7 @@ static int timer_data_write(struct comedi_device * dev, struct comedi_cmd * cmd, | |||
291 | } | 291 | } |
292 | 292 | ||
293 | /* devpriv->io_function for DIO subdevices */ | 293 | /* devpriv->io_function for DIO subdevices */ |
294 | static int timer_dio_read(struct comedi_device * dev, struct comedi_cmd * cmd, | 294 | static int timer_dio_read(struct comedi_device *dev, struct comedi_cmd *cmd, |
295 | unsigned int index) | 295 | unsigned int index) |
296 | { | 296 | { |
297 | struct comedi_subdevice *s = dev->read_subdev; | 297 | struct comedi_subdevice *s = dev->read_subdev; |
@@ -421,8 +421,8 @@ static void timer_task_func(comedi_rt_task_context_t d) | |||
421 | } | 421 | } |
422 | } | 422 | } |
423 | 423 | ||
424 | static int timer_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 424 | static int timer_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
425 | struct comedi_insn * insn, unsigned int * data) | 425 | struct comedi_insn *insn, unsigned int *data) |
426 | { | 426 | { |
427 | struct comedi_insn xinsn = *insn; | 427 | struct comedi_insn xinsn = *insn; |
428 | 428 | ||
@@ -432,7 +432,7 @@ static int timer_insn(struct comedi_device * dev, struct comedi_subdevice * s, | |||
432 | return comedi_do_insn(devpriv->device, &xinsn); | 432 | return comedi_do_insn(devpriv->device, &xinsn); |
433 | } | 433 | } |
434 | 434 | ||
435 | static int cmdtest_helper(struct comedi_cmd * cmd, | 435 | static int cmdtest_helper(struct comedi_cmd *cmd, |
436 | unsigned int start_src, | 436 | unsigned int start_src, |
437 | unsigned int scan_begin_src, | 437 | unsigned int scan_begin_src, |
438 | unsigned int convert_src, | 438 | unsigned int convert_src, |
@@ -469,8 +469,8 @@ static int cmdtest_helper(struct comedi_cmd * cmd, | |||
469 | return err; | 469 | return err; |
470 | } | 470 | } |
471 | 471 | ||
472 | static int timer_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 472 | static int timer_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
473 | struct comedi_cmd * cmd) | 473 | struct comedi_cmd *cmd) |
474 | { | 474 | { |
475 | int err = 0; | 475 | int err = 0; |
476 | unsigned int start_src = 0; | 476 | unsigned int start_src = 0; |
@@ -541,7 +541,7 @@ static int timer_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s | |||
541 | return 0; | 541 | return 0; |
542 | } | 542 | } |
543 | 543 | ||
544 | static int timer_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 544 | static int timer_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
545 | { | 545 | { |
546 | int ret; | 546 | int ret; |
547 | struct comedi_cmd *cmd = &s->async->cmd; | 547 | struct comedi_cmd *cmd = &s->async->cmd; |
@@ -592,7 +592,7 @@ static int timer_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
592 | return 0; | 592 | return 0; |
593 | } | 593 | } |
594 | 594 | ||
595 | static int timer_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, | 595 | static int timer_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, |
596 | unsigned int trig_num) | 596 | unsigned int trig_num) |
597 | { | 597 | { |
598 | if (trig_num != 0) | 598 | if (trig_num != 0) |
@@ -603,7 +603,7 @@ static int timer_inttrig(struct comedi_device * dev, struct comedi_subdevice * s | |||
603 | return timer_start_cmd(dev, s); | 603 | return timer_start_cmd(dev, s); |
604 | } | 604 | } |
605 | 605 | ||
606 | static int timer_start_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 606 | static int timer_start_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
607 | { | 607 | { |
608 | struct comedi_async *async = s->async; | 608 | struct comedi_async *async = s->async; |
609 | struct comedi_cmd *cmd = &async->cmd; | 609 | struct comedi_cmd *cmd = &async->cmd; |
@@ -632,7 +632,7 @@ static int timer_start_cmd(struct comedi_device * dev, struct comedi_subdevice * | |||
632 | return 0; | 632 | return 0; |
633 | } | 633 | } |
634 | 634 | ||
635 | static int timer_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 635 | static int timer_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
636 | { | 636 | { |
637 | int ret; | 637 | int ret; |
638 | struct comedi_subdevice *s, *emul_s; | 638 | struct comedi_subdevice *s, *emul_s; |
@@ -731,7 +731,7 @@ static int timer_attach(struct comedi_device * dev, struct comedi_devconfig * it | |||
731 | } | 731 | } |
732 | 732 | ||
733 | /* free allocated resources */ | 733 | /* free allocated resources */ |
734 | static int timer_detach(struct comedi_device * dev) | 734 | static int timer_detach(struct comedi_device *dev) |
735 | { | 735 | { |
736 | printk("comedi%d: timer: remove\n", dev->minor); | 736 | printk("comedi%d: timer: remove\n", dev->minor); |
737 | 737 | ||
diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c index 1f194a0a45d..6c0d26e86c1 100644 --- a/drivers/staging/comedi/drivers/contec_pci_dio.c +++ b/drivers/staging/comedi/drivers/contec_pci_dio.c | |||
@@ -75,8 +75,8 @@ struct contec_private { | |||
75 | 75 | ||
76 | #define devpriv ((struct contec_private *)dev->private) | 76 | #define devpriv ((struct contec_private *)dev->private) |
77 | 77 | ||
78 | static int contec_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 78 | static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
79 | static int contec_detach(struct comedi_device * dev); | 79 | static int contec_detach(struct comedi_device *dev); |
80 | static struct comedi_driver driver_contec = { | 80 | static struct comedi_driver driver_contec = { |
81 | driver_name:"contec_pci_dio", | 81 | driver_name:"contec_pci_dio", |
82 | module:THIS_MODULE, | 82 | module:THIS_MODULE, |
@@ -85,19 +85,19 @@ static struct comedi_driver driver_contec = { | |||
85 | }; | 85 | }; |
86 | 86 | ||
87 | /* Classic digital IO */ | 87 | /* Classic digital IO */ |
88 | static int contec_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 88 | static int contec_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
89 | struct comedi_insn * insn, unsigned int * data); | 89 | struct comedi_insn *insn, unsigned int *data); |
90 | static int contec_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 90 | static int contec_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
91 | struct comedi_insn * insn, unsigned int * data); | 91 | struct comedi_insn *insn, unsigned int *data); |
92 | 92 | ||
93 | #if 0 | 93 | #if 0 |
94 | static int contec_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 94 | static int contec_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
95 | struct comedi_cmd * cmd); | 95 | struct comedi_cmd *cmd); |
96 | 96 | ||
97 | static int contec_ns_to_timer(unsigned int *ns, int round); | 97 | static int contec_ns_to_timer(unsigned int *ns, int round); |
98 | #endif | 98 | #endif |
99 | 99 | ||
100 | static int contec_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 100 | static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
101 | { | 101 | { |
102 | struct pci_dev *pcidev; | 102 | struct pci_dev *pcidev; |
103 | struct comedi_subdevice *s; | 103 | struct comedi_subdevice *s; |
@@ -164,7 +164,7 @@ static int contec_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
164 | return -EIO; | 164 | return -EIO; |
165 | } | 165 | } |
166 | 166 | ||
167 | static int contec_detach(struct comedi_device * dev) | 167 | static int contec_detach(struct comedi_device *dev) |
168 | { | 168 | { |
169 | printk("comedi%d: contec: remove\n", dev->minor); | 169 | printk("comedi%d: contec: remove\n", dev->minor); |
170 | 170 | ||
@@ -179,8 +179,8 @@ static int contec_detach(struct comedi_device * dev) | |||
179 | } | 179 | } |
180 | 180 | ||
181 | #if 0 | 181 | #if 0 |
182 | static int contec_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 182 | static int contec_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
183 | struct comedi_cmd * cmd) | 183 | struct comedi_cmd *cmd) |
184 | { | 184 | { |
185 | printk("contec_cmdtest called\n"); | 185 | printk("contec_cmdtest called\n"); |
186 | return 0; | 186 | return 0; |
@@ -192,8 +192,8 @@ static int contec_ns_to_timer(unsigned int *ns, int round) | |||
192 | } | 192 | } |
193 | #endif | 193 | #endif |
194 | 194 | ||
195 | static int contec_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 195 | static int contec_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
196 | struct comedi_insn * insn, unsigned int * data) | 196 | struct comedi_insn *insn, unsigned int *data) |
197 | { | 197 | { |
198 | 198 | ||
199 | printk("contec_do_insn_bits called\n"); | 199 | printk("contec_do_insn_bits called\n"); |
@@ -212,8 +212,8 @@ static int contec_do_insn_bits(struct comedi_device * dev, struct comedi_subdevi | |||
212 | return 2; | 212 | return 2; |
213 | } | 213 | } |
214 | 214 | ||
215 | static int contec_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 215 | static int contec_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
216 | struct comedi_insn * insn, unsigned int * data) | 216 | struct comedi_insn *insn, unsigned int *data) |
217 | { | 217 | { |
218 | 218 | ||
219 | rt_printk("contec_di_insn_bits called\n"); | 219 | 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 4afc88cb717..90bed0b962e 100644 --- a/drivers/staging/comedi/drivers/daqboard2000.c +++ b/drivers/staging/comedi/drivers/daqboard2000.c | |||
@@ -296,8 +296,8 @@ struct daqboard2000_hw { | |||
296 | #define DAQBOARD2000_PosRefDacSelect 0x0100 | 296 | #define DAQBOARD2000_PosRefDacSelect 0x0100 |
297 | #define DAQBOARD2000_NegRefDacSelect 0x0000 | 297 | #define DAQBOARD2000_NegRefDacSelect 0x0000 |
298 | 298 | ||
299 | static int daqboard2000_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 299 | static int daqboard2000_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
300 | static int daqboard2000_detach(struct comedi_device * dev); | 300 | static int daqboard2000_detach(struct comedi_device *dev); |
301 | 301 | ||
302 | static struct comedi_driver driver_daqboard2000 = { | 302 | static struct comedi_driver driver_daqboard2000 = { |
303 | driver_name:"daqboard2000", | 303 | driver_name:"daqboard2000", |
@@ -338,7 +338,7 @@ struct daqboard2000_private { | |||
338 | 338 | ||
339 | #define devpriv ((struct daqboard2000_private *)dev->private) | 339 | #define devpriv ((struct daqboard2000_private *)dev->private) |
340 | 340 | ||
341 | static void writeAcqScanListEntry(struct comedi_device * dev, u16 entry) | 341 | static void writeAcqScanListEntry(struct comedi_device *dev, u16 entry) |
342 | { | 342 | { |
343 | struct daqboard2000_hw *fpga = devpriv->daq; | 343 | struct daqboard2000_hw *fpga = devpriv->daq; |
344 | 344 | ||
@@ -348,7 +348,7 @@ static void writeAcqScanListEntry(struct comedi_device * dev, u16 entry) | |||
348 | fpga->acqScanListFIFO = (entry >> 8) & 0x00ff; | 348 | fpga->acqScanListFIFO = (entry >> 8) & 0x00ff; |
349 | } | 349 | } |
350 | 350 | ||
351 | static void setup_sampling(struct comedi_device * dev, int chan, int gain) | 351 | static void setup_sampling(struct comedi_device *dev, int chan, int gain) |
352 | { | 352 | { |
353 | u16 word0, word1, word2, word3; | 353 | u16 word0, word1, word2, word3; |
354 | 354 | ||
@@ -393,8 +393,8 @@ static void setup_sampling(struct comedi_device * dev, int chan, int gain) | |||
393 | writeAcqScanListEntry(dev, word3); | 393 | writeAcqScanListEntry(dev, word3); |
394 | } | 394 | } |
395 | 395 | ||
396 | static int daqboard2000_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 396 | static int daqboard2000_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
397 | struct comedi_insn * insn, unsigned int * data) | 397 | struct comedi_insn *insn, unsigned int *data) |
398 | { | 398 | { |
399 | int i; | 399 | int i; |
400 | struct daqboard2000_hw *fpga = devpriv->daq; | 400 | struct daqboard2000_hw *fpga = devpriv->daq; |
@@ -450,8 +450,8 @@ static int daqboard2000_ai_insn_read(struct comedi_device * dev, struct comedi_s | |||
450 | return i; | 450 | return i; |
451 | } | 451 | } |
452 | 452 | ||
453 | static int daqboard2000_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 453 | static int daqboard2000_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
454 | struct comedi_insn * insn, unsigned int * data) | 454 | struct comedi_insn *insn, unsigned int *data) |
455 | { | 455 | { |
456 | int i; | 456 | int i; |
457 | int chan = CR_CHAN(insn->chanspec); | 457 | int chan = CR_CHAN(insn->chanspec); |
@@ -463,8 +463,8 @@ static int daqboard2000_ao_insn_read(struct comedi_device * dev, struct comedi_s | |||
463 | return i; | 463 | return i; |
464 | } | 464 | } |
465 | 465 | ||
466 | static int daqboard2000_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 466 | static int daqboard2000_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
467 | struct comedi_insn * insn, unsigned int * data) | 467 | struct comedi_insn *insn, unsigned int *data) |
468 | { | 468 | { |
469 | int i; | 469 | int i; |
470 | int chan = CR_CHAN(insn->chanspec); | 470 | int chan = CR_CHAN(insn->chanspec); |
@@ -494,7 +494,7 @@ static int daqboard2000_ao_insn_write(struct comedi_device * dev, struct comedi_ | |||
494 | return i; | 494 | return i; |
495 | } | 495 | } |
496 | 496 | ||
497 | static void daqboard2000_resetLocalBus(struct comedi_device * dev) | 497 | static void daqboard2000_resetLocalBus(struct comedi_device *dev) |
498 | { | 498 | { |
499 | printk("daqboard2000_resetLocalBus\n"); | 499 | printk("daqboard2000_resetLocalBus\n"); |
500 | writel(DAQBOARD2000_SECRLocalBusHi, devpriv->plx + 0x6c); | 500 | writel(DAQBOARD2000_SECRLocalBusHi, devpriv->plx + 0x6c); |
@@ -503,7 +503,7 @@ static void daqboard2000_resetLocalBus(struct comedi_device * dev) | |||
503 | comedi_udelay(10000); | 503 | comedi_udelay(10000); |
504 | } | 504 | } |
505 | 505 | ||
506 | static void daqboard2000_reloadPLX(struct comedi_device * dev) | 506 | static void daqboard2000_reloadPLX(struct comedi_device *dev) |
507 | { | 507 | { |
508 | printk("daqboard2000_reloadPLX\n"); | 508 | printk("daqboard2000_reloadPLX\n"); |
509 | writel(DAQBOARD2000_SECRReloadLo, devpriv->plx + 0x6c); | 509 | writel(DAQBOARD2000_SECRReloadLo, devpriv->plx + 0x6c); |
@@ -514,7 +514,7 @@ static void daqboard2000_reloadPLX(struct comedi_device * dev) | |||
514 | comedi_udelay(10000); | 514 | comedi_udelay(10000); |
515 | } | 515 | } |
516 | 516 | ||
517 | static void daqboard2000_pulseProgPin(struct comedi_device * dev) | 517 | static void daqboard2000_pulseProgPin(struct comedi_device *dev) |
518 | { | 518 | { |
519 | printk("daqboard2000_pulseProgPin 1\n"); | 519 | printk("daqboard2000_pulseProgPin 1\n"); |
520 | writel(DAQBOARD2000_SECRProgPinHi, devpriv->plx + 0x6c); | 520 | writel(DAQBOARD2000_SECRProgPinHi, devpriv->plx + 0x6c); |
@@ -523,7 +523,7 @@ static void daqboard2000_pulseProgPin(struct comedi_device * dev) | |||
523 | comedi_udelay(10000); /* Not in the original code, but I like symmetry... */ | 523 | comedi_udelay(10000); /* Not in the original code, but I like symmetry... */ |
524 | } | 524 | } |
525 | 525 | ||
526 | static int daqboard2000_pollCPLD(struct comedi_device * dev, int mask) | 526 | static int daqboard2000_pollCPLD(struct comedi_device *dev, int mask) |
527 | { | 527 | { |
528 | int result = 0; | 528 | int result = 0; |
529 | int i; | 529 | int i; |
@@ -542,7 +542,7 @@ static int daqboard2000_pollCPLD(struct comedi_device * dev, int mask) | |||
542 | return result; | 542 | return result; |
543 | } | 543 | } |
544 | 544 | ||
545 | static int daqboard2000_writeCPLD(struct comedi_device * dev, int data) | 545 | static int daqboard2000_writeCPLD(struct comedi_device *dev, int data) |
546 | { | 546 | { |
547 | int result = 0; | 547 | int result = 0; |
548 | 548 | ||
@@ -555,7 +555,7 @@ static int daqboard2000_writeCPLD(struct comedi_device * dev, int data) | |||
555 | return result; | 555 | return result; |
556 | } | 556 | } |
557 | 557 | ||
558 | static int initialize_daqboard2000(struct comedi_device * dev, | 558 | static int initialize_daqboard2000(struct comedi_device *dev, |
559 | unsigned char *cpld_array, int len) | 559 | unsigned char *cpld_array, int len) |
560 | { | 560 | { |
561 | int result = -EIO; | 561 | int result = -EIO; |
@@ -613,12 +613,12 @@ static int initialize_daqboard2000(struct comedi_device * dev, | |||
613 | return result; | 613 | return result; |
614 | } | 614 | } |
615 | 615 | ||
616 | static void daqboard2000_adcStopDmaTransfer(struct comedi_device * dev) | 616 | static void daqboard2000_adcStopDmaTransfer(struct comedi_device *dev) |
617 | { | 617 | { |
618 | /* printk("Implement: daqboard2000_adcStopDmaTransfer\n");*/ | 618 | /* printk("Implement: daqboard2000_adcStopDmaTransfer\n");*/ |
619 | } | 619 | } |
620 | 620 | ||
621 | static void daqboard2000_adcDisarm(struct comedi_device * dev) | 621 | static void daqboard2000_adcDisarm(struct comedi_device *dev) |
622 | { | 622 | { |
623 | struct daqboard2000_hw *fpga = devpriv->daq; | 623 | struct daqboard2000_hw *fpga = devpriv->daq; |
624 | 624 | ||
@@ -640,7 +640,7 @@ static void daqboard2000_adcDisarm(struct comedi_device * dev) | |||
640 | daqboard2000_adcStopDmaTransfer(dev); | 640 | daqboard2000_adcStopDmaTransfer(dev); |
641 | } | 641 | } |
642 | 642 | ||
643 | static void daqboard2000_activateReferenceDacs(struct comedi_device * dev) | 643 | static void daqboard2000_activateReferenceDacs(struct comedi_device *dev) |
644 | { | 644 | { |
645 | struct daqboard2000_hw *fpga = devpriv->daq; | 645 | struct daqboard2000_hw *fpga = devpriv->daq; |
646 | int timeout; | 646 | int timeout; |
@@ -666,22 +666,22 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device * dev) | |||
666 | /* printk("DAQBOARD2000_NegRefDacSelect %d\n", timeout);*/ | 666 | /* printk("DAQBOARD2000_NegRefDacSelect %d\n", timeout);*/ |
667 | } | 667 | } |
668 | 668 | ||
669 | static void daqboard2000_initializeCtrs(struct comedi_device * dev) | 669 | static void daqboard2000_initializeCtrs(struct comedi_device *dev) |
670 | { | 670 | { |
671 | /* printk("Implement: daqboard2000_initializeCtrs\n");*/ | 671 | /* printk("Implement: daqboard2000_initializeCtrs\n");*/ |
672 | } | 672 | } |
673 | 673 | ||
674 | static void daqboard2000_initializeTmrs(struct comedi_device * dev) | 674 | static void daqboard2000_initializeTmrs(struct comedi_device *dev) |
675 | { | 675 | { |
676 | /* printk("Implement: daqboard2000_initializeTmrs\n");*/ | 676 | /* printk("Implement: daqboard2000_initializeTmrs\n");*/ |
677 | } | 677 | } |
678 | 678 | ||
679 | static void daqboard2000_dacDisarm(struct comedi_device * dev) | 679 | static void daqboard2000_dacDisarm(struct comedi_device *dev) |
680 | { | 680 | { |
681 | /* printk("Implement: daqboard2000_dacDisarm\n");*/ | 681 | /* printk("Implement: daqboard2000_dacDisarm\n");*/ |
682 | } | 682 | } |
683 | 683 | ||
684 | static void daqboard2000_initializeAdc(struct comedi_device * dev) | 684 | static void daqboard2000_initializeAdc(struct comedi_device *dev) |
685 | { | 685 | { |
686 | daqboard2000_adcDisarm(dev); | 686 | daqboard2000_adcDisarm(dev); |
687 | daqboard2000_activateReferenceDacs(dev); | 687 | daqboard2000_activateReferenceDacs(dev); |
@@ -689,7 +689,7 @@ static void daqboard2000_initializeAdc(struct comedi_device * dev) | |||
689 | daqboard2000_initializeTmrs(dev); | 689 | daqboard2000_initializeTmrs(dev); |
690 | } | 690 | } |
691 | 691 | ||
692 | static void daqboard2000_initializeDac(struct comedi_device * dev) | 692 | static void daqboard2000_initializeDac(struct comedi_device *dev) |
693 | { | 693 | { |
694 | daqboard2000_dacDisarm(dev); | 694 | daqboard2000_dacDisarm(dev); |
695 | } | 695 | } |
@@ -717,7 +717,7 @@ static int daqboard2000_8255_cb(int dir, int port, int data, | |||
717 | return result; | 717 | return result; |
718 | } | 718 | } |
719 | 719 | ||
720 | static int daqboard2000_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 720 | static int daqboard2000_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
721 | { | 721 | { |
722 | int result = 0; | 722 | int result = 0; |
723 | struct comedi_subdevice *s; | 723 | struct comedi_subdevice *s; |
@@ -849,7 +849,7 @@ static int daqboard2000_attach(struct comedi_device * dev, struct comedi_devconf | |||
849 | return result; | 849 | return result; |
850 | } | 850 | } |
851 | 851 | ||
852 | static int daqboard2000_detach(struct comedi_device * dev) | 852 | static int daqboard2000_detach(struct comedi_device *dev) |
853 | { | 853 | { |
854 | printk("comedi%d: daqboard2000: remove\n", dev->minor); | 854 | printk("comedi%d: daqboard2000: remove\n", dev->minor); |
855 | 855 | ||
diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c index a2e261c96ba..51dddd464ef 100644 --- a/drivers/staging/comedi/drivers/das08.c +++ b/drivers/staging/comedi/drivers/das08.c | |||
@@ -154,20 +154,20 @@ driver. | |||
154 | 154 | ||
155 | /* gainlist same as _pgx_ below */ | 155 | /* gainlist same as _pgx_ below */ |
156 | 156 | ||
157 | static int das08_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 157 | static int das08_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
158 | struct comedi_insn * insn, unsigned int * data); | 158 | struct comedi_insn *insn, unsigned int *data); |
159 | static int das08_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, | 159 | static int das08_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s, |
160 | struct comedi_insn * insn, unsigned int * data); | 160 | struct comedi_insn *insn, unsigned int *data); |
161 | static int das08_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, | 161 | static int das08_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s, |
162 | struct comedi_insn * insn, unsigned int * data); | 162 | struct comedi_insn *insn, unsigned int *data); |
163 | static int das08jr_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, | 163 | static int das08jr_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s, |
164 | struct comedi_insn * insn, unsigned int * data); | 164 | struct comedi_insn *insn, unsigned int *data); |
165 | static int das08jr_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, | 165 | static int das08jr_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s, |
166 | struct comedi_insn * insn, unsigned int * data); | 166 | struct comedi_insn *insn, unsigned int *data); |
167 | static int das08jr_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 167 | static int das08jr_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
168 | struct comedi_insn * insn, unsigned int * data); | 168 | struct comedi_insn *insn, unsigned int *data); |
169 | static int das08ao_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 169 | static int das08ao_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
170 | struct comedi_insn * insn, unsigned int * data); | 170 | struct comedi_insn *insn, unsigned int *data); |
171 | static void i8254_set_mode_low(unsigned int base, int channel, | 171 | static void i8254_set_mode_low(unsigned int base, int channel, |
172 | unsigned int mode); | 172 | unsigned int mode); |
173 | 173 | ||
@@ -512,8 +512,8 @@ MODULE_DEVICE_TABLE(pci, das08_pci_table); | |||
512 | 512 | ||
513 | #define TIMEOUT 100000 | 513 | #define TIMEOUT 100000 |
514 | 514 | ||
515 | static int das08_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 515 | static int das08_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
516 | struct comedi_insn * insn, unsigned int * data) | 516 | struct comedi_insn *insn, unsigned int *data) |
517 | { | 517 | { |
518 | int i, n; | 518 | int i, n; |
519 | int chan; | 519 | int chan; |
@@ -579,8 +579,8 @@ static int das08_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * | |||
579 | return n; | 579 | return n; |
580 | } | 580 | } |
581 | 581 | ||
582 | static int das08_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, | 582 | static int das08_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s, |
583 | struct comedi_insn * insn, unsigned int * data) | 583 | struct comedi_insn *insn, unsigned int *data) |
584 | { | 584 | { |
585 | data[0] = 0; | 585 | data[0] = 0; |
586 | data[1] = DAS08_IP(inb(dev->iobase + DAS08_STATUS)); | 586 | data[1] = DAS08_IP(inb(dev->iobase + DAS08_STATUS)); |
@@ -588,8 +588,8 @@ static int das08_di_rbits(struct comedi_device * dev, struct comedi_subdevice * | |||
588 | return 2; | 588 | return 2; |
589 | } | 589 | } |
590 | 590 | ||
591 | static int das08_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, | 591 | static int das08_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s, |
592 | struct comedi_insn * insn, unsigned int * data) | 592 | struct comedi_insn *insn, unsigned int *data) |
593 | { | 593 | { |
594 | int wbits; | 594 | int wbits; |
595 | 595 | ||
@@ -611,8 +611,8 @@ static int das08_do_wbits(struct comedi_device * dev, struct comedi_subdevice * | |||
611 | return 2; | 611 | return 2; |
612 | } | 612 | } |
613 | 613 | ||
614 | static int das08jr_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, | 614 | static int das08jr_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s, |
615 | struct comedi_insn * insn, unsigned int * data) | 615 | struct comedi_insn *insn, unsigned int *data) |
616 | { | 616 | { |
617 | data[0] = 0; | 617 | data[0] = 0; |
618 | data[1] = inb(dev->iobase + DAS08JR_DIO); | 618 | data[1] = inb(dev->iobase + DAS08JR_DIO); |
@@ -620,8 +620,8 @@ static int das08jr_di_rbits(struct comedi_device * dev, struct comedi_subdevice | |||
620 | return 2; | 620 | return 2; |
621 | } | 621 | } |
622 | 622 | ||
623 | static int das08jr_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, | 623 | static int das08jr_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s, |
624 | struct comedi_insn * insn, unsigned int * data) | 624 | struct comedi_insn *insn, unsigned int *data) |
625 | { | 625 | { |
626 | /* null bits we are going to set */ | 626 | /* null bits we are going to set */ |
627 | devpriv->do_bits &= ~data[0]; | 627 | devpriv->do_bits &= ~data[0]; |
@@ -634,8 +634,8 @@ static int das08jr_do_wbits(struct comedi_device * dev, struct comedi_subdevice | |||
634 | return 2; | 634 | return 2; |
635 | } | 635 | } |
636 | 636 | ||
637 | static int das08jr_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 637 | static int das08jr_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
638 | struct comedi_insn * insn, unsigned int * data) | 638 | struct comedi_insn *insn, unsigned int *data) |
639 | { | 639 | { |
640 | int n; | 640 | int n; |
641 | int lsb, msb; | 641 | int lsb, msb; |
@@ -668,8 +668,8 @@ static int das08jr_ao_winsn(struct comedi_device * dev, struct comedi_subdevice | |||
668 | * a different method to force an update. | 668 | * a different method to force an update. |
669 | * | 669 | * |
670 | */ | 670 | */ |
671 | static int das08ao_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 671 | static int das08ao_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
672 | struct comedi_insn * insn, unsigned int * data) | 672 | struct comedi_insn *insn, unsigned int *data) |
673 | { | 673 | { |
674 | int n; | 674 | int n; |
675 | int lsb, msb; | 675 | int lsb, msb; |
@@ -782,8 +782,8 @@ static unsigned int i8254_read_status(struct i8254_struct *st, int channel) | |||
782 | return i8254_read_status_low(st->iobase, chan); | 782 | return i8254_read_status_low(st->iobase, chan); |
783 | } | 783 | } |
784 | 784 | ||
785 | static int das08_counter_read(struct comedi_device * dev, struct comedi_subdevice * s, | 785 | static int das08_counter_read(struct comedi_device *dev, struct comedi_subdevice *s, |
786 | struct comedi_insn * insn, unsigned int * data) | 786 | struct comedi_insn *insn, unsigned int *data) |
787 | { | 787 | { |
788 | int chan = insn->chanspec; | 788 | int chan = insn->chanspec; |
789 | 789 | ||
@@ -794,8 +794,8 @@ static int das08_counter_read(struct comedi_device * dev, struct comedi_subdevic | |||
794 | return 1; | 794 | return 1; |
795 | } | 795 | } |
796 | 796 | ||
797 | static int das08_counter_write(struct comedi_device * dev, struct comedi_subdevice * s, | 797 | static int das08_counter_write(struct comedi_device *dev, struct comedi_subdevice *s, |
798 | struct comedi_insn * insn, unsigned int * data) | 798 | struct comedi_insn *insn, unsigned int *data) |
799 | { | 799 | { |
800 | int chan = insn->chanspec; | 800 | int chan = insn->chanspec; |
801 | 801 | ||
@@ -805,8 +805,8 @@ static int das08_counter_write(struct comedi_device * dev, struct comedi_subdevi | |||
805 | return 1; | 805 | return 1; |
806 | } | 806 | } |
807 | 807 | ||
808 | static int das08_counter_config(struct comedi_device * dev, struct comedi_subdevice * s, | 808 | static int das08_counter_config(struct comedi_device *dev, struct comedi_subdevice *s, |
809 | struct comedi_insn * insn, unsigned int * data) | 809 | struct comedi_insn *insn, unsigned int *data) |
810 | { | 810 | { |
811 | int chan = insn->chanspec; | 811 | int chan = insn->chanspec; |
812 | 812 | ||
@@ -827,7 +827,7 @@ static int das08_counter_config(struct comedi_device * dev, struct comedi_subdev | |||
827 | return 2; | 827 | return 2; |
828 | } | 828 | } |
829 | 829 | ||
830 | static int das08_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 830 | static int das08_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
831 | 831 | ||
832 | static struct comedi_driver driver_das08 = { | 832 | static struct comedi_driver driver_das08 = { |
833 | driver_name: DRV_NAME, | 833 | driver_name: DRV_NAME, |
@@ -840,7 +840,7 @@ static struct comedi_driver driver_das08 = { | |||
840 | offset:sizeof(struct das08_board_struct), | 840 | offset:sizeof(struct das08_board_struct), |
841 | }; | 841 | }; |
842 | 842 | ||
843 | int das08_common_attach(struct comedi_device * dev, unsigned long iobase) | 843 | int das08_common_attach(struct comedi_device *dev, unsigned long iobase) |
844 | { | 844 | { |
845 | struct comedi_subdevice *s; | 845 | struct comedi_subdevice *s; |
846 | int ret; | 846 | int ret; |
@@ -952,7 +952,7 @@ int das08_common_attach(struct comedi_device * dev, unsigned long iobase) | |||
952 | return 0; | 952 | return 0; |
953 | } | 953 | } |
954 | 954 | ||
955 | static int das08_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 955 | static int das08_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
956 | { | 956 | { |
957 | int ret; | 957 | int ret; |
958 | unsigned long iobase; | 958 | unsigned long iobase; |
@@ -1028,7 +1028,7 @@ static int das08_attach(struct comedi_device * dev, struct comedi_devconfig * it | |||
1028 | return das08_common_attach(dev, iobase); | 1028 | return das08_common_attach(dev, iobase); |
1029 | } | 1029 | } |
1030 | 1030 | ||
1031 | int das08_common_detach(struct comedi_device * dev) | 1031 | int das08_common_detach(struct comedi_device *dev) |
1032 | { | 1032 | { |
1033 | printk(KERN_INFO "comedi%d: das08: remove\n", dev->minor); | 1033 | printk(KERN_INFO "comedi%d: das08: remove\n", dev->minor); |
1034 | 1034 | ||
diff --git a/drivers/staging/comedi/drivers/das08.h b/drivers/staging/comedi/drivers/das08.h index b870e88ab83..7cdb3fc4dae 100644 --- a/drivers/staging/comedi/drivers/das08.h +++ b/drivers/staging/comedi/drivers/das08.h | |||
@@ -72,7 +72,7 @@ struct das08_private_struct { | |||
72 | #define NUM_DAS08_CS_BOARDS 2 | 72 | #define NUM_DAS08_CS_BOARDS 2 |
73 | extern struct das08_board_struct das08_cs_boards[NUM_DAS08_CS_BOARDS]; | 73 | extern struct das08_board_struct das08_cs_boards[NUM_DAS08_CS_BOARDS]; |
74 | 74 | ||
75 | int das08_common_attach(struct comedi_device * dev, unsigned long iobase); | 75 | int das08_common_attach(struct comedi_device *dev, unsigned long iobase); |
76 | int das08_common_detach(struct comedi_device * dev); | 76 | int das08_common_detach(struct comedi_device *dev); |
77 | 77 | ||
78 | #endif /* _DAS08_H */ | 78 | #endif /* _DAS08_H */ |
diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c index 9fbcbf96638..ed25a63da29 100644 --- a/drivers/staging/comedi/drivers/das08_cs.c +++ b/drivers/staging/comedi/drivers/das08_cs.c | |||
@@ -56,7 +56,7 @@ static struct pcmcia_device *cur_dev = NULL; | |||
56 | 56 | ||
57 | #define thisboard ((const struct das08_board_struct *)dev->board_ptr) | 57 | #define thisboard ((const struct das08_board_struct *)dev->board_ptr) |
58 | 58 | ||
59 | static int das08_cs_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 59 | static int das08_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
60 | 60 | ||
61 | static struct comedi_driver driver_das08_cs = { | 61 | static struct comedi_driver driver_das08_cs = { |
62 | driver_name:"das08_cs", | 62 | driver_name:"das08_cs", |
@@ -69,7 +69,7 @@ static struct comedi_driver driver_das08_cs = { | |||
69 | offset:sizeof(struct das08_board_struct), | 69 | offset:sizeof(struct das08_board_struct), |
70 | }; | 70 | }; |
71 | 71 | ||
72 | static int das08_cs_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 72 | static int das08_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
73 | { | 73 | { |
74 | int ret; | 74 | int ret; |
75 | unsigned long iobase; | 75 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c index 991e3330d11..2082030bd4f 100644 --- a/drivers/staging/comedi/drivers/das16.c +++ b/drivers/staging/comedi/drivers/das16.c | |||
@@ -698,8 +698,8 @@ static const struct das16_board das16_boards[] = { | |||
698 | 698 | ||
699 | #define n_das16_boards ((sizeof(das16_boards))/(sizeof(struct das16_board))) | 699 | #define n_das16_boards ((sizeof(das16_boards))/(sizeof(struct das16_board))) |
700 | 700 | ||
701 | static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 701 | static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
702 | static int das16_detach(struct comedi_device * dev); | 702 | static int das16_detach(struct comedi_device *dev); |
703 | static struct comedi_driver driver_das16 = { | 703 | static struct comedi_driver driver_das16 = { |
704 | driver_name:"das16", | 704 | driver_name:"das16", |
705 | module:THIS_MODULE, | 705 | module:THIS_MODULE, |
@@ -742,8 +742,8 @@ struct das16_private_struct { | |||
742 | #define devpriv ((struct das16_private_struct *)(dev->private)) | 742 | #define devpriv ((struct das16_private_struct *)(dev->private)) |
743 | #define thisboard ((struct das16_board *)(dev->board_ptr)) | 743 | #define thisboard ((struct das16_board *)(dev->board_ptr)) |
744 | 744 | ||
745 | static int das16_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s, | 745 | static int das16_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s, |
746 | struct comedi_cmd * cmd) | 746 | struct comedi_cmd *cmd) |
747 | { | 747 | { |
748 | int err = 0, tmp; | 748 | int err = 0, tmp; |
749 | int gain, start_chan, i; | 749 | int gain, start_chan, i; |
@@ -893,7 +893,7 @@ static int das16_cmd_test(struct comedi_device * dev, struct comedi_subdevice * | |||
893 | return 0; | 893 | return 0; |
894 | } | 894 | } |
895 | 895 | ||
896 | static int das16_cmd_exec(struct comedi_device * dev, struct comedi_subdevice * s) | 896 | static int das16_cmd_exec(struct comedi_device *dev, struct comedi_subdevice *s) |
897 | { | 897 | { |
898 | struct comedi_async *async = s->async; | 898 | struct comedi_async *async = s->async; |
899 | struct comedi_cmd *cmd = &async->cmd; | 899 | struct comedi_cmd *cmd = &async->cmd; |
@@ -996,7 +996,7 @@ static int das16_cmd_exec(struct comedi_device * dev, struct comedi_subdevice * | |||
996 | return 0; | 996 | return 0; |
997 | } | 997 | } |
998 | 998 | ||
999 | static int das16_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 999 | static int das16_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
1000 | { | 1000 | { |
1001 | unsigned long flags; | 1001 | unsigned long flags; |
1002 | 1002 | ||
@@ -1023,7 +1023,7 @@ static int das16_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | |||
1023 | return 0; | 1023 | return 0; |
1024 | } | 1024 | } |
1025 | 1025 | ||
1026 | static void das16_reset(struct comedi_device * dev) | 1026 | static void das16_reset(struct comedi_device *dev) |
1027 | { | 1027 | { |
1028 | outb(0, dev->iobase + DAS16_STATUS); | 1028 | outb(0, dev->iobase + DAS16_STATUS); |
1029 | outb(0, dev->iobase + DAS16_CONTROL); | 1029 | outb(0, dev->iobase + DAS16_CONTROL); |
@@ -1031,8 +1031,8 @@ static void das16_reset(struct comedi_device * dev) | |||
1031 | outb(0, dev->iobase + DAS16_CNTR_CONTROL); | 1031 | outb(0, dev->iobase + DAS16_CNTR_CONTROL); |
1032 | } | 1032 | } |
1033 | 1033 | ||
1034 | static int das16_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 1034 | static int das16_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
1035 | struct comedi_insn * insn, unsigned int * data) | 1035 | struct comedi_insn *insn, unsigned int *data) |
1036 | { | 1036 | { |
1037 | int i, n; | 1037 | int i, n; |
1038 | int range; | 1038 | int range; |
@@ -1079,8 +1079,8 @@ static int das16_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * | |||
1079 | return n; | 1079 | return n; |
1080 | } | 1080 | } |
1081 | 1081 | ||
1082 | static int das16_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, | 1082 | static int das16_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s, |
1083 | struct comedi_insn * insn, unsigned int * data) | 1083 | struct comedi_insn *insn, unsigned int *data) |
1084 | { | 1084 | { |
1085 | unsigned int bits; | 1085 | unsigned int bits; |
1086 | 1086 | ||
@@ -1091,8 +1091,8 @@ static int das16_di_rbits(struct comedi_device * dev, struct comedi_subdevice * | |||
1091 | return 2; | 1091 | return 2; |
1092 | } | 1092 | } |
1093 | 1093 | ||
1094 | static int das16_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, | 1094 | static int das16_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s, |
1095 | struct comedi_insn * insn, unsigned int * data) | 1095 | struct comedi_insn *insn, unsigned int *data) |
1096 | { | 1096 | { |
1097 | unsigned int wbits; | 1097 | unsigned int wbits; |
1098 | 1098 | ||
@@ -1111,8 +1111,8 @@ static int das16_do_wbits(struct comedi_device * dev, struct comedi_subdevice * | |||
1111 | return 2; | 1111 | return 2; |
1112 | } | 1112 | } |
1113 | 1113 | ||
1114 | static int das16_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 1114 | static int das16_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
1115 | struct comedi_insn * insn, unsigned int * data) | 1115 | struct comedi_insn *insn, unsigned int *data) |
1116 | { | 1116 | { |
1117 | int i; | 1117 | int i; |
1118 | int lsb, msb; | 1118 | int lsb, msb; |
@@ -1169,7 +1169,7 @@ static void das16_timer_interrupt(unsigned long arg) | |||
1169 | an even transfer count after disabling dma | 1169 | an even transfer count after disabling dma |
1170 | channel. | 1170 | channel. |
1171 | */ | 1171 | */ |
1172 | static int disable_dma_on_even(struct comedi_device * dev) | 1172 | static int disable_dma_on_even(struct comedi_device *dev) |
1173 | { | 1173 | { |
1174 | int residue; | 1174 | int residue; |
1175 | int i; | 1175 | int i; |
@@ -1197,7 +1197,7 @@ static int disable_dma_on_even(struct comedi_device * dev) | |||
1197 | return residue; | 1197 | return residue; |
1198 | } | 1198 | } |
1199 | 1199 | ||
1200 | static void das16_interrupt(struct comedi_device * dev) | 1200 | static void das16_interrupt(struct comedi_device *dev) |
1201 | { | 1201 | { |
1202 | unsigned long dma_flags, spin_flags; | 1202 | unsigned long dma_flags, spin_flags; |
1203 | struct comedi_subdevice *s = dev->read_subdev; | 1203 | struct comedi_subdevice *s = dev->read_subdev; |
@@ -1273,7 +1273,7 @@ static void das16_interrupt(struct comedi_device * dev) | |||
1273 | cfc_handle_events(dev, s); | 1273 | cfc_handle_events(dev, s); |
1274 | } | 1274 | } |
1275 | 1275 | ||
1276 | static unsigned int das16_set_pacer(struct comedi_device * dev, unsigned int ns, | 1276 | static unsigned int das16_set_pacer(struct comedi_device *dev, unsigned int ns, |
1277 | int rounding_flags) | 1277 | int rounding_flags) |
1278 | { | 1278 | { |
1279 | i8253_cascade_ns_to_timer_2div(devpriv->clockbase, &(devpriv->divisor1), | 1279 | i8253_cascade_ns_to_timer_2div(devpriv->clockbase, &(devpriv->divisor1), |
@@ -1286,7 +1286,7 @@ static unsigned int das16_set_pacer(struct comedi_device * dev, unsigned int ns, | |||
1286 | return ns; | 1286 | return ns; |
1287 | } | 1287 | } |
1288 | 1288 | ||
1289 | static void reg_dump(struct comedi_device * dev) | 1289 | static void reg_dump(struct comedi_device *dev) |
1290 | { | 1290 | { |
1291 | DEBUG_PRINT("********DAS1600 REGISTER DUMP********\n"); | 1291 | DEBUG_PRINT("********DAS1600 REGISTER DUMP********\n"); |
1292 | DEBUG_PRINT("DAS16_MUX: %x\n", inb(dev->iobase + DAS16_MUX)); | 1292 | DEBUG_PRINT("DAS16_MUX: %x\n", inb(dev->iobase + DAS16_MUX)); |
@@ -1304,7 +1304,7 @@ static void reg_dump(struct comedi_device * dev) | |||
1304 | inb(dev->iobase + DAS1600_STATUS_B)); | 1304 | inb(dev->iobase + DAS1600_STATUS_B)); |
1305 | } | 1305 | } |
1306 | 1306 | ||
1307 | static int das16_probe(struct comedi_device * dev, struct comedi_devconfig * it) | 1307 | static int das16_probe(struct comedi_device *dev, struct comedi_devconfig *it) |
1308 | { | 1308 | { |
1309 | int status; | 1309 | int status; |
1310 | int diobits; | 1310 | int diobits; |
@@ -1338,7 +1338,7 @@ static int das16_probe(struct comedi_device * dev, struct comedi_devconfig * it) | |||
1338 | return 0; | 1338 | return 0; |
1339 | } | 1339 | } |
1340 | 1340 | ||
1341 | static int das1600_mode_detect(struct comedi_device * dev) | 1341 | static int das1600_mode_detect(struct comedi_device *dev) |
1342 | { | 1342 | { |
1343 | int status = 0; | 1343 | int status = 0; |
1344 | 1344 | ||
@@ -1366,7 +1366,7 @@ static int das1600_mode_detect(struct comedi_device * dev) | |||
1366 | * 3 Clock speed (in MHz) | 1366 | * 3 Clock speed (in MHz) |
1367 | */ | 1367 | */ |
1368 | 1368 | ||
1369 | static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 1369 | static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
1370 | { | 1370 | { |
1371 | struct comedi_subdevice *s; | 1371 | struct comedi_subdevice *s; |
1372 | int ret; | 1372 | int ret; |
@@ -1630,7 +1630,7 @@ static int das16_attach(struct comedi_device * dev, struct comedi_devconfig * it | |||
1630 | return 0; | 1630 | return 0; |
1631 | } | 1631 | } |
1632 | 1632 | ||
1633 | static int das16_detach(struct comedi_device * dev) | 1633 | static int das16_detach(struct comedi_device *dev) |
1634 | { | 1634 | { |
1635 | printk("comedi%d: das16: remove\n", dev->minor); | 1635 | printk("comedi%d: das16: remove\n", dev->minor); |
1636 | 1636 | ||
@@ -1674,7 +1674,7 @@ static int das16_detach(struct comedi_device * dev) | |||
1674 | COMEDI_INITCLEANUP(driver_das16); | 1674 | COMEDI_INITCLEANUP(driver_das16); |
1675 | 1675 | ||
1676 | /* utility function that suggests a dma transfer size in bytes */ | 1676 | /* utility function that suggests a dma transfer size in bytes */ |
1677 | static unsigned int das16_suggest_transfer_size(struct comedi_device * dev, | 1677 | static unsigned int das16_suggest_transfer_size(struct comedi_device *dev, |
1678 | struct comedi_cmd cmd) | 1678 | struct comedi_cmd cmd) |
1679 | { | 1679 | { |
1680 | unsigned int size; | 1680 | unsigned int size; |
@@ -1715,7 +1715,7 @@ static unsigned int das16_suggest_transfer_size(struct comedi_device * dev, | |||
1715 | return size; | 1715 | return size; |
1716 | } | 1716 | } |
1717 | 1717 | ||
1718 | static void das16_ai_munge(struct comedi_device * dev, struct comedi_subdevice * s, | 1718 | static void das16_ai_munge(struct comedi_device *dev, struct comedi_subdevice *s, |
1719 | void *array, unsigned int num_bytes, unsigned int start_chan_index) | 1719 | void *array, unsigned int num_bytes, unsigned int start_chan_index) |
1720 | { | 1720 | { |
1721 | unsigned int i, num_samples = num_bytes / sizeof(short); | 1721 | unsigned int i, num_samples = num_bytes / sizeof(short); |
diff --git a/drivers/staging/comedi/drivers/das16m1.c b/drivers/staging/comedi/drivers/das16m1.c index 5b1d96cea04..7d35183b1d3 100644 --- a/drivers/staging/comedi/drivers/das16m1.c +++ b/drivers/staging/comedi/drivers/das16m1.c | |||
@@ -166,8 +166,8 @@ static const struct das16m1_board das16m1_boards[] = { | |||
166 | 166 | ||
167 | #define das16m1_num_boards ((sizeof(das16m1_boards)) / (sizeof(das16m1_boards[0]))) | 167 | #define das16m1_num_boards ((sizeof(das16m1_boards)) / (sizeof(das16m1_boards[0]))) |
168 | 168 | ||
169 | static int das16m1_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 169 | static int das16m1_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
170 | static int das16m1_detach(struct comedi_device * dev); | 170 | static int das16m1_detach(struct comedi_device *dev); |
171 | static struct comedi_driver driver_das16m1 = { | 171 | static struct comedi_driver driver_das16m1 = { |
172 | driver_name:"das16m1", | 172 | driver_name:"das16m1", |
173 | module:THIS_MODULE, | 173 | module:THIS_MODULE, |
@@ -200,8 +200,8 @@ static inline short munge_sample(short data) | |||
200 | return (data >> 4) & 0xfff; | 200 | return (data >> 4) & 0xfff; |
201 | } | 201 | } |
202 | 202 | ||
203 | static int das16m1_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s, | 203 | static int das16m1_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s, |
204 | struct comedi_cmd * cmd) | 204 | struct comedi_cmd *cmd) |
205 | { | 205 | { |
206 | unsigned int err = 0, tmp, i; | 206 | unsigned int err = 0, tmp, i; |
207 | 207 | ||
@@ -322,7 +322,7 @@ static int das16m1_cmd_test(struct comedi_device * dev, struct comedi_subdevice | |||
322 | return 0; | 322 | return 0; |
323 | } | 323 | } |
324 | 324 | ||
325 | static int das16m1_cmd_exec(struct comedi_device * dev, struct comedi_subdevice * s) | 325 | static int das16m1_cmd_exec(struct comedi_device *dev, struct comedi_subdevice *s) |
326 | { | 326 | { |
327 | struct comedi_async *async = s->async; | 327 | struct comedi_async *async = s->async; |
328 | struct comedi_cmd *cmd = &async->cmd; | 328 | struct comedi_cmd *cmd = &async->cmd; |
@@ -385,7 +385,7 @@ static int das16m1_cmd_exec(struct comedi_device * dev, struct comedi_subdevice | |||
385 | return 0; | 385 | return 0; |
386 | } | 386 | } |
387 | 387 | ||
388 | static int das16m1_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 388 | static int das16m1_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
389 | { | 389 | { |
390 | devpriv->control_state &= ~INTE & ~PACER_MASK; | 390 | devpriv->control_state &= ~INTE & ~PACER_MASK; |
391 | outb(devpriv->control_state, dev->iobase + DAS16M1_INTR_CONTROL); | 391 | outb(devpriv->control_state, dev->iobase + DAS16M1_INTR_CONTROL); |
@@ -393,8 +393,8 @@ static int das16m1_cancel(struct comedi_device * dev, struct comedi_subdevice * | |||
393 | return 0; | 393 | return 0; |
394 | } | 394 | } |
395 | 395 | ||
396 | static int das16m1_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 396 | static int das16m1_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
397 | struct comedi_insn * insn, unsigned int * data) | 397 | struct comedi_insn *insn, unsigned int *data) |
398 | { | 398 | { |
399 | int i, n; | 399 | int i, n; |
400 | int byte; | 400 | int byte; |
@@ -430,8 +430,8 @@ static int das16m1_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice | |||
430 | return n; | 430 | return n; |
431 | } | 431 | } |
432 | 432 | ||
433 | static int das16m1_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, | 433 | static int das16m1_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s, |
434 | struct comedi_insn * insn, unsigned int * data) | 434 | struct comedi_insn *insn, unsigned int *data) |
435 | { | 435 | { |
436 | unsigned int bits; | 436 | unsigned int bits; |
437 | 437 | ||
@@ -442,8 +442,8 @@ static int das16m1_di_rbits(struct comedi_device * dev, struct comedi_subdevice | |||
442 | return 2; | 442 | return 2; |
443 | } | 443 | } |
444 | 444 | ||
445 | static int das16m1_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, | 445 | static int das16m1_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s, |
446 | struct comedi_insn * insn, unsigned int * data) | 446 | struct comedi_insn *insn, unsigned int *data) |
447 | { | 447 | { |
448 | unsigned int wbits; | 448 | unsigned int wbits; |
449 | 449 | ||
@@ -462,7 +462,7 @@ static int das16m1_do_wbits(struct comedi_device * dev, struct comedi_subdevice | |||
462 | return 2; | 462 | return 2; |
463 | } | 463 | } |
464 | 464 | ||
465 | static int das16m1_poll(struct comedi_device * dev, struct comedi_subdevice * s) | 465 | static int das16m1_poll(struct comedi_device *dev, struct comedi_subdevice *s) |
466 | { | 466 | { |
467 | unsigned long flags; | 467 | unsigned long flags; |
468 | unsigned int status; | 468 | unsigned int status; |
@@ -505,7 +505,7 @@ static irqreturn_t das16m1_interrupt(int irq, void *d) | |||
505 | return IRQ_HANDLED; | 505 | return IRQ_HANDLED; |
506 | } | 506 | } |
507 | 507 | ||
508 | static void munge_sample_array(short * array, unsigned int num_elements) | 508 | static void munge_sample_array(short *array, unsigned int num_elements) |
509 | { | 509 | { |
510 | unsigned int i; | 510 | unsigned int i; |
511 | 511 | ||
@@ -514,7 +514,7 @@ static void munge_sample_array(short * array, unsigned int num_elements) | |||
514 | } | 514 | } |
515 | } | 515 | } |
516 | 516 | ||
517 | static void das16m1_handler(struct comedi_device * dev, unsigned int status) | 517 | static void das16m1_handler(struct comedi_device *dev, unsigned int status) |
518 | { | 518 | { |
519 | struct comedi_subdevice *s; | 519 | struct comedi_subdevice *s; |
520 | struct comedi_async *async; | 520 | struct comedi_async *async; |
@@ -578,7 +578,7 @@ static void das16m1_handler(struct comedi_device * dev, unsigned int status) | |||
578 | /* This function takes a time in nanoseconds and sets the * | 578 | /* This function takes a time in nanoseconds and sets the * |
579 | * 2 pacer clocks to the closest frequency possible. It also * | 579 | * 2 pacer clocks to the closest frequency possible. It also * |
580 | * returns the actual sampling period. */ | 580 | * returns the actual sampling period. */ |
581 | static unsigned int das16m1_set_pacer(struct comedi_device * dev, unsigned int ns, | 581 | static unsigned int das16m1_set_pacer(struct comedi_device *dev, unsigned int ns, |
582 | int rounding_flags) | 582 | int rounding_flags) |
583 | { | 583 | { |
584 | i8253_cascade_ns_to_timer_2div(DAS16M1_XTAL, &(devpriv->divisor1), | 584 | i8253_cascade_ns_to_timer_2div(DAS16M1_XTAL, &(devpriv->divisor1), |
@@ -635,7 +635,7 @@ static int das16m1_irq_bits(unsigned int irq) | |||
635 | * 1 IRQ | 635 | * 1 IRQ |
636 | */ | 636 | */ |
637 | 637 | ||
638 | static int das16m1_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 638 | static int das16m1_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
639 | { | 639 | { |
640 | struct comedi_subdevice *s; | 640 | struct comedi_subdevice *s; |
641 | int ret; | 641 | int ret; |
@@ -744,7 +744,7 @@ static int das16m1_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
744 | return 0; | 744 | return 0; |
745 | } | 745 | } |
746 | 746 | ||
747 | static int das16m1_detach(struct comedi_device * dev) | 747 | static int das16m1_detach(struct comedi_device *dev) |
748 | { | 748 | { |
749 | printk("comedi%d: das16m1: remove\n", dev->minor); | 749 | printk("comedi%d: das16m1: remove\n", dev->minor); |
750 | 750 | ||
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c index 7e1b8f8fec5..2112783d37e 100644 --- a/drivers/staging/comedi/drivers/das1800.c +++ b/drivers/staging/comedi/drivers/das1800.c | |||
@@ -520,7 +520,7 @@ static struct comedi_driver driver_das1800 = { | |||
520 | */ | 520 | */ |
521 | COMEDI_INITCLEANUP(driver_das1800); | 521 | COMEDI_INITCLEANUP(driver_das1800); |
522 | 522 | ||
523 | static int das1800_init_dma(struct comedi_device * dev, unsigned int dma0, | 523 | static int das1800_init_dma(struct comedi_device *dev, unsigned int dma0, |
524 | unsigned int dma1) | 524 | unsigned int dma1) |
525 | { | 525 | { |
526 | unsigned long flags; | 526 | unsigned long flags; |
@@ -590,7 +590,7 @@ static int das1800_init_dma(struct comedi_device * dev, unsigned int dma0, | |||
590 | return 0; | 590 | return 0; |
591 | } | 591 | } |
592 | 592 | ||
593 | static int das1800_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 593 | static int das1800_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
594 | { | 594 | { |
595 | struct comedi_subdevice *s; | 595 | struct comedi_subdevice *s; |
596 | unsigned long iobase = it->options[0]; | 596 | unsigned long iobase = it->options[0]; |
@@ -765,7 +765,7 @@ static int das1800_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
765 | return 0; | 765 | return 0; |
766 | }; | 766 | }; |
767 | 767 | ||
768 | static int das1800_detach(struct comedi_device * dev) | 768 | static int das1800_detach(struct comedi_device *dev) |
769 | { | 769 | { |
770 | /* only free stuff if it has been allocated by _attach */ | 770 | /* only free stuff if it has been allocated by _attach */ |
771 | if (dev->iobase) | 771 | if (dev->iobase) |
@@ -793,7 +793,7 @@ static int das1800_detach(struct comedi_device * dev) | |||
793 | 793 | ||
794 | /* probes and checks das-1800 series board type | 794 | /* probes and checks das-1800 series board type |
795 | */ | 795 | */ |
796 | static int das1800_probe(struct comedi_device * dev) | 796 | static int das1800_probe(struct comedi_device *dev) |
797 | { | 797 | { |
798 | int id; | 798 | int id; |
799 | int board; | 799 | int board; |
@@ -867,7 +867,7 @@ static int das1800_probe(struct comedi_device * dev) | |||
867 | return -1; | 867 | return -1; |
868 | } | 868 | } |
869 | 869 | ||
870 | static int das1800_ai_poll(struct comedi_device * dev, struct comedi_subdevice * s) | 870 | static int das1800_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s) |
871 | { | 871 | { |
872 | unsigned long flags; | 872 | unsigned long flags; |
873 | 873 | ||
@@ -909,7 +909,7 @@ static irqreturn_t das1800_interrupt(int irq, void *d) | |||
909 | } | 909 | } |
910 | 910 | ||
911 | /* the guts of the interrupt handler, that is shared with das1800_ai_poll */ | 911 | /* the guts of the interrupt handler, that is shared with das1800_ai_poll */ |
912 | static void das1800_ai_handler(struct comedi_device * dev) | 912 | static void das1800_ai_handler(struct comedi_device *dev) |
913 | { | 913 | { |
914 | struct comedi_subdevice *s = dev->subdevices + 0; /* analog input subdevice */ | 914 | struct comedi_subdevice *s = dev->subdevices + 0; /* analog input subdevice */ |
915 | struct comedi_async *async = s->async; | 915 | struct comedi_async *async = s->async; |
@@ -962,7 +962,7 @@ static void das1800_ai_handler(struct comedi_device * dev) | |||
962 | return; | 962 | return; |
963 | } | 963 | } |
964 | 964 | ||
965 | static void das1800_handle_dma(struct comedi_device * dev, struct comedi_subdevice * s, | 965 | static void das1800_handle_dma(struct comedi_device *dev, struct comedi_subdevice *s, |
966 | unsigned int status) | 966 | unsigned int status) |
967 | { | 967 | { |
968 | unsigned long flags; | 968 | unsigned long flags; |
@@ -997,14 +997,14 @@ static void das1800_handle_dma(struct comedi_device * dev, struct comedi_subdevi | |||
997 | return; | 997 | return; |
998 | } | 998 | } |
999 | 999 | ||
1000 | static inline uint16_t munge_bipolar_sample(const struct comedi_device * dev, | 1000 | static inline uint16_t munge_bipolar_sample(const struct comedi_device *dev, |
1001 | uint16_t sample) | 1001 | uint16_t sample) |
1002 | { | 1002 | { |
1003 | sample += 1 << (thisboard->resolution - 1); | 1003 | sample += 1 << (thisboard->resolution - 1); |
1004 | return sample; | 1004 | return sample; |
1005 | } | 1005 | } |
1006 | 1006 | ||
1007 | static void munge_data(struct comedi_device * dev, uint16_t * array, | 1007 | static void munge_data(struct comedi_device *dev, uint16_t *array, |
1008 | unsigned int num_elements) | 1008 | unsigned int num_elements) |
1009 | { | 1009 | { |
1010 | unsigned int i; | 1010 | unsigned int i; |
@@ -1023,8 +1023,8 @@ static void munge_data(struct comedi_device * dev, uint16_t * array, | |||
1023 | 1023 | ||
1024 | /* Utility function used by das1800_flush_dma() and das1800_handle_dma(). | 1024 | /* Utility function used by das1800_flush_dma() and das1800_handle_dma(). |
1025 | * Assumes dma lock is held */ | 1025 | * Assumes dma lock is held */ |
1026 | static void das1800_flush_dma_channel(struct comedi_device * dev, struct comedi_subdevice * s, | 1026 | static void das1800_flush_dma_channel(struct comedi_device *dev, struct comedi_subdevice *s, |
1027 | unsigned int channel, uint16_t * buffer) | 1027 | unsigned int channel, uint16_t *buffer) |
1028 | { | 1028 | { |
1029 | unsigned int num_bytes, num_samples; | 1029 | unsigned int num_bytes, num_samples; |
1030 | struct comedi_cmd *cmd = &s->async->cmd; | 1030 | struct comedi_cmd *cmd = &s->async->cmd; |
@@ -1053,7 +1053,7 @@ static void das1800_flush_dma_channel(struct comedi_device * dev, struct comedi_ | |||
1053 | 1053 | ||
1054 | /* flushes remaining data from board when external trigger has stopped aquisition | 1054 | /* flushes remaining data from board when external trigger has stopped aquisition |
1055 | * and we are using dma transfers */ | 1055 | * and we are using dma transfers */ |
1056 | static void das1800_flush_dma(struct comedi_device * dev, struct comedi_subdevice * s) | 1056 | static void das1800_flush_dma(struct comedi_device *dev, struct comedi_subdevice *s) |
1057 | { | 1057 | { |
1058 | unsigned long flags; | 1058 | unsigned long flags; |
1059 | const int dual_dma = devpriv->irq_dma_bits & DMA_DUAL; | 1059 | const int dual_dma = devpriv->irq_dma_bits & DMA_DUAL; |
@@ -1083,8 +1083,8 @@ static void das1800_flush_dma(struct comedi_device * dev, struct comedi_subdevic | |||
1083 | return; | 1083 | return; |
1084 | } | 1084 | } |
1085 | 1085 | ||
1086 | static void das1800_handle_fifo_half_full(struct comedi_device * dev, | 1086 | static void das1800_handle_fifo_half_full(struct comedi_device *dev, |
1087 | struct comedi_subdevice * s) | 1087 | struct comedi_subdevice *s) |
1088 | { | 1088 | { |
1089 | int numPoints = 0; /* number of points to read */ | 1089 | int numPoints = 0; /* number of points to read */ |
1090 | struct comedi_cmd *cmd = &s->async->cmd; | 1090 | struct comedi_cmd *cmd = &s->async->cmd; |
@@ -1102,8 +1102,8 @@ static void das1800_handle_fifo_half_full(struct comedi_device * dev, | |||
1102 | return; | 1102 | return; |
1103 | } | 1103 | } |
1104 | 1104 | ||
1105 | static void das1800_handle_fifo_not_empty(struct comedi_device * dev, | 1105 | static void das1800_handle_fifo_not_empty(struct comedi_device *dev, |
1106 | struct comedi_subdevice * s) | 1106 | struct comedi_subdevice *s) |
1107 | { | 1107 | { |
1108 | short dpnt; | 1108 | short dpnt; |
1109 | int unipolar; | 1109 | int unipolar; |
@@ -1126,7 +1126,7 @@ static void das1800_handle_fifo_not_empty(struct comedi_device * dev, | |||
1126 | return; | 1126 | return; |
1127 | } | 1127 | } |
1128 | 1128 | ||
1129 | static int das1800_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 1129 | static int das1800_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
1130 | { | 1130 | { |
1131 | outb(0x0, dev->iobase + DAS1800_STATUS); /* disable conversions */ | 1131 | outb(0x0, dev->iobase + DAS1800_STATUS); /* disable conversions */ |
1132 | outb(0x0, dev->iobase + DAS1800_CONTROL_B); /* disable interrupts and dma */ | 1132 | outb(0x0, dev->iobase + DAS1800_CONTROL_B); /* disable interrupts and dma */ |
@@ -1139,8 +1139,8 @@ static int das1800_cancel(struct comedi_device * dev, struct comedi_subdevice * | |||
1139 | } | 1139 | } |
1140 | 1140 | ||
1141 | /* test analog input cmd */ | 1141 | /* test analog input cmd */ |
1142 | static int das1800_ai_do_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 1142 | static int das1800_ai_do_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
1143 | struct comedi_cmd * cmd) | 1143 | struct comedi_cmd *cmd) |
1144 | { | 1144 | { |
1145 | int err = 0; | 1145 | int err = 0; |
1146 | int tmp; | 1146 | int tmp; |
@@ -1385,7 +1385,7 @@ static int control_c_bits(struct comedi_cmd cmd) | |||
1385 | } | 1385 | } |
1386 | 1386 | ||
1387 | /* sets up counters */ | 1387 | /* sets up counters */ |
1388 | static int setup_counters(struct comedi_device * dev, struct comedi_cmd cmd) | 1388 | static int setup_counters(struct comedi_device *dev, struct comedi_cmd cmd) |
1389 | { | 1389 | { |
1390 | /* setup cascaded counters for conversion/scan frequency */ | 1390 | /* setup cascaded counters for conversion/scan frequency */ |
1391 | switch (cmd.scan_begin_src) { | 1391 | switch (cmd.scan_begin_src) { |
@@ -1424,7 +1424,7 @@ static int setup_counters(struct comedi_device * dev, struct comedi_cmd cmd) | |||
1424 | } | 1424 | } |
1425 | 1425 | ||
1426 | /* sets up dma */ | 1426 | /* sets up dma */ |
1427 | static void setup_dma(struct comedi_device * dev, struct comedi_cmd cmd) | 1427 | static void setup_dma(struct comedi_device *dev, struct comedi_cmd cmd) |
1428 | { | 1428 | { |
1429 | unsigned long lock_flags; | 1429 | unsigned long lock_flags; |
1430 | const int dual_dma = devpriv->irq_dma_bits & DMA_DUAL; | 1430 | const int dual_dma = devpriv->irq_dma_bits & DMA_DUAL; |
@@ -1462,7 +1462,7 @@ static void setup_dma(struct comedi_device * dev, struct comedi_cmd cmd) | |||
1462 | } | 1462 | } |
1463 | 1463 | ||
1464 | /* programs channel/gain list into card */ | 1464 | /* programs channel/gain list into card */ |
1465 | static void program_chanlist(struct comedi_device * dev, struct comedi_cmd cmd) | 1465 | static void program_chanlist(struct comedi_device *dev, struct comedi_cmd cmd) |
1466 | { | 1466 | { |
1467 | int i, n, chan_range; | 1467 | int i, n, chan_range; |
1468 | unsigned long irq_flags; | 1468 | unsigned long irq_flags; |
@@ -1489,7 +1489,7 @@ static void program_chanlist(struct comedi_device * dev, struct comedi_cmd cmd) | |||
1489 | } | 1489 | } |
1490 | 1490 | ||
1491 | /* analog input do_cmd */ | 1491 | /* analog input do_cmd */ |
1492 | static int das1800_ai_do_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 1492 | static int das1800_ai_do_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
1493 | { | 1493 | { |
1494 | int ret; | 1494 | int ret; |
1495 | int control_a, control_c; | 1495 | int control_a, control_c; |
@@ -1552,8 +1552,8 @@ static int das1800_ai_do_cmd(struct comedi_device * dev, struct comedi_subdevice | |||
1552 | } | 1552 | } |
1553 | 1553 | ||
1554 | /* read analog input */ | 1554 | /* read analog input */ |
1555 | static int das1800_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 1555 | static int das1800_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
1556 | struct comedi_insn * insn, unsigned int * data) | 1556 | struct comedi_insn *insn, unsigned int *data) |
1557 | { | 1557 | { |
1558 | int i, n; | 1558 | int i, n; |
1559 | int chan, range, aref, chan_range; | 1559 | int chan, range, aref, chan_range; |
@@ -1612,8 +1612,8 @@ static int das1800_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice | |||
1612 | } | 1612 | } |
1613 | 1613 | ||
1614 | /* writes to an analog output channel */ | 1614 | /* writes to an analog output channel */ |
1615 | static int das1800_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 1615 | static int das1800_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
1616 | struct comedi_insn * insn, unsigned int * data) | 1616 | struct comedi_insn *insn, unsigned int *data) |
1617 | { | 1617 | { |
1618 | int chan = CR_CHAN(insn->chanspec); | 1618 | int chan = CR_CHAN(insn->chanspec); |
1619 | /* int range = CR_RANGE(insn->chanspec); */ | 1619 | /* int range = CR_RANGE(insn->chanspec); */ |
@@ -1641,8 +1641,8 @@ static int das1800_ao_winsn(struct comedi_device * dev, struct comedi_subdevice | |||
1641 | } | 1641 | } |
1642 | 1642 | ||
1643 | /* reads from digital input channels */ | 1643 | /* reads from digital input channels */ |
1644 | static int das1800_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, | 1644 | static int das1800_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s, |
1645 | struct comedi_insn * insn, unsigned int * data) | 1645 | struct comedi_insn *insn, unsigned int *data) |
1646 | { | 1646 | { |
1647 | 1647 | ||
1648 | data[1] = inb(dev->iobase + DAS1800_DIGITAL) & 0xf; | 1648 | data[1] = inb(dev->iobase + DAS1800_DIGITAL) & 0xf; |
@@ -1652,8 +1652,8 @@ static int das1800_di_rbits(struct comedi_device * dev, struct comedi_subdevice | |||
1652 | } | 1652 | } |
1653 | 1653 | ||
1654 | /* writes to digital output channels */ | 1654 | /* writes to digital output channels */ |
1655 | static int das1800_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, | 1655 | static int das1800_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s, |
1656 | struct comedi_insn * insn, unsigned int * data) | 1656 | struct comedi_insn *insn, unsigned int *data) |
1657 | { | 1657 | { |
1658 | unsigned int wbits; | 1658 | unsigned int wbits; |
1659 | 1659 | ||
@@ -1672,7 +1672,7 @@ static int das1800_do_wbits(struct comedi_device * dev, struct comedi_subdevice | |||
1672 | } | 1672 | } |
1673 | 1673 | ||
1674 | /* loads counters with divisor1, divisor2 from private structure */ | 1674 | /* loads counters with divisor1, divisor2 from private structure */ |
1675 | static int das1800_set_frequency(struct comedi_device * dev) | 1675 | static int das1800_set_frequency(struct comedi_device *dev) |
1676 | { | 1676 | { |
1677 | int err = 0; | 1677 | int err = 0; |
1678 | 1678 | ||
@@ -1720,7 +1720,7 @@ static unsigned int burst_convert_arg(unsigned int convert_arg, int round_mode) | |||
1720 | } | 1720 | } |
1721 | 1721 | ||
1722 | /* utility function that suggests a dma transfer size based on the conversion period 'ns' */ | 1722 | /* utility function that suggests a dma transfer size based on the conversion period 'ns' */ |
1723 | static unsigned int suggest_transfer_size(struct comedi_cmd * cmd) | 1723 | static unsigned int suggest_transfer_size(struct comedi_cmd *cmd) |
1724 | { | 1724 | { |
1725 | unsigned int size = DMA_BUF_SIZE; | 1725 | unsigned int size = DMA_BUF_SIZE; |
1726 | static const int sample_size = 2; /* size in bytes of one sample from board */ | 1726 | static const int sample_size = 2; /* size in bytes of one sample from board */ |
diff --git a/drivers/staging/comedi/drivers/das6402.c b/drivers/staging/comedi/drivers/das6402.c index ed9409d41a3..b2326ec5083 100644 --- a/drivers/staging/comedi/drivers/das6402.c +++ b/drivers/staging/comedi/drivers/das6402.c | |||
@@ -98,8 +98,8 @@ This driver has suffered bitrot. | |||
98 | #define C2 0x80 | 98 | #define C2 0x80 |
99 | #define RWLH 0x30 | 99 | #define RWLH 0x30 |
100 | 100 | ||
101 | static int das6402_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 101 | static int das6402_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
102 | static int das6402_detach(struct comedi_device * dev); | 102 | static int das6402_detach(struct comedi_device *dev); |
103 | static struct comedi_driver driver_das6402 = { | 103 | static struct comedi_driver driver_das6402 = { |
104 | driver_name:"das6402", | 104 | driver_name:"das6402", |
105 | module:THIS_MODULE, | 105 | module:THIS_MODULE, |
@@ -116,9 +116,9 @@ struct das6402_private { | |||
116 | }; | 116 | }; |
117 | #define devpriv ((struct das6402_private *)dev->private) | 117 | #define devpriv ((struct das6402_private *)dev->private) |
118 | 118 | ||
119 | static void das6402_ai_fifo_dregs(struct comedi_device * dev, struct comedi_subdevice * s); | 119 | static void das6402_ai_fifo_dregs(struct comedi_device *dev, struct comedi_subdevice *s); |
120 | 120 | ||
121 | static void das6402_setcounter(struct comedi_device * dev) | 121 | static void das6402_setcounter(struct comedi_device *dev) |
122 | { | 122 | { |
123 | BYTE p; | 123 | BYTE p; |
124 | unsigned short ctrlwrd; | 124 | unsigned short ctrlwrd; |
@@ -186,7 +186,7 @@ static irqreturn_t intr_handler(int irq, void *d) | |||
186 | } | 186 | } |
187 | 187 | ||
188 | #if 0 | 188 | #if 0 |
189 | static void das6402_ai_fifo_read(struct comedi_device * dev, short * data, int n) | 189 | static void das6402_ai_fifo_read(struct comedi_device *dev, short *data, int n) |
190 | { | 190 | { |
191 | int i; | 191 | int i; |
192 | 192 | ||
@@ -195,7 +195,7 @@ static void das6402_ai_fifo_read(struct comedi_device * dev, short * data, int n | |||
195 | } | 195 | } |
196 | #endif | 196 | #endif |
197 | 197 | ||
198 | static void das6402_ai_fifo_dregs(struct comedi_device * dev, struct comedi_subdevice * s) | 198 | static void das6402_ai_fifo_dregs(struct comedi_device *dev, struct comedi_subdevice *s) |
199 | { | 199 | { |
200 | while (1) { | 200 | while (1) { |
201 | if (!(inb(dev->iobase + 8) & 0x01)) | 201 | if (!(inb(dev->iobase + 8) & 0x01)) |
@@ -204,7 +204,7 @@ static void das6402_ai_fifo_dregs(struct comedi_device * dev, struct comedi_subd | |||
204 | } | 204 | } |
205 | } | 205 | } |
206 | 206 | ||
207 | static int das6402_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 207 | static int das6402_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
208 | { | 208 | { |
209 | /* | 209 | /* |
210 | * This function should reset the board from whatever condition it | 210 | * This function should reset the board from whatever condition it |
@@ -226,8 +226,8 @@ static int das6402_ai_cancel(struct comedi_device * dev, struct comedi_subdevice | |||
226 | } | 226 | } |
227 | 227 | ||
228 | #ifdef unused | 228 | #ifdef unused |
229 | static int das6402_ai_mode2(struct comedi_device * dev, struct comedi_subdevice * s, | 229 | static int das6402_ai_mode2(struct comedi_device *dev, struct comedi_subdevice *s, |
230 | comedi_trig * it) | 230 | comedi_trig *it) |
231 | { | 231 | { |
232 | devpriv->das6402_ignoreirq = 1; | 232 | devpriv->das6402_ignoreirq = 1; |
233 | 233 | ||
@@ -249,7 +249,7 @@ static int das6402_ai_mode2(struct comedi_device * dev, struct comedi_subdevice | |||
249 | } | 249 | } |
250 | #endif | 250 | #endif |
251 | 251 | ||
252 | static int board_init(struct comedi_device * dev) | 252 | static int board_init(struct comedi_device *dev) |
253 | { | 253 | { |
254 | BYTE b; | 254 | BYTE b; |
255 | 255 | ||
@@ -289,7 +289,7 @@ static int board_init(struct comedi_device * dev) | |||
289 | return 0; | 289 | return 0; |
290 | } | 290 | } |
291 | 291 | ||
292 | static int das6402_detach(struct comedi_device * dev) | 292 | static int das6402_detach(struct comedi_device *dev) |
293 | { | 293 | { |
294 | if (dev->irq) | 294 | if (dev->irq) |
295 | comedi_free_irq(dev->irq, dev); | 295 | comedi_free_irq(dev->irq, dev); |
@@ -299,7 +299,7 @@ static int das6402_detach(struct comedi_device * dev) | |||
299 | return 0; | 299 | return 0; |
300 | } | 300 | } |
301 | 301 | ||
302 | static int das6402_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 302 | static int das6402_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
303 | { | 303 | { |
304 | unsigned int irq; | 304 | unsigned int irq; |
305 | unsigned long iobase; | 305 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c index eafee0c655a..aa1ae24da84 100644 --- a/drivers/staging/comedi/drivers/das800.c +++ b/drivers/staging/comedi/drivers/das800.c | |||
@@ -242,9 +242,9 @@ struct das800_private { | |||
242 | 242 | ||
243 | #define devpriv ((struct das800_private *)dev->private) | 243 | #define devpriv ((struct das800_private *)dev->private) |
244 | 244 | ||
245 | static int das800_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 245 | static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
246 | static int das800_detach(struct comedi_device * dev); | 246 | static int das800_detach(struct comedi_device *dev); |
247 | static int das800_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 247 | static int das800_cancel(struct comedi_device *dev, struct comedi_subdevice *s); |
248 | 248 | ||
249 | static struct comedi_driver driver_das800 = { | 249 | static struct comedi_driver driver_das800 = { |
250 | driver_name:"das800", | 250 | driver_name:"das800", |
@@ -441,7 +441,7 @@ static irqreturn_t das800_interrupt(int irq, void *d) | |||
441 | return IRQ_HANDLED; | 441 | return IRQ_HANDLED; |
442 | } | 442 | } |
443 | 443 | ||
444 | static int das800_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 444 | static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
445 | { | 445 | { |
446 | struct comedi_subdevice *s; | 446 | struct comedi_subdevice *s; |
447 | unsigned long iobase = it->options[0]; | 447 | unsigned long iobase = it->options[0]; |
@@ -539,7 +539,7 @@ static int das800_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
539 | return 0; | 539 | return 0; |
540 | }; | 540 | }; |
541 | 541 | ||
542 | static int das800_detach(struct comedi_device * dev) | 542 | static int das800_detach(struct comedi_device *dev) |
543 | { | 543 | { |
544 | printk("comedi%d: das800: remove\n", dev->minor); | 544 | printk("comedi%d: das800: remove\n", dev->minor); |
545 | 545 | ||
@@ -551,7 +551,7 @@ static int das800_detach(struct comedi_device * dev) | |||
551 | return 0; | 551 | return 0; |
552 | }; | 552 | }; |
553 | 553 | ||
554 | static int das800_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 554 | static int das800_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
555 | { | 555 | { |
556 | devpriv->forever = 0; | 556 | devpriv->forever = 0; |
557 | devpriv->count = 0; | 557 | devpriv->count = 0; |
@@ -560,7 +560,7 @@ static int das800_cancel(struct comedi_device * dev, struct comedi_subdevice * s | |||
560 | } | 560 | } |
561 | 561 | ||
562 | /* enable_das800 makes the card start taking hardware triggered conversions */ | 562 | /* enable_das800 makes the card start taking hardware triggered conversions */ |
563 | static void enable_das800(struct comedi_device * dev) | 563 | static void enable_das800(struct comedi_device *dev) |
564 | { | 564 | { |
565 | unsigned long irq_flags; | 565 | unsigned long irq_flags; |
566 | comedi_spin_lock_irqsave(&dev->spinlock, irq_flags); | 566 | comedi_spin_lock_irqsave(&dev->spinlock, irq_flags); |
@@ -575,7 +575,7 @@ static void enable_das800(struct comedi_device * dev) | |||
575 | } | 575 | } |
576 | 576 | ||
577 | /* disable_das800 stops hardware triggered conversions */ | 577 | /* disable_das800 stops hardware triggered conversions */ |
578 | static void disable_das800(struct comedi_device * dev) | 578 | static void disable_das800(struct comedi_device *dev) |
579 | { | 579 | { |
580 | unsigned long irq_flags; | 580 | unsigned long irq_flags; |
581 | comedi_spin_lock_irqsave(&dev->spinlock, irq_flags); | 581 | comedi_spin_lock_irqsave(&dev->spinlock, irq_flags); |
@@ -584,8 +584,8 @@ static void disable_das800(struct comedi_device * dev) | |||
584 | comedi_spin_unlock_irqrestore(&dev->spinlock, irq_flags); | 584 | comedi_spin_unlock_irqrestore(&dev->spinlock, irq_flags); |
585 | } | 585 | } |
586 | 586 | ||
587 | static int das800_ai_do_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 587 | static int das800_ai_do_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
588 | struct comedi_cmd * cmd) | 588 | struct comedi_cmd *cmd) |
589 | { | 589 | { |
590 | int err = 0; | 590 | int err = 0; |
591 | int tmp; | 591 | int tmp; |
@@ -709,7 +709,7 @@ static int das800_ai_do_cmdtest(struct comedi_device * dev, struct comedi_subdev | |||
709 | return 0; | 709 | return 0; |
710 | } | 710 | } |
711 | 711 | ||
712 | static int das800_ai_do_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 712 | static int das800_ai_do_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
713 | { | 713 | { |
714 | int startChan, endChan, scan, gain; | 714 | int startChan, endChan, scan, gain; |
715 | int conv_bits; | 715 | int conv_bits; |
@@ -788,8 +788,8 @@ static int das800_ai_do_cmd(struct comedi_device * dev, struct comedi_subdevice | |||
788 | return 0; | 788 | return 0; |
789 | } | 789 | } |
790 | 790 | ||
791 | static int das800_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 791 | static int das800_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
792 | struct comedi_insn * insn, unsigned int * data) | 792 | struct comedi_insn *insn, unsigned int *data) |
793 | { | 793 | { |
794 | int i, n; | 794 | int i, n; |
795 | int chan; | 795 | int chan; |
@@ -842,8 +842,8 @@ static int das800_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * | |||
842 | return n; | 842 | return n; |
843 | } | 843 | } |
844 | 844 | ||
845 | static int das800_di_rbits(struct comedi_device * dev, struct comedi_subdevice * s, | 845 | static int das800_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s, |
846 | struct comedi_insn * insn, unsigned int * data) | 846 | struct comedi_insn *insn, unsigned int *data) |
847 | { | 847 | { |
848 | unsigned int bits; | 848 | unsigned int bits; |
849 | 849 | ||
@@ -855,8 +855,8 @@ static int das800_di_rbits(struct comedi_device * dev, struct comedi_subdevice * | |||
855 | return 2; | 855 | return 2; |
856 | } | 856 | } |
857 | 857 | ||
858 | static int das800_do_wbits(struct comedi_device * dev, struct comedi_subdevice * s, | 858 | static int das800_do_wbits(struct comedi_device *dev, struct comedi_subdevice *s, |
859 | struct comedi_insn * insn, unsigned int * data) | 859 | struct comedi_insn *insn, unsigned int *data) |
860 | { | 860 | { |
861 | int wbits; | 861 | int wbits; |
862 | unsigned long irq_flags; | 862 | unsigned long irq_flags; |
@@ -879,7 +879,7 @@ static int das800_do_wbits(struct comedi_device * dev, struct comedi_subdevice * | |||
879 | } | 879 | } |
880 | 880 | ||
881 | /* loads counters with divisor1, divisor2 from private structure */ | 881 | /* loads counters with divisor1, divisor2 from private structure */ |
882 | static int das800_set_frequency(struct comedi_device * dev) | 882 | static int das800_set_frequency(struct comedi_device *dev) |
883 | { | 883 | { |
884 | int err = 0; | 884 | int err = 0; |
885 | 885 | ||
diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c index d627479ff71..de6a9670814 100644 --- a/drivers/staging/comedi/drivers/dmm32at.c +++ b/drivers/staging/comedi/drivers/dmm32at.c | |||
@@ -258,8 +258,8 @@ struct dmm32at_private { | |||
258 | * the board, and also about the kernel module that contains | 258 | * the board, and also about the kernel module that contains |
259 | * the device code. | 259 | * the device code. |
260 | */ | 260 | */ |
261 | static int dmm32at_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 261 | static int dmm32at_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
262 | static int dmm32at_detach(struct comedi_device * dev); | 262 | static int dmm32at_detach(struct comedi_device *dev); |
263 | static struct comedi_driver driver_dmm32at = { | 263 | static struct comedi_driver driver_dmm32at = { |
264 | driver_name:"dmm32at", | 264 | driver_name:"dmm32at", |
265 | module:THIS_MODULE, | 265 | module:THIS_MODULE, |
@@ -313,7 +313,7 @@ void dmm32at_setaitimer(struct comedi_device * dev, unsigned int nansec); | |||
313 | * in the driver structure, dev->board_ptr contains that | 313 | * in the driver structure, dev->board_ptr contains that |
314 | * address. | 314 | * address. |
315 | */ | 315 | */ |
316 | static int dmm32at_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 316 | static int dmm32at_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
317 | { | 317 | { |
318 | int ret; | 318 | int ret; |
319 | struct comedi_subdevice *s; | 319 | struct comedi_subdevice *s; |
@@ -481,7 +481,7 @@ static int dmm32at_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
481 | * allocated by _attach(). dev->private and dev->subdevices are | 481 | * allocated by _attach(). dev->private and dev->subdevices are |
482 | * deallocated automatically by the core. | 482 | * deallocated automatically by the core. |
483 | */ | 483 | */ |
484 | static int dmm32at_detach(struct comedi_device * dev) | 484 | static int dmm32at_detach(struct comedi_device *dev) |
485 | { | 485 | { |
486 | printk("comedi%d: dmm32at: remove\n", dev->minor); | 486 | printk("comedi%d: dmm32at: remove\n", dev->minor); |
487 | if (dev->irq) | 487 | if (dev->irq) |
@@ -497,8 +497,8 @@ static int dmm32at_detach(struct comedi_device * dev) | |||
497 | * mode. | 497 | * mode. |
498 | */ | 498 | */ |
499 | 499 | ||
500 | static int dmm32at_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 500 | static int dmm32at_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
501 | struct comedi_insn * insn, unsigned int * data) | 501 | struct comedi_insn *insn, unsigned int *data) |
502 | { | 502 | { |
503 | int n, i; | 503 | int n, i; |
504 | unsigned int d; | 504 | unsigned int d; |
@@ -568,8 +568,8 @@ static int dmm32at_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice | |||
568 | return n; | 568 | return n; |
569 | } | 569 | } |
570 | 570 | ||
571 | static int dmm32at_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 571 | static int dmm32at_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
572 | struct comedi_cmd * cmd) | 572 | struct comedi_cmd *cmd) |
573 | { | 573 | { |
574 | int err = 0; | 574 | int err = 0; |
575 | int tmp; | 575 | int tmp; |
@@ -752,7 +752,7 @@ static int dmm32at_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevic | |||
752 | return 0; | 752 | return 0; |
753 | } | 753 | } |
754 | 754 | ||
755 | static int dmm32at_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 755 | static int dmm32at_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
756 | { | 756 | { |
757 | struct comedi_cmd *cmd = &s->async->cmd; | 757 | struct comedi_cmd *cmd = &s->async->cmd; |
758 | int i, range; | 758 | int i, range; |
@@ -822,7 +822,7 @@ static int dmm32at_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * | |||
822 | 822 | ||
823 | } | 823 | } |
824 | 824 | ||
825 | static int dmm32at_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 825 | static int dmm32at_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
826 | { | 826 | { |
827 | devpriv->ai_scans_left = 1; | 827 | devpriv->ai_scans_left = 1; |
828 | return 0; | 828 | return 0; |
@@ -893,8 +893,8 @@ static int dmm32at_ns_to_timer(unsigned int *ns, int round) | |||
893 | return *ns; | 893 | return *ns; |
894 | } | 894 | } |
895 | 895 | ||
896 | static int dmm32at_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 896 | static int dmm32at_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
897 | struct comedi_insn * insn, unsigned int * data) | 897 | struct comedi_insn *insn, unsigned int *data) |
898 | { | 898 | { |
899 | int i; | 899 | int i; |
900 | int chan = CR_CHAN(insn->chanspec); | 900 | int chan = CR_CHAN(insn->chanspec); |
@@ -936,8 +936,8 @@ static int dmm32at_ao_winsn(struct comedi_device * dev, struct comedi_subdevice | |||
936 | 936 | ||
937 | /* AO subdevices should have a read insn as well as a write insn. | 937 | /* AO subdevices should have a read insn as well as a write insn. |
938 | * Usually this means copying a value stored in devpriv. */ | 938 | * Usually this means copying a value stored in devpriv. */ |
939 | static int dmm32at_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 939 | static int dmm32at_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
940 | struct comedi_insn * insn, unsigned int * data) | 940 | struct comedi_insn *insn, unsigned int *data) |
941 | { | 941 | { |
942 | int i; | 942 | int i; |
943 | int chan = CR_CHAN(insn->chanspec); | 943 | int chan = CR_CHAN(insn->chanspec); |
@@ -953,8 +953,8 @@ static int dmm32at_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice | |||
953 | * useful to applications if you implement the insn_bits interface. | 953 | * useful to applications if you implement the insn_bits interface. |
954 | * This allows packed reading/writing of the DIO channels. The | 954 | * This allows packed reading/writing of the DIO channels. The |
955 | * comedi core can convert between insn_bits and insn_read/write */ | 955 | * comedi core can convert between insn_bits and insn_read/write */ |
956 | static int dmm32at_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 956 | static int dmm32at_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
957 | struct comedi_insn * insn, unsigned int * data) | 957 | struct comedi_insn *insn, unsigned int *data) |
958 | { | 958 | { |
959 | unsigned char diobits; | 959 | unsigned char diobits; |
960 | 960 | ||
@@ -1006,8 +1006,8 @@ static int dmm32at_dio_insn_bits(struct comedi_device * dev, struct comedi_subde | |||
1006 | return 2; | 1006 | return 2; |
1007 | } | 1007 | } |
1008 | 1008 | ||
1009 | static int dmm32at_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 1009 | static int dmm32at_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
1010 | struct comedi_insn * insn, unsigned int * data) | 1010 | struct comedi_insn *insn, unsigned int *data) |
1011 | { | 1011 | { |
1012 | unsigned char chanbit; | 1012 | unsigned char chanbit; |
1013 | int chan = CR_CHAN(insn->chanspec); | 1013 | int chan = CR_CHAN(insn->chanspec); |
@@ -1043,7 +1043,7 @@ static int dmm32at_dio_insn_config(struct comedi_device * dev, struct comedi_sub | |||
1043 | return 1; | 1043 | return 1; |
1044 | } | 1044 | } |
1045 | 1045 | ||
1046 | void dmm32at_setaitimer(struct comedi_device * dev, unsigned int nansec) | 1046 | void dmm32at_setaitimer(struct comedi_device *dev, unsigned int nansec) |
1047 | { | 1047 | { |
1048 | unsigned char lo1, lo2, hi2; | 1048 | unsigned char lo1, lo2, hi2; |
1049 | unsigned short both2; | 1049 | unsigned short both2; |
diff --git a/drivers/staging/comedi/drivers/dt2801.c b/drivers/staging/comedi/drivers/dt2801.c index c3b927dc888..309abba276d 100644 --- a/drivers/staging/comedi/drivers/dt2801.c +++ b/drivers/staging/comedi/drivers/dt2801.c | |||
@@ -88,8 +88,8 @@ Configuration options: | |||
88 | #define DT2801_STATUS 1 | 88 | #define DT2801_STATUS 1 |
89 | #define DT2801_CMD 1 | 89 | #define DT2801_CMD 1 |
90 | 90 | ||
91 | static int dt2801_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 91 | static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
92 | static int dt2801_detach(struct comedi_device * dev); | 92 | static int dt2801_detach(struct comedi_device *dev); |
93 | static struct comedi_driver driver_dt2801 = { | 93 | static struct comedi_driver driver_dt2801 = { |
94 | driver_name:"dt2801", | 94 | driver_name:"dt2801", |
95 | module:THIS_MODULE, | 95 | module:THIS_MODULE, |
@@ -228,16 +228,16 @@ struct dt2801_private { | |||
228 | 228 | ||
229 | #define devpriv ((struct dt2801_private *)dev->private) | 229 | #define devpriv ((struct dt2801_private *)dev->private) |
230 | 230 | ||
231 | static int dt2801_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 231 | static int dt2801_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
232 | struct comedi_insn * insn, unsigned int * data); | 232 | struct comedi_insn *insn, unsigned int *data); |
233 | static int dt2801_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 233 | static int dt2801_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
234 | struct comedi_insn * insn, unsigned int * data); | 234 | struct comedi_insn *insn, unsigned int *data); |
235 | static int dt2801_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 235 | static int dt2801_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
236 | struct comedi_insn * insn, unsigned int * data); | 236 | struct comedi_insn *insn, unsigned int *data); |
237 | static int dt2801_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 237 | static int dt2801_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
238 | struct comedi_insn * insn, unsigned int * data); | 238 | struct comedi_insn *insn, unsigned int *data); |
239 | static int dt2801_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 239 | static int dt2801_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
240 | struct comedi_insn * insn, unsigned int * data); | 240 | struct comedi_insn *insn, unsigned int *data); |
241 | 241 | ||
242 | /* These are the low-level routines: | 242 | /* These are the low-level routines: |
243 | writecommand: write a command to the board | 243 | writecommand: write a command to the board |
@@ -248,7 +248,7 @@ static int dt2801_dio_insn_config(struct comedi_device * dev, struct comedi_subd | |||
248 | /* Only checks DataOutReady-flag, not the Ready-flag as it is done | 248 | /* Only checks DataOutReady-flag, not the Ready-flag as it is done |
249 | in the examples of the manual. I don't see why this should be | 249 | in the examples of the manual. I don't see why this should be |
250 | necessary. */ | 250 | necessary. */ |
251 | static int dt2801_readdata(struct comedi_device * dev, int *data) | 251 | static int dt2801_readdata(struct comedi_device *dev, int *data) |
252 | { | 252 | { |
253 | int stat = 0; | 253 | int stat = 0; |
254 | int timeout = DT2801_TIMEOUT; | 254 | int timeout = DT2801_TIMEOUT; |
@@ -267,7 +267,7 @@ static int dt2801_readdata(struct comedi_device * dev, int *data) | |||
267 | return -ETIME; | 267 | return -ETIME; |
268 | } | 268 | } |
269 | 269 | ||
270 | static int dt2801_readdata2(struct comedi_device * dev, int *data) | 270 | static int dt2801_readdata2(struct comedi_device *dev, int *data) |
271 | { | 271 | { |
272 | int lb, hb; | 272 | int lb, hb; |
273 | int ret; | 273 | int ret; |
@@ -283,7 +283,7 @@ static int dt2801_readdata2(struct comedi_device * dev, int *data) | |||
283 | return 0; | 283 | return 0; |
284 | } | 284 | } |
285 | 285 | ||
286 | static int dt2801_writedata(struct comedi_device * dev, unsigned int data) | 286 | static int dt2801_writedata(struct comedi_device *dev, unsigned int data) |
287 | { | 287 | { |
288 | int stat = 0; | 288 | int stat = 0; |
289 | int timeout = DT2801_TIMEOUT; | 289 | int timeout = DT2801_TIMEOUT; |
@@ -309,7 +309,7 @@ static int dt2801_writedata(struct comedi_device * dev, unsigned int data) | |||
309 | return -ETIME; | 309 | return -ETIME; |
310 | } | 310 | } |
311 | 311 | ||
312 | static int dt2801_writedata2(struct comedi_device * dev, unsigned int data) | 312 | static int dt2801_writedata2(struct comedi_device *dev, unsigned int data) |
313 | { | 313 | { |
314 | int ret; | 314 | int ret; |
315 | 315 | ||
@@ -323,7 +323,7 @@ static int dt2801_writedata2(struct comedi_device * dev, unsigned int data) | |||
323 | return 0; | 323 | return 0; |
324 | } | 324 | } |
325 | 325 | ||
326 | static int dt2801_wait_for_ready(struct comedi_device * dev) | 326 | static int dt2801_wait_for_ready(struct comedi_device *dev) |
327 | { | 327 | { |
328 | int timeout = DT2801_TIMEOUT; | 328 | int timeout = DT2801_TIMEOUT; |
329 | int stat; | 329 | int stat; |
@@ -346,7 +346,7 @@ static int dt2801_wait_for_ready(struct comedi_device * dev) | |||
346 | return -ETIME; | 346 | return -ETIME; |
347 | } | 347 | } |
348 | 348 | ||
349 | static int dt2801_writecmd(struct comedi_device * dev, int command) | 349 | static int dt2801_writecmd(struct comedi_device *dev, int command) |
350 | { | 350 | { |
351 | int stat; | 351 | int stat; |
352 | 352 | ||
@@ -364,7 +364,7 @@ static int dt2801_writecmd(struct comedi_device * dev, int command) | |||
364 | return 0; | 364 | return 0; |
365 | } | 365 | } |
366 | 366 | ||
367 | static int dt2801_reset(struct comedi_device * dev) | 367 | static int dt2801_reset(struct comedi_device *dev) |
368 | { | 368 | { |
369 | int board_code = 0; | 369 | int board_code = 0; |
370 | unsigned int stat; | 370 | unsigned int stat; |
@@ -422,7 +422,7 @@ static int dt2801_reset(struct comedi_device * dev) | |||
422 | return board_code; | 422 | return board_code; |
423 | } | 423 | } |
424 | 424 | ||
425 | static int probe_number_of_ai_chans(struct comedi_device * dev) | 425 | static int probe_number_of_ai_chans(struct comedi_device *dev) |
426 | { | 426 | { |
427 | int n_chans; | 427 | int n_chans; |
428 | int stat; | 428 | int stat; |
@@ -483,7 +483,7 @@ static const struct comedi_lrange *ai_range_lkup(int type, int opt) | |||
483 | [4] - dac0 range 0=[-10,10], 1=[-5,5], 2=[-2.5,2.5] 3=[0,10], 4=[0,5] | 483 | [4] - dac0 range 0=[-10,10], 1=[-5,5], 2=[-2.5,2.5] 3=[0,10], 4=[0,5] |
484 | [5] - dac1 range 0=[-10,10], 1=[-5,5], 2=[-2.5,2.5] 3=[0,10], 4=[0,5] | 484 | [5] - dac1 range 0=[-10,10], 1=[-5,5], 2=[-2.5,2.5] 3=[0,10], 4=[0,5] |
485 | */ | 485 | */ |
486 | static int dt2801_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 486 | static int dt2801_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
487 | { | 487 | { |
488 | struct comedi_subdevice *s; | 488 | struct comedi_subdevice *s; |
489 | unsigned long iobase; | 489 | unsigned long iobase; |
@@ -584,7 +584,7 @@ static int dt2801_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
584 | return ret; | 584 | return ret; |
585 | } | 585 | } |
586 | 586 | ||
587 | static int dt2801_detach(struct comedi_device * dev) | 587 | static int dt2801_detach(struct comedi_device *dev) |
588 | { | 588 | { |
589 | if (dev->iobase) | 589 | if (dev->iobase) |
590 | release_region(dev->iobase, DT2801_IOSIZE); | 590 | release_region(dev->iobase, DT2801_IOSIZE); |
@@ -592,7 +592,7 @@ static int dt2801_detach(struct comedi_device * dev) | |||
592 | return 0; | 592 | return 0; |
593 | } | 593 | } |
594 | 594 | ||
595 | static int dt2801_error(struct comedi_device * dev, int stat) | 595 | static int dt2801_error(struct comedi_device *dev, int stat) |
596 | { | 596 | { |
597 | if (stat < 0) { | 597 | if (stat < 0) { |
598 | if (stat == -ETIME) { | 598 | if (stat == -ETIME) { |
@@ -610,8 +610,8 @@ static int dt2801_error(struct comedi_device * dev, int stat) | |||
610 | return -EIO; | 610 | return -EIO; |
611 | } | 611 | } |
612 | 612 | ||
613 | static int dt2801_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 613 | static int dt2801_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
614 | struct comedi_insn * insn, unsigned int * data) | 614 | struct comedi_insn *insn, unsigned int *data) |
615 | { | 615 | { |
616 | int d; | 616 | int d; |
617 | int stat; | 617 | int stat; |
@@ -632,16 +632,16 @@ static int dt2801_ai_insn_read(struct comedi_device * dev, struct comedi_subdevi | |||
632 | return i; | 632 | return i; |
633 | } | 633 | } |
634 | 634 | ||
635 | static int dt2801_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 635 | static int dt2801_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
636 | struct comedi_insn * insn, unsigned int * data) | 636 | struct comedi_insn *insn, unsigned int *data) |
637 | { | 637 | { |
638 | data[0] = devpriv->ao_readback[CR_CHAN(insn->chanspec)]; | 638 | data[0] = devpriv->ao_readback[CR_CHAN(insn->chanspec)]; |
639 | 639 | ||
640 | return 1; | 640 | return 1; |
641 | } | 641 | } |
642 | 642 | ||
643 | static int dt2801_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 643 | static int dt2801_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
644 | struct comedi_insn * insn, unsigned int * data) | 644 | struct comedi_insn *insn, unsigned int *data) |
645 | { | 645 | { |
646 | dt2801_writecmd(dev, DT_C_WRITE_DAIM); | 646 | dt2801_writecmd(dev, DT_C_WRITE_DAIM); |
647 | dt2801_writedata(dev, CR_CHAN(insn->chanspec)); | 647 | dt2801_writedata(dev, CR_CHAN(insn->chanspec)); |
@@ -652,8 +652,8 @@ static int dt2801_ao_insn_write(struct comedi_device * dev, struct comedi_subdev | |||
652 | return 1; | 652 | return 1; |
653 | } | 653 | } |
654 | 654 | ||
655 | static int dt2801_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 655 | static int dt2801_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
656 | struct comedi_insn * insn, unsigned int * data) | 656 | struct comedi_insn *insn, unsigned int *data) |
657 | { | 657 | { |
658 | int which = 0; | 658 | int which = 0; |
659 | 659 | ||
@@ -676,8 +676,8 @@ static int dt2801_dio_insn_bits(struct comedi_device * dev, struct comedi_subdev | |||
676 | return 2; | 676 | return 2; |
677 | } | 677 | } |
678 | 678 | ||
679 | static int dt2801_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 679 | static int dt2801_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
680 | struct comedi_insn * insn, unsigned int * data) | 680 | struct comedi_insn *insn, unsigned int *data) |
681 | { | 681 | { |
682 | int which = 0; | 682 | int which = 0; |
683 | 683 | ||
diff --git a/drivers/staging/comedi/drivers/dt2811.c b/drivers/staging/comedi/drivers/dt2811.c index c6908075ab0..634f2adf762 100644 --- a/drivers/staging/comedi/drivers/dt2811.c +++ b/drivers/staging/comedi/drivers/dt2811.c | |||
@@ -214,8 +214,8 @@ static const struct dt2811_board boardtypes[] = { | |||
214 | 214 | ||
215 | #define this_board ((const struct dt2811_board *)dev->board_ptr) | 215 | #define this_board ((const struct dt2811_board *)dev->board_ptr) |
216 | 216 | ||
217 | static int dt2811_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 217 | static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
218 | static int dt2811_detach(struct comedi_device * dev); | 218 | static int dt2811_detach(struct comedi_device *dev); |
219 | static struct comedi_driver driver_dt2811 = { | 219 | static struct comedi_driver driver_dt2811 = { |
220 | driver_name:"dt2811", | 220 | driver_name:"dt2811", |
221 | module:THIS_MODULE, | 221 | module:THIS_MODULE, |
@@ -228,16 +228,16 @@ static struct comedi_driver driver_dt2811 = { | |||
228 | 228 | ||
229 | COMEDI_INITCLEANUP(driver_dt2811); | 229 | COMEDI_INITCLEANUP(driver_dt2811); |
230 | 230 | ||
231 | static int dt2811_ai_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 231 | static int dt2811_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
232 | struct comedi_insn * insn, unsigned int * data); | 232 | struct comedi_insn *insn, unsigned int *data); |
233 | static int dt2811_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 233 | static int dt2811_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
234 | struct comedi_insn * insn, unsigned int * data); | 234 | struct comedi_insn *insn, unsigned int *data); |
235 | static int dt2811_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 235 | static int dt2811_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
236 | struct comedi_insn * insn, unsigned int * data); | 236 | struct comedi_insn *insn, unsigned int *data); |
237 | static int dt2811_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 237 | static int dt2811_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
238 | struct comedi_insn * insn, unsigned int * data); | 238 | struct comedi_insn *insn, unsigned int *data); |
239 | static int dt2811_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 239 | static int dt2811_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
240 | struct comedi_insn * insn, unsigned int * data); | 240 | struct comedi_insn *insn, unsigned int *data); |
241 | 241 | ||
242 | enum { card_2811_pgh, card_2811_pgl }; | 242 | enum { card_2811_pgh, card_2811_pgl }; |
243 | 243 | ||
@@ -311,7 +311,7 @@ static irqreturn_t dt2811_interrupt(int irq, void *d) | |||
311 | 2 == unipolar 5V (0V -- +5V) | 311 | 2 == unipolar 5V (0V -- +5V) |
312 | */ | 312 | */ |
313 | 313 | ||
314 | static int dt2811_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 314 | static int dt2811_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
315 | { | 315 | { |
316 | /* int i, irq; */ | 316 | /* int i, irq; */ |
317 | /* unsigned long irqs; */ | 317 | /* unsigned long irqs; */ |
@@ -480,7 +480,7 @@ static int dt2811_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
480 | return 0; | 480 | return 0; |
481 | } | 481 | } |
482 | 482 | ||
483 | static int dt2811_detach(struct comedi_device * dev) | 483 | static int dt2811_detach(struct comedi_device *dev) |
484 | { | 484 | { |
485 | printk("comedi%d: dt2811: remove\n", dev->minor); | 485 | printk("comedi%d: dt2811: remove\n", dev->minor); |
486 | 486 | ||
@@ -494,8 +494,8 @@ static int dt2811_detach(struct comedi_device * dev) | |||
494 | return 0; | 494 | return 0; |
495 | } | 495 | } |
496 | 496 | ||
497 | static int dt2811_ai_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 497 | static int dt2811_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
498 | struct comedi_insn * insn, unsigned int * data) | 498 | struct comedi_insn *insn, unsigned int *data) |
499 | { | 499 | { |
500 | int chan = CR_CHAN(insn->chanspec); | 500 | int chan = CR_CHAN(insn->chanspec); |
501 | int timeout = DT2811_TIMEOUT; | 501 | int timeout = DT2811_TIMEOUT; |
@@ -521,7 +521,7 @@ static int dt2811_ai_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
521 | #if 0 | 521 | #if 0 |
522 | /* Wow. This is code from the Comedi stone age. But it hasn't been | 522 | /* Wow. This is code from the Comedi stone age. But it hasn't been |
523 | * replaced, so I'll let it stay. */ | 523 | * replaced, so I'll let it stay. */ |
524 | int dt2811_adtrig(kdev_t minor, comedi_adtrig * adtrig) | 524 | int dt2811_adtrig(kdev_t minor, comedi_adtrig *adtrig) |
525 | { | 525 | { |
526 | struct comedi_device *dev = comedi_devices + minor; | 526 | struct comedi_device *dev = comedi_devices + minor; |
527 | 527 | ||
@@ -545,8 +545,8 @@ int dt2811_adtrig(kdev_t minor, comedi_adtrig * adtrig) | |||
545 | } | 545 | } |
546 | #endif | 546 | #endif |
547 | 547 | ||
548 | static int dt2811_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 548 | static int dt2811_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
549 | struct comedi_insn * insn, unsigned int * data) | 549 | struct comedi_insn *insn, unsigned int *data) |
550 | { | 550 | { |
551 | int i; | 551 | int i; |
552 | int chan; | 552 | int chan; |
@@ -563,8 +563,8 @@ static int dt2811_ao_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
563 | return i; | 563 | return i; |
564 | } | 564 | } |
565 | 565 | ||
566 | static int dt2811_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 566 | static int dt2811_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
567 | struct comedi_insn * insn, unsigned int * data) | 567 | struct comedi_insn *insn, unsigned int *data) |
568 | { | 568 | { |
569 | int i; | 569 | int i; |
570 | int chan; | 570 | int chan; |
@@ -578,8 +578,8 @@ static int dt2811_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi | |||
578 | return i; | 578 | return i; |
579 | } | 579 | } |
580 | 580 | ||
581 | static int dt2811_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 581 | static int dt2811_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
582 | struct comedi_insn * insn, unsigned int * data) | 582 | struct comedi_insn *insn, unsigned int *data) |
583 | { | 583 | { |
584 | if (insn->n != 2) | 584 | if (insn->n != 2) |
585 | return -EINVAL; | 585 | return -EINVAL; |
@@ -589,8 +589,8 @@ static int dt2811_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi | |||
589 | return 2; | 589 | return 2; |
590 | } | 590 | } |
591 | 591 | ||
592 | static int dt2811_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 592 | static int dt2811_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
593 | struct comedi_insn * insn, unsigned int * data) | 593 | struct comedi_insn *insn, unsigned int *data) |
594 | { | 594 | { |
595 | if (insn->n != 2) | 595 | if (insn->n != 2) |
596 | return -EINVAL; | 596 | return -EINVAL; |
diff --git a/drivers/staging/comedi/drivers/dt2814.c b/drivers/staging/comedi/drivers/dt2814.c index e806520b587..6b82f6ef53f 100644 --- a/drivers/staging/comedi/drivers/dt2814.c +++ b/drivers/staging/comedi/drivers/dt2814.c | |||
@@ -59,8 +59,8 @@ addition, the clock does not seem to be very accurate. | |||
59 | #define DT2814_ENB 0x10 | 59 | #define DT2814_ENB 0x10 |
60 | #define DT2814_CHANMASK 0x0f | 60 | #define DT2814_CHANMASK 0x0f |
61 | 61 | ||
62 | static int dt2814_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 62 | static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
63 | static int dt2814_detach(struct comedi_device * dev); | 63 | static int dt2814_detach(struct comedi_device *dev); |
64 | static struct comedi_driver driver_dt2814 = { | 64 | static struct comedi_driver driver_dt2814 = { |
65 | driver_name:"dt2814", | 65 | driver_name:"dt2814", |
66 | module:THIS_MODULE, | 66 | module:THIS_MODULE, |
@@ -83,8 +83,8 @@ struct dt2814_private { | |||
83 | #define DT2814_TIMEOUT 10 | 83 | #define DT2814_TIMEOUT 10 |
84 | #define DT2814_MAX_SPEED 100000 /* Arbitrary 10 khz limit */ | 84 | #define DT2814_MAX_SPEED 100000 /* Arbitrary 10 khz limit */ |
85 | 85 | ||
86 | static int dt2814_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 86 | static int dt2814_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
87 | struct comedi_insn * insn, unsigned int * data) | 87 | struct comedi_insn *insn, unsigned int *data) |
88 | { | 88 | { |
89 | int n, i, hi, lo; | 89 | int n, i, hi, lo; |
90 | int chan; | 90 | int chan; |
@@ -134,8 +134,8 @@ static int dt2814_ns_to_timer(unsigned int *ns, unsigned int flags) | |||
134 | return i; | 134 | return i; |
135 | } | 135 | } |
136 | 136 | ||
137 | static int dt2814_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 137 | static int dt2814_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
138 | struct comedi_cmd * cmd) | 138 | struct comedi_cmd *cmd) |
139 | { | 139 | { |
140 | int err = 0; | 140 | int err = 0; |
141 | int tmp; | 141 | int tmp; |
@@ -226,7 +226,7 @@ static int dt2814_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice | |||
226 | return 0; | 226 | return 0; |
227 | } | 227 | } |
228 | 228 | ||
229 | static int dt2814_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 229 | static int dt2814_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
230 | { | 230 | { |
231 | struct comedi_cmd *cmd = &s->async->cmd; | 231 | struct comedi_cmd *cmd = &s->async->cmd; |
232 | int chan; | 232 | int chan; |
@@ -245,7 +245,7 @@ static int dt2814_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s | |||
245 | 245 | ||
246 | } | 246 | } |
247 | 247 | ||
248 | static int dt2814_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 248 | static int dt2814_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
249 | { | 249 | { |
250 | int i, irq; | 250 | int i, irq; |
251 | int ret; | 251 | int ret; |
@@ -329,7 +329,7 @@ static int dt2814_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
329 | return 0; | 329 | return 0; |
330 | } | 330 | } |
331 | 331 | ||
332 | static int dt2814_detach(struct comedi_device * dev) | 332 | static int dt2814_detach(struct comedi_device *dev) |
333 | { | 333 | { |
334 | printk("comedi%d: dt2814: remove\n", dev->minor); | 334 | printk("comedi%d: dt2814: remove\n", dev->minor); |
335 | 335 | ||
diff --git a/drivers/staging/comedi/drivers/dt2815.c b/drivers/staging/comedi/drivers/dt2815.c index fccec8a77d5..36a2f07792b 100644 --- a/drivers/staging/comedi/drivers/dt2815.c +++ b/drivers/staging/comedi/drivers/dt2815.c | |||
@@ -75,8 +75,8 @@ static const struct comedi_lrange range_dt2815_ao_20_current = { 1, { | |||
75 | #define DT2815_DATA 0 | 75 | #define DT2815_DATA 0 |
76 | #define DT2815_STATUS 1 | 76 | #define DT2815_STATUS 1 |
77 | 77 | ||
78 | static int dt2815_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 78 | static int dt2815_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
79 | static int dt2815_detach(struct comedi_device * dev); | 79 | static int dt2815_detach(struct comedi_device *dev); |
80 | static struct comedi_driver driver_dt2815 = { | 80 | static struct comedi_driver driver_dt2815 = { |
81 | driver_name:"dt2815", | 81 | driver_name:"dt2815", |
82 | module:THIS_MODULE, | 82 | module:THIS_MODULE, |
@@ -86,7 +86,7 @@ static struct comedi_driver driver_dt2815 = { | |||
86 | 86 | ||
87 | COMEDI_INITCLEANUP(driver_dt2815); | 87 | COMEDI_INITCLEANUP(driver_dt2815); |
88 | 88 | ||
89 | static void dt2815_free_resources(struct comedi_device * dev); | 89 | static void dt2815_free_resources(struct comedi_device *dev); |
90 | 90 | ||
91 | struct dt2815_private { | 91 | struct dt2815_private { |
92 | 92 | ||
@@ -97,7 +97,7 @@ struct dt2815_private { | |||
97 | 97 | ||
98 | #define devpriv ((struct dt2815_private *)dev->private) | 98 | #define devpriv ((struct dt2815_private *)dev->private) |
99 | 99 | ||
100 | static int dt2815_wait_for_status(struct comedi_device * dev, int status) | 100 | static int dt2815_wait_for_status(struct comedi_device *dev, int status) |
101 | { | 101 | { |
102 | int i; | 102 | int i; |
103 | 103 | ||
@@ -108,8 +108,8 @@ static int dt2815_wait_for_status(struct comedi_device * dev, int status) | |||
108 | return status; | 108 | return status; |
109 | } | 109 | } |
110 | 110 | ||
111 | static int dt2815_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 111 | static int dt2815_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
112 | struct comedi_insn * insn, unsigned int * data) | 112 | struct comedi_insn *insn, unsigned int *data) |
113 | { | 113 | { |
114 | int i; | 114 | int i; |
115 | int chan = CR_CHAN(insn->chanspec); | 115 | int chan = CR_CHAN(insn->chanspec); |
@@ -121,8 +121,8 @@ static int dt2815_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi | |||
121 | return i; | 121 | return i; |
122 | } | 122 | } |
123 | 123 | ||
124 | static int dt2815_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 124 | static int dt2815_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
125 | struct comedi_insn * insn, unsigned int * data) | 125 | struct comedi_insn *insn, unsigned int *data) |
126 | { | 126 | { |
127 | int i; | 127 | int i; |
128 | int chan = CR_CHAN(insn->chanspec); | 128 | int chan = CR_CHAN(insn->chanspec); |
@@ -179,7 +179,7 @@ static int dt2815_ao_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
179 | 1 == current | 179 | 1 == current |
180 | */ | 180 | */ |
181 | 181 | ||
182 | static int dt2815_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 182 | static int dt2815_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
183 | { | 183 | { |
184 | struct comedi_subdevice *s; | 184 | struct comedi_subdevice *s; |
185 | int i; | 185 | int i; |
@@ -248,13 +248,13 @@ static int dt2815_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
248 | return 0; | 248 | return 0; |
249 | } | 249 | } |
250 | 250 | ||
251 | static void dt2815_free_resources(struct comedi_device * dev) | 251 | static void dt2815_free_resources(struct comedi_device *dev) |
252 | { | 252 | { |
253 | if (dev->iobase) | 253 | if (dev->iobase) |
254 | release_region(dev->iobase, DT2815_SIZE); | 254 | release_region(dev->iobase, DT2815_SIZE); |
255 | } | 255 | } |
256 | 256 | ||
257 | static int dt2815_detach(struct comedi_device * dev) | 257 | static int dt2815_detach(struct comedi_device *dev) |
258 | { | 258 | { |
259 | printk("comedi%d: dt2815: remove\n", dev->minor); | 259 | printk("comedi%d: dt2815: remove\n", dev->minor); |
260 | 260 | ||
diff --git a/drivers/staging/comedi/drivers/dt2817.c b/drivers/staging/comedi/drivers/dt2817.c index 2dc396a44e6..8d52b269922 100644 --- a/drivers/staging/comedi/drivers/dt2817.c +++ b/drivers/staging/comedi/drivers/dt2817.c | |||
@@ -47,8 +47,8 @@ Configuration options: | |||
47 | #define DT2817_CR 0 | 47 | #define DT2817_CR 0 |
48 | #define DT2817_DATA 1 | 48 | #define DT2817_DATA 1 |
49 | 49 | ||
50 | static int dt2817_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 50 | static int dt2817_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
51 | static int dt2817_detach(struct comedi_device * dev); | 51 | static int dt2817_detach(struct comedi_device *dev); |
52 | static struct comedi_driver driver_dt2817 = { | 52 | static struct comedi_driver driver_dt2817 = { |
53 | driver_name:"dt2817", | 53 | driver_name:"dt2817", |
54 | module:THIS_MODULE, | 54 | module:THIS_MODULE, |
@@ -58,8 +58,8 @@ static struct comedi_driver driver_dt2817 = { | |||
58 | 58 | ||
59 | COMEDI_INITCLEANUP(driver_dt2817); | 59 | COMEDI_INITCLEANUP(driver_dt2817); |
60 | 60 | ||
61 | static int dt2817_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 61 | static int dt2817_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
62 | struct comedi_insn * insn, unsigned int * data) | 62 | struct comedi_insn *insn, unsigned int *data) |
63 | { | 63 | { |
64 | int mask; | 64 | int mask; |
65 | int chan; | 65 | int chan; |
@@ -96,8 +96,8 @@ static int dt2817_dio_insn_config(struct comedi_device * dev, struct comedi_subd | |||
96 | return 1; | 96 | return 1; |
97 | } | 97 | } |
98 | 98 | ||
99 | static int dt2817_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 99 | static int dt2817_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
100 | struct comedi_insn * insn, unsigned int * data) | 100 | struct comedi_insn *insn, unsigned int *data) |
101 | { | 101 | { |
102 | unsigned int changed; | 102 | unsigned int changed; |
103 | 103 | ||
@@ -131,7 +131,7 @@ static int dt2817_dio_insn_bits(struct comedi_device * dev, struct comedi_subdev | |||
131 | return 2; | 131 | return 2; |
132 | } | 132 | } |
133 | 133 | ||
134 | static int dt2817_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 134 | static int dt2817_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
135 | { | 135 | { |
136 | int ret; | 136 | int ret; |
137 | struct comedi_subdevice *s; | 137 | struct comedi_subdevice *s; |
@@ -167,7 +167,7 @@ static int dt2817_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
167 | return 0; | 167 | return 0; |
168 | } | 168 | } |
169 | 169 | ||
170 | static int dt2817_detach(struct comedi_device * dev) | 170 | static int dt2817_detach(struct comedi_device *dev) |
171 | { | 171 | { |
172 | printk("comedi%d: dt2817: remove\n", dev->minor); | 172 | printk("comedi%d: dt2817: remove\n", dev->minor); |
173 | 173 | ||
diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c index 275644ac4b9..3174c36573e 100644 --- a/drivers/staging/comedi/drivers/dt282x.c +++ b/drivers/staging/comedi/drivers/dt282x.c | |||
@@ -394,8 +394,8 @@ struct dt282x_private { | |||
394 | if(_i){b} \ | 394 | if(_i){b} \ |
395 | }while(0) | 395 | }while(0) |
396 | 396 | ||
397 | static int dt282x_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 397 | static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
398 | static int dt282x_detach(struct comedi_device * dev); | 398 | static int dt282x_detach(struct comedi_device *dev); |
399 | static struct comedi_driver driver_dt282x = { | 399 | static struct comedi_driver driver_dt282x = { |
400 | driver_name:"dt282x", | 400 | driver_name:"dt282x", |
401 | module:THIS_MODULE, | 401 | module:THIS_MODULE, |
@@ -408,17 +408,17 @@ static struct comedi_driver driver_dt282x = { | |||
408 | 408 | ||
409 | COMEDI_INITCLEANUP(driver_dt282x); | 409 | COMEDI_INITCLEANUP(driver_dt282x); |
410 | 410 | ||
411 | static void free_resources(struct comedi_device * dev); | 411 | static void free_resources(struct comedi_device *dev); |
412 | static int prep_ai_dma(struct comedi_device * dev, int chan, int size); | 412 | static int prep_ai_dma(struct comedi_device *dev, int chan, int size); |
413 | static int prep_ao_dma(struct comedi_device * dev, int chan, int size); | 413 | static int prep_ao_dma(struct comedi_device *dev, int chan, int size); |
414 | static int dt282x_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 414 | static int dt282x_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s); |
415 | static int dt282x_ao_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 415 | static int dt282x_ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s); |
416 | static int dt282x_ns_to_timer(int *nanosec, int round_mode); | 416 | static int dt282x_ns_to_timer(int *nanosec, int round_mode); |
417 | static void dt282x_disable_dma(struct comedi_device * dev); | 417 | static void dt282x_disable_dma(struct comedi_device *dev); |
418 | 418 | ||
419 | static int dt282x_grab_dma(struct comedi_device * dev, int dma1, int dma2); | 419 | static int dt282x_grab_dma(struct comedi_device *dev, int dma1, int dma2); |
420 | 420 | ||
421 | static void dt282x_munge(struct comedi_device * dev, short * buf, | 421 | static void dt282x_munge(struct comedi_device *dev, short *buf, |
422 | unsigned int nbytes) | 422 | unsigned int nbytes) |
423 | { | 423 | { |
424 | unsigned int i; | 424 | unsigned int i; |
@@ -440,7 +440,7 @@ static void dt282x_munge(struct comedi_device * dev, short * buf, | |||
440 | } | 440 | } |
441 | } | 441 | } |
442 | 442 | ||
443 | static void dt282x_ao_dma_interrupt(struct comedi_device * dev) | 443 | static void dt282x_ao_dma_interrupt(struct comedi_device *dev) |
444 | { | 444 | { |
445 | void *ptr; | 445 | void *ptr; |
446 | int size; | 446 | int size; |
@@ -472,7 +472,7 @@ static void dt282x_ao_dma_interrupt(struct comedi_device * dev) | |||
472 | return; | 472 | return; |
473 | } | 473 | } |
474 | 474 | ||
475 | static void dt282x_ai_dma_interrupt(struct comedi_device * dev) | 475 | static void dt282x_ai_dma_interrupt(struct comedi_device *dev) |
476 | { | 476 | { |
477 | void *ptr; | 477 | void *ptr; |
478 | int size; | 478 | int size; |
@@ -524,7 +524,7 @@ static void dt282x_ai_dma_interrupt(struct comedi_device * dev) | |||
524 | prep_ai_dma(dev, i, 0); | 524 | prep_ai_dma(dev, i, 0); |
525 | } | 525 | } |
526 | 526 | ||
527 | static int prep_ai_dma(struct comedi_device * dev, int dma_index, int n) | 527 | static int prep_ai_dma(struct comedi_device *dev, int dma_index, int n) |
528 | { | 528 | { |
529 | int dma_chan; | 529 | int dma_chan; |
530 | unsigned long dma_ptr; | 530 | unsigned long dma_ptr; |
@@ -555,7 +555,7 @@ static int prep_ai_dma(struct comedi_device * dev, int dma_index, int n) | |||
555 | return n; | 555 | return n; |
556 | } | 556 | } |
557 | 557 | ||
558 | static int prep_ao_dma(struct comedi_device * dev, int dma_index, int n) | 558 | static int prep_ao_dma(struct comedi_device *dev, int dma_index, int n) |
559 | { | 559 | { |
560 | int dma_chan; | 560 | int dma_chan; |
561 | unsigned long dma_ptr; | 561 | unsigned long dma_ptr; |
@@ -653,7 +653,7 @@ static irqreturn_t dt282x_interrupt(int irq, void *d) | |||
653 | return IRQ_RETVAL(handled); | 653 | return IRQ_RETVAL(handled); |
654 | } | 654 | } |
655 | 655 | ||
656 | static void dt282x_load_changain(struct comedi_device * dev, int n, | 656 | static void dt282x_load_changain(struct comedi_device *dev, int n, |
657 | unsigned int *chanlist) | 657 | unsigned int *chanlist) |
658 | { | 658 | { |
659 | unsigned int i; | 659 | unsigned int i; |
@@ -674,8 +674,8 @@ static void dt282x_load_changain(struct comedi_device * dev, int n, | |||
674 | * - preload multiplexer | 674 | * - preload multiplexer |
675 | * - trigger conversion and wait for it to finish | 675 | * - trigger conversion and wait for it to finish |
676 | */ | 676 | */ |
677 | static int dt282x_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 677 | static int dt282x_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
678 | struct comedi_insn * insn, unsigned int * data) | 678 | struct comedi_insn *insn, unsigned int *data) |
679 | { | 679 | { |
680 | int i; | 680 | int i; |
681 | 681 | ||
@@ -706,8 +706,8 @@ static int dt282x_ai_insn_read(struct comedi_device * dev, struct comedi_subdevi | |||
706 | return i; | 706 | return i; |
707 | } | 707 | } |
708 | 708 | ||
709 | static int dt282x_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 709 | static int dt282x_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
710 | struct comedi_cmd * cmd) | 710 | struct comedi_cmd *cmd) |
711 | { | 711 | { |
712 | int err = 0; | 712 | int err = 0; |
713 | int tmp; | 713 | int tmp; |
@@ -818,7 +818,7 @@ static int dt282x_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice | |||
818 | return 0; | 818 | return 0; |
819 | } | 819 | } |
820 | 820 | ||
821 | static int dt282x_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 821 | static int dt282x_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
822 | { | 822 | { |
823 | struct comedi_cmd *cmd = &s->async->cmd; | 823 | struct comedi_cmd *cmd = &s->async->cmd; |
824 | int timer; | 824 | int timer; |
@@ -879,7 +879,7 @@ static int dt282x_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s | |||
879 | return 0; | 879 | return 0; |
880 | } | 880 | } |
881 | 881 | ||
882 | static void dt282x_disable_dma(struct comedi_device * dev) | 882 | static void dt282x_disable_dma(struct comedi_device *dev) |
883 | { | 883 | { |
884 | if (devpriv->usedma) { | 884 | if (devpriv->usedma) { |
885 | disable_dma(devpriv->dma[0].chan); | 885 | disable_dma(devpriv->dma[0].chan); |
@@ -887,7 +887,7 @@ static void dt282x_disable_dma(struct comedi_device * dev) | |||
887 | } | 887 | } |
888 | } | 888 | } |
889 | 889 | ||
890 | static int dt282x_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 890 | static int dt282x_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
891 | { | 891 | { |
892 | dt282x_disable_dma(dev); | 892 | dt282x_disable_dma(dev); |
893 | 893 | ||
@@ -937,16 +937,16 @@ static int dt282x_ns_to_timer(int *nanosec, int round_mode) | |||
937 | * offset binary if necessary, loads the data into the DAC | 937 | * offset binary if necessary, loads the data into the DAC |
938 | * data register, and performs the conversion. | 938 | * data register, and performs the conversion. |
939 | */ | 939 | */ |
940 | static int dt282x_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 940 | static int dt282x_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
941 | struct comedi_insn * insn, unsigned int * data) | 941 | struct comedi_insn *insn, unsigned int *data) |
942 | { | 942 | { |
943 | data[0] = devpriv->ao[CR_CHAN(insn->chanspec)]; | 943 | data[0] = devpriv->ao[CR_CHAN(insn->chanspec)]; |
944 | 944 | ||
945 | return 1; | 945 | return 1; |
946 | } | 946 | } |
947 | 947 | ||
948 | static int dt282x_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 948 | static int dt282x_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
949 | struct comedi_insn * insn, unsigned int * data) | 949 | struct comedi_insn *insn, unsigned int *data) |
950 | { | 950 | { |
951 | short d; | 951 | short d; |
952 | unsigned int chan; | 952 | unsigned int chan; |
@@ -978,8 +978,8 @@ static int dt282x_ao_insn_write(struct comedi_device * dev, struct comedi_subdev | |||
978 | return 1; | 978 | return 1; |
979 | } | 979 | } |
980 | 980 | ||
981 | static int dt282x_ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 981 | static int dt282x_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
982 | struct comedi_cmd * cmd) | 982 | struct comedi_cmd *cmd) |
983 | { | 983 | { |
984 | int err = 0; | 984 | int err = 0; |
985 | int tmp; | 985 | int tmp; |
@@ -1069,7 +1069,7 @@ static int dt282x_ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice | |||
1069 | 1069 | ||
1070 | } | 1070 | } |
1071 | 1071 | ||
1072 | static int dt282x_ao_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, | 1072 | static int dt282x_ao_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, |
1073 | unsigned int x) | 1073 | unsigned int x) |
1074 | { | 1074 | { |
1075 | int size; | 1075 | int size; |
@@ -1099,7 +1099,7 @@ static int dt282x_ao_inttrig(struct comedi_device * dev, struct comedi_subdevice | |||
1099 | return 1; | 1099 | return 1; |
1100 | } | 1100 | } |
1101 | 1101 | ||
1102 | static int dt282x_ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 1102 | static int dt282x_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
1103 | { | 1103 | { |
1104 | int timer; | 1104 | int timer; |
1105 | struct comedi_cmd *cmd = &s->async->cmd; | 1105 | struct comedi_cmd *cmd = &s->async->cmd; |
@@ -1132,7 +1132,7 @@ static int dt282x_ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s | |||
1132 | return 0; | 1132 | return 0; |
1133 | } | 1133 | } |
1134 | 1134 | ||
1135 | static int dt282x_ao_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 1135 | static int dt282x_ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
1136 | { | 1136 | { |
1137 | dt282x_disable_dma(dev); | 1137 | dt282x_disable_dma(dev); |
1138 | 1138 | ||
@@ -1145,8 +1145,8 @@ static int dt282x_ao_cancel(struct comedi_device * dev, struct comedi_subdevice | |||
1145 | return 0; | 1145 | return 0; |
1146 | } | 1146 | } |
1147 | 1147 | ||
1148 | static int dt282x_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 1148 | static int dt282x_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
1149 | struct comedi_insn * insn, unsigned int * data) | 1149 | struct comedi_insn *insn, unsigned int *data) |
1150 | { | 1150 | { |
1151 | if (data[0]) { | 1151 | if (data[0]) { |
1152 | s->state &= ~data[0]; | 1152 | s->state &= ~data[0]; |
@@ -1159,8 +1159,8 @@ static int dt282x_dio_insn_bits(struct comedi_device * dev, struct comedi_subdev | |||
1159 | return 2; | 1159 | return 2; |
1160 | } | 1160 | } |
1161 | 1161 | ||
1162 | static int dt282x_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 1162 | static int dt282x_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
1163 | struct comedi_insn * insn, unsigned int * data) | 1163 | struct comedi_insn *insn, unsigned int *data) |
1164 | { | 1164 | { |
1165 | int mask; | 1165 | int mask; |
1166 | 1166 | ||
@@ -1240,7 +1240,7 @@ enum { opt_iobase = 0, opt_irq, opt_dma1, opt_dma2, /* i/o base, irq, dma channe | |||
1240 | 9 ao0 0=±10 V, 1=0-10 V, 2=±5 V, 3=0-5 V, 4=±2.5 V | 1240 | 9 ao0 0=±10 V, 1=0-10 V, 2=±5 V, 3=0-5 V, 4=±2.5 V |
1241 | 10 ao1 0=±10 V, 1=0-10 V, 2=±5 V, 3=0-5 V, 4=±2.5 V | 1241 | 10 ao1 0=±10 V, 1=0-10 V, 2=±5 V, 3=0-5 V, 4=±2.5 V |
1242 | */ | 1242 | */ |
1243 | static int dt282x_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 1243 | static int dt282x_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
1244 | { | 1244 | { |
1245 | int i, irq; | 1245 | int i, irq; |
1246 | int ret; | 1246 | int ret; |
@@ -1396,7 +1396,7 @@ static int dt282x_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
1396 | return 0; | 1396 | return 0; |
1397 | } | 1397 | } |
1398 | 1398 | ||
1399 | static void free_resources(struct comedi_device * dev) | 1399 | static void free_resources(struct comedi_device *dev) |
1400 | { | 1400 | { |
1401 | if (dev->irq) { | 1401 | if (dev->irq) { |
1402 | comedi_free_irq(dev->irq, dev); | 1402 | comedi_free_irq(dev->irq, dev); |
@@ -1415,7 +1415,7 @@ static void free_resources(struct comedi_device * dev) | |||
1415 | } | 1415 | } |
1416 | } | 1416 | } |
1417 | 1417 | ||
1418 | static int dt282x_detach(struct comedi_device * dev) | 1418 | static int dt282x_detach(struct comedi_device *dev) |
1419 | { | 1419 | { |
1420 | printk("comedi%d: dt282x: remove\n", dev->minor); | 1420 | printk("comedi%d: dt282x: remove\n", dev->minor); |
1421 | 1421 | ||
@@ -1424,7 +1424,7 @@ static int dt282x_detach(struct comedi_device * dev) | |||
1424 | return 0; | 1424 | return 0; |
1425 | } | 1425 | } |
1426 | 1426 | ||
1427 | static int dt282x_grab_dma(struct comedi_device * dev, int dma1, int dma2) | 1427 | static int dt282x_grab_dma(struct comedi_device *dev, int dma1, int dma2) |
1428 | { | 1428 | { |
1429 | int ret; | 1429 | int ret; |
1430 | 1430 | ||
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c index dabc0970504..2d301597c3e 100644 --- a/drivers/staging/comedi/drivers/dt3000.c +++ b/drivers/staging/comedi/drivers/dt3000.c | |||
@@ -275,8 +275,8 @@ struct dt3k_private { | |||
275 | 275 | ||
276 | #define devpriv ((struct dt3k_private *)dev->private) | 276 | #define devpriv ((struct dt3k_private *)dev->private) |
277 | 277 | ||
278 | static int dt3000_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 278 | static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
279 | static int dt3000_detach(struct comedi_device * dev); | 279 | static int dt3000_detach(struct comedi_device *dev); |
280 | static struct comedi_driver driver_dt3000 = { | 280 | static struct comedi_driver driver_dt3000 = { |
281 | driver_name:"dt3000", | 281 | driver_name:"dt3000", |
282 | module:THIS_MODULE, | 282 | module:THIS_MODULE, |
@@ -286,17 +286,17 @@ static struct comedi_driver driver_dt3000 = { | |||
286 | 286 | ||
287 | COMEDI_PCI_INITCLEANUP(driver_dt3000, dt3k_pci_table); | 287 | COMEDI_PCI_INITCLEANUP(driver_dt3000, dt3k_pci_table); |
288 | 288 | ||
289 | static void dt3k_ai_empty_fifo(struct comedi_device * dev, struct comedi_subdevice * s); | 289 | static void dt3k_ai_empty_fifo(struct comedi_device *dev, struct comedi_subdevice *s); |
290 | static int dt3k_ns_to_timer(unsigned int timer_base, unsigned int *arg, | 290 | static int dt3k_ns_to_timer(unsigned int timer_base, unsigned int *arg, |
291 | unsigned int round_mode); | 291 | unsigned int round_mode); |
292 | static int dt3k_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 292 | static int dt3k_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s); |
293 | #ifdef DEBUG | 293 | #ifdef DEBUG |
294 | static void debug_intr_flags(unsigned int flags); | 294 | static void debug_intr_flags(unsigned int flags); |
295 | #endif | 295 | #endif |
296 | 296 | ||
297 | #define TIMEOUT 100 | 297 | #define TIMEOUT 100 |
298 | 298 | ||
299 | static int dt3k_send_cmd(struct comedi_device * dev, unsigned int cmd) | 299 | static int dt3k_send_cmd(struct comedi_device *dev, unsigned int cmd) |
300 | { | 300 | { |
301 | int i; | 301 | int i; |
302 | unsigned int status = 0; | 302 | unsigned int status = 0; |
@@ -318,7 +318,7 @@ static int dt3k_send_cmd(struct comedi_device * dev, unsigned int cmd) | |||
318 | return -ETIME; | 318 | return -ETIME; |
319 | } | 319 | } |
320 | 320 | ||
321 | static unsigned int dt3k_readsingle(struct comedi_device * dev, unsigned int subsys, | 321 | static unsigned int dt3k_readsingle(struct comedi_device *dev, unsigned int subsys, |
322 | unsigned int chan, unsigned int gain) | 322 | unsigned int chan, unsigned int gain) |
323 | { | 323 | { |
324 | writew(subsys, devpriv->io_addr + DPR_SubSys); | 324 | writew(subsys, devpriv->io_addr + DPR_SubSys); |
@@ -331,7 +331,7 @@ static unsigned int dt3k_readsingle(struct comedi_device * dev, unsigned int sub | |||
331 | return readw(devpriv->io_addr + DPR_Params(2)); | 331 | return readw(devpriv->io_addr + DPR_Params(2)); |
332 | } | 332 | } |
333 | 333 | ||
334 | static void dt3k_writesingle(struct comedi_device * dev, unsigned int subsys, | 334 | static void dt3k_writesingle(struct comedi_device *dev, unsigned int subsys, |
335 | unsigned int chan, unsigned int data) | 335 | unsigned int chan, unsigned int data) |
336 | { | 336 | { |
337 | writew(subsys, devpriv->io_addr + DPR_SubSys); | 337 | writew(subsys, devpriv->io_addr + DPR_SubSys); |
@@ -400,7 +400,7 @@ static void debug_intr_flags(unsigned int flags) | |||
400 | } | 400 | } |
401 | #endif | 401 | #endif |
402 | 402 | ||
403 | static void dt3k_ai_empty_fifo(struct comedi_device * dev, struct comedi_subdevice * s) | 403 | static void dt3k_ai_empty_fifo(struct comedi_device *dev, struct comedi_subdevice *s) |
404 | { | 404 | { |
405 | int front; | 405 | int front; |
406 | int rear; | 406 | int rear; |
@@ -429,8 +429,8 @@ static void dt3k_ai_empty_fifo(struct comedi_device * dev, struct comedi_subdevi | |||
429 | writew(rear, devpriv->io_addr + DPR_AD_Buf_Rear); | 429 | writew(rear, devpriv->io_addr + DPR_AD_Buf_Rear); |
430 | } | 430 | } |
431 | 431 | ||
432 | static int dt3k_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 432 | static int dt3k_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
433 | struct comedi_cmd * cmd) | 433 | struct comedi_cmd *cmd) |
434 | { | 434 | { |
435 | int err = 0; | 435 | int err = 0; |
436 | int tmp; | 436 | int tmp; |
@@ -591,7 +591,7 @@ static int dt3k_ns_to_timer(unsigned int timer_base, unsigned int *nanosec, | |||
591 | return (prescale << 16) | (divider); | 591 | return (prescale << 16) | (divider); |
592 | } | 592 | } |
593 | 593 | ||
594 | static int dt3k_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 594 | static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
595 | { | 595 | { |
596 | struct comedi_cmd *cmd = &s->async->cmd; | 596 | struct comedi_cmd *cmd = &s->async->cmd; |
597 | int i; | 597 | int i; |
@@ -659,7 +659,7 @@ static int dt3k_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
659 | return 0; | 659 | return 0; |
660 | } | 660 | } |
661 | 661 | ||
662 | static int dt3k_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 662 | static int dt3k_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
663 | { | 663 | { |
664 | int ret; | 664 | int ret; |
665 | 665 | ||
@@ -671,8 +671,8 @@ static int dt3k_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * | |||
671 | return 0; | 671 | return 0; |
672 | } | 672 | } |
673 | 673 | ||
674 | static int dt3k_ai_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 674 | static int dt3k_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
675 | struct comedi_insn * insn, unsigned int * data) | 675 | struct comedi_insn *insn, unsigned int *data) |
676 | { | 676 | { |
677 | int i; | 677 | int i; |
678 | unsigned int chan, gain, aref; | 678 | unsigned int chan, gain, aref; |
@@ -689,8 +689,8 @@ static int dt3k_ai_insn(struct comedi_device * dev, struct comedi_subdevice * s, | |||
689 | return i; | 689 | return i; |
690 | } | 690 | } |
691 | 691 | ||
692 | static int dt3k_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 692 | static int dt3k_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
693 | struct comedi_insn * insn, unsigned int * data) | 693 | struct comedi_insn *insn, unsigned int *data) |
694 | { | 694 | { |
695 | int i; | 695 | int i; |
696 | unsigned int chan; | 696 | unsigned int chan; |
@@ -704,8 +704,8 @@ static int dt3k_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s, | |||
704 | return i; | 704 | return i; |
705 | } | 705 | } |
706 | 706 | ||
707 | static int dt3k_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 707 | static int dt3k_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
708 | struct comedi_insn * insn, unsigned int * data) | 708 | struct comedi_insn *insn, unsigned int *data) |
709 | { | 709 | { |
710 | int i; | 710 | int i; |
711 | unsigned int chan; | 711 | unsigned int chan; |
@@ -718,7 +718,7 @@ static int dt3k_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice | |||
718 | return i; | 718 | return i; |
719 | } | 719 | } |
720 | 720 | ||
721 | static void dt3k_dio_config(struct comedi_device * dev, int bits) | 721 | static void dt3k_dio_config(struct comedi_device *dev, int bits) |
722 | { | 722 | { |
723 | /* XXX */ | 723 | /* XXX */ |
724 | writew(SUBS_DOUT, devpriv->io_addr + DPR_SubSys); | 724 | writew(SUBS_DOUT, devpriv->io_addr + DPR_SubSys); |
@@ -733,8 +733,8 @@ static void dt3k_dio_config(struct comedi_device * dev, int bits) | |||
733 | dt3k_send_cmd(dev, CMD_CONFIG); | 733 | dt3k_send_cmd(dev, CMD_CONFIG); |
734 | } | 734 | } |
735 | 735 | ||
736 | static int dt3k_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 736 | static int dt3k_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
737 | struct comedi_insn * insn, unsigned int * data) | 737 | struct comedi_insn *insn, unsigned int *data) |
738 | { | 738 | { |
739 | int mask; | 739 | int mask; |
740 | 740 | ||
@@ -764,8 +764,8 @@ static int dt3k_dio_insn_config(struct comedi_device * dev, struct comedi_subdev | |||
764 | return insn->n; | 764 | return insn->n; |
765 | } | 765 | } |
766 | 766 | ||
767 | static int dt3k_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 767 | static int dt3k_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
768 | struct comedi_insn * insn, unsigned int * data) | 768 | struct comedi_insn *insn, unsigned int *data) |
769 | { | 769 | { |
770 | if (insn->n != 2) | 770 | if (insn->n != 2) |
771 | return -EINVAL; | 771 | return -EINVAL; |
@@ -780,8 +780,8 @@ static int dt3k_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevic | |||
780 | return 2; | 780 | return 2; |
781 | } | 781 | } |
782 | 782 | ||
783 | static int dt3k_mem_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 783 | static int dt3k_mem_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
784 | struct comedi_insn * insn, unsigned int * data) | 784 | struct comedi_insn *insn, unsigned int *data) |
785 | { | 785 | { |
786 | unsigned int addr = CR_CHAN(insn->chanspec); | 786 | unsigned int addr = CR_CHAN(insn->chanspec); |
787 | int i; | 787 | int i; |
@@ -799,9 +799,9 @@ static int dt3k_mem_insn_read(struct comedi_device * dev, struct comedi_subdevic | |||
799 | return i; | 799 | return i; |
800 | } | 800 | } |
801 | 801 | ||
802 | static int dt_pci_probe(struct comedi_device * dev, int bus, int slot); | 802 | static int dt_pci_probe(struct comedi_device *dev, int bus, int slot); |
803 | 803 | ||
804 | static int dt3000_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 804 | static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
805 | { | 805 | { |
806 | struct comedi_subdevice *s; | 806 | struct comedi_subdevice *s; |
807 | int bus, slot; | 807 | int bus, slot; |
@@ -890,7 +890,7 @@ static int dt3000_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
890 | return 0; | 890 | return 0; |
891 | } | 891 | } |
892 | 892 | ||
893 | static int dt3000_detach(struct comedi_device * dev) | 893 | static int dt3000_detach(struct comedi_device *dev) |
894 | { | 894 | { |
895 | if (dev->irq) | 895 | if (dev->irq) |
896 | comedi_free_irq(dev->irq, dev); | 896 | comedi_free_irq(dev->irq, dev); |
@@ -911,9 +911,9 @@ static int dt3000_detach(struct comedi_device * dev) | |||
911 | } | 911 | } |
912 | 912 | ||
913 | static struct pci_dev *dt_pci_find_device(struct pci_dev *from, int *board); | 913 | static struct pci_dev *dt_pci_find_device(struct pci_dev *from, int *board); |
914 | static int setup_pci(struct comedi_device * dev); | 914 | static int setup_pci(struct comedi_device *dev); |
915 | 915 | ||
916 | static int dt_pci_probe(struct comedi_device * dev, int bus, int slot) | 916 | static int dt_pci_probe(struct comedi_device *dev, int bus, int slot) |
917 | { | 917 | { |
918 | int board; | 918 | int board; |
919 | int ret; | 919 | int ret; |
@@ -941,7 +941,7 @@ static int dt_pci_probe(struct comedi_device * dev, int bus, int slot) | |||
941 | return 1; | 941 | return 1; |
942 | } | 942 | } |
943 | 943 | ||
944 | static int setup_pci(struct comedi_device * dev) | 944 | static int setup_pci(struct comedi_device *dev) |
945 | { | 945 | { |
946 | resource_size_t addr; | 946 | resource_size_t addr; |
947 | int ret; | 947 | int ret; |
diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c index 6d7bb37d2b1..5a9a254997a 100644 --- a/drivers/staging/comedi/drivers/fl512.c +++ b/drivers/staging/comedi/drivers/fl512.c | |||
@@ -42,8 +42,8 @@ static const struct comedi_lrange range_fl512 = { 4, { | |||
42 | } | 42 | } |
43 | }; | 43 | }; |
44 | 44 | ||
45 | static int fl512_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 45 | static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
46 | static int fl512_detach(struct comedi_device * dev); | 46 | static int fl512_detach(struct comedi_device *dev); |
47 | 47 | ||
48 | static struct comedi_driver driver_fl512 = { | 48 | static struct comedi_driver driver_fl512 = { |
49 | driver_name:"fl512", | 49 | driver_name:"fl512", |
@@ -54,18 +54,18 @@ static struct comedi_driver driver_fl512 = { | |||
54 | 54 | ||
55 | COMEDI_INITCLEANUP(driver_fl512); | 55 | COMEDI_INITCLEANUP(driver_fl512); |
56 | 56 | ||
57 | static int fl512_ai_insn(struct comedi_device * dev, | 57 | static int fl512_ai_insn(struct comedi_device *dev, |
58 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 58 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); |
59 | static int fl512_ao_insn(struct comedi_device * dev, | 59 | static int fl512_ao_insn(struct comedi_device *dev, |
60 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 60 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); |
61 | static int fl512_ao_insn_readback(struct comedi_device * dev, | 61 | static int fl512_ao_insn_readback(struct comedi_device *dev, |
62 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 62 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); |
63 | 63 | ||
64 | /* | 64 | /* |
65 | * fl512_ai_insn : this is the analog input function | 65 | * fl512_ai_insn : this is the analog input function |
66 | */ | 66 | */ |
67 | static int fl512_ai_insn(struct comedi_device * dev, | 67 | static int fl512_ai_insn(struct comedi_device *dev, |
68 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 68 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
69 | { | 69 | { |
70 | int n; | 70 | int n; |
71 | unsigned int lo_byte, hi_byte; | 71 | unsigned int lo_byte, hi_byte; |
@@ -89,8 +89,8 @@ static int fl512_ai_insn(struct comedi_device * dev, | |||
89 | /* | 89 | /* |
90 | * fl512_ao_insn : used to write to a DA port n times | 90 | * fl512_ao_insn : used to write to a DA port n times |
91 | */ | 91 | */ |
92 | static int fl512_ao_insn(struct comedi_device * dev, | 92 | static int fl512_ao_insn(struct comedi_device *dev, |
93 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 93 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
94 | { | 94 | { |
95 | int n; | 95 | int n; |
96 | int chan = CR_CHAN(insn->chanspec); /* get chan to write */ | 96 | int chan = CR_CHAN(insn->chanspec); /* get chan to write */ |
@@ -110,8 +110,8 @@ static int fl512_ao_insn(struct comedi_device * dev, | |||
110 | * fl512_ao_insn_readback : used to read previous values written to | 110 | * fl512_ao_insn_readback : used to read previous values written to |
111 | * DA port | 111 | * DA port |
112 | */ | 112 | */ |
113 | static int fl512_ao_insn_readback(struct comedi_device * dev, | 113 | static int fl512_ao_insn_readback(struct comedi_device *dev, |
114 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 114 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
115 | { | 115 | { |
116 | int n; | 116 | int n; |
117 | int chan = CR_CHAN(insn->chanspec); | 117 | int chan = CR_CHAN(insn->chanspec); |
@@ -126,7 +126,7 @@ static int fl512_ao_insn_readback(struct comedi_device * dev, | |||
126 | /* | 126 | /* |
127 | * start attach | 127 | * start attach |
128 | */ | 128 | */ |
129 | static int fl512_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 129 | static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
130 | { | 130 | { |
131 | unsigned long iobase; | 131 | unsigned long iobase; |
132 | struct comedi_subdevice *s; /* pointer to the subdevice: | 132 | struct comedi_subdevice *s; /* pointer to the subdevice: |
@@ -177,7 +177,7 @@ static int fl512_attach(struct comedi_device * dev, struct comedi_devconfig * it | |||
177 | return 1; | 177 | return 1; |
178 | } | 178 | } |
179 | 179 | ||
180 | static int fl512_detach(struct comedi_device * dev) | 180 | static int fl512_detach(struct comedi_device *dev) |
181 | { | 181 | { |
182 | if (dev->iobase) | 182 | if (dev->iobase) |
183 | release_region(dev->iobase, FL512_SIZE); | 183 | release_region(dev->iobase, FL512_SIZE); |
diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c index cd5772f90aa..48491c09e7f 100644 --- a/drivers/staging/comedi/drivers/gsc_hpdi.c +++ b/drivers/staging/comedi/drivers/gsc_hpdi.c | |||
@@ -340,8 +340,8 @@ static struct comedi_driver driver_hpdi = { | |||
340 | 340 | ||
341 | COMEDI_PCI_INITCLEANUP(driver_hpdi, hpdi_pci_table); | 341 | COMEDI_PCI_INITCLEANUP(driver_hpdi, hpdi_pci_table); |
342 | 342 | ||
343 | static int dio_config_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 343 | static int dio_config_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
344 | struct comedi_insn * insn, unsigned int * data) | 344 | struct comedi_insn *insn, unsigned int *data) |
345 | { | 345 | { |
346 | switch (data[0]) { | 346 | switch (data[0]) { |
347 | case INSN_CONFIG_DIO_OUTPUT: | 347 | case INSN_CONFIG_DIO_OUTPUT: |
@@ -368,13 +368,13 @@ static int dio_config_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
368 | return -EINVAL; | 368 | return -EINVAL; |
369 | } | 369 | } |
370 | 370 | ||
371 | static void disable_plx_interrupts(struct comedi_device * dev) | 371 | static void disable_plx_interrupts(struct comedi_device *dev) |
372 | { | 372 | { |
373 | writel(0, priv(dev)->plx9080_iobase + PLX_INTRCS_REG); | 373 | writel(0, priv(dev)->plx9080_iobase + PLX_INTRCS_REG); |
374 | } | 374 | } |
375 | 375 | ||
376 | /* initialize plx9080 chip */ | 376 | /* initialize plx9080 chip */ |
377 | static void init_plx9080(struct comedi_device * dev) | 377 | static void init_plx9080(struct comedi_device *dev) |
378 | { | 378 | { |
379 | uint32_t bits; | 379 | uint32_t bits; |
380 | void *plx_iobase = priv(dev)->plx9080_iobase; | 380 | void *plx_iobase = priv(dev)->plx9080_iobase; |
@@ -439,7 +439,7 @@ static void init_plx9080(struct comedi_device * dev) | |||
439 | 439 | ||
440 | /* Allocate and initialize the subdevice structures. | 440 | /* Allocate and initialize the subdevice structures. |
441 | */ | 441 | */ |
442 | static int setup_subdevices(struct comedi_device * dev) | 442 | static int setup_subdevices(struct comedi_device *dev) |
443 | { | 443 | { |
444 | struct comedi_subdevice *s; | 444 | struct comedi_subdevice *s; |
445 | 445 | ||
@@ -465,7 +465,7 @@ static int setup_subdevices(struct comedi_device * dev) | |||
465 | return 0; | 465 | return 0; |
466 | } | 466 | } |
467 | 467 | ||
468 | static int init_hpdi(struct comedi_device * dev) | 468 | static int init_hpdi(struct comedi_device *dev) |
469 | { | 469 | { |
470 | uint32_t plx_intcsr_bits; | 470 | uint32_t plx_intcsr_bits; |
471 | 471 | ||
@@ -494,7 +494,7 @@ static int init_hpdi(struct comedi_device * dev) | |||
494 | } | 494 | } |
495 | 495 | ||
496 | /* setup dma descriptors so a link completes every 'transfer_size' bytes */ | 496 | /* setup dma descriptors so a link completes every 'transfer_size' bytes */ |
497 | static int setup_dma_descriptors(struct comedi_device * dev, | 497 | static int setup_dma_descriptors(struct comedi_device *dev, |
498 | unsigned int transfer_size) | 498 | unsigned int transfer_size) |
499 | { | 499 | { |
500 | unsigned int buffer_index, buffer_offset; | 500 | unsigned int buffer_index, buffer_offset; |
@@ -556,7 +556,7 @@ static int setup_dma_descriptors(struct comedi_device * dev, | |||
556 | return transfer_size; | 556 | return transfer_size; |
557 | } | 557 | } |
558 | 558 | ||
559 | static int hpdi_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 559 | static int hpdi_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
560 | { | 560 | { |
561 | struct pci_dev *pcidev; | 561 | struct pci_dev *pcidev; |
562 | int i; | 562 | int i; |
@@ -665,7 +665,7 @@ static int hpdi_attach(struct comedi_device * dev, struct comedi_devconfig * it) | |||
665 | return init_hpdi(dev); | 665 | return init_hpdi(dev); |
666 | } | 666 | } |
667 | 667 | ||
668 | static int hpdi_detach(struct comedi_device * dev) | 668 | static int hpdi_detach(struct comedi_device *dev) |
669 | { | 669 | { |
670 | unsigned int i; | 670 | unsigned int i; |
671 | 671 | ||
@@ -706,7 +706,7 @@ static int hpdi_detach(struct comedi_device * dev) | |||
706 | return 0; | 706 | return 0; |
707 | } | 707 | } |
708 | 708 | ||
709 | static int dio_config_block_size(struct comedi_device * dev, unsigned int * data) | 709 | static int dio_config_block_size(struct comedi_device *dev, unsigned int *data) |
710 | { | 710 | { |
711 | unsigned int requested_block_size; | 711 | unsigned int requested_block_size; |
712 | int retval; | 712 | int retval; |
@@ -722,8 +722,8 @@ static int dio_config_block_size(struct comedi_device * dev, unsigned int * data | |||
722 | return 2; | 722 | return 2; |
723 | } | 723 | } |
724 | 724 | ||
725 | static int di_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s, | 725 | static int di_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s, |
726 | struct comedi_cmd * cmd) | 726 | struct comedi_cmd *cmd) |
727 | { | 727 | { |
728 | int err = 0; | 728 | int err = 0; |
729 | int tmp; | 729 | int tmp; |
@@ -822,8 +822,8 @@ static int di_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s, | |||
822 | return 0; | 822 | return 0; |
823 | } | 823 | } |
824 | 824 | ||
825 | static int hpdi_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s, | 825 | static int hpdi_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s, |
826 | struct comedi_cmd * cmd) | 826 | struct comedi_cmd *cmd) |
827 | { | 827 | { |
828 | if (priv(dev)->dio_config_output) { | 828 | if (priv(dev)->dio_config_output) { |
829 | return -EINVAL; | 829 | return -EINVAL; |
@@ -831,14 +831,14 @@ static int hpdi_cmd_test(struct comedi_device * dev, struct comedi_subdevice * s | |||
831 | return di_cmd_test(dev, s, cmd); | 831 | return di_cmd_test(dev, s, cmd); |
832 | } | 832 | } |
833 | 833 | ||
834 | static inline void hpdi_writel(struct comedi_device * dev, uint32_t bits, | 834 | static inline void hpdi_writel(struct comedi_device *dev, uint32_t bits, |
835 | unsigned int offset) | 835 | unsigned int offset) |
836 | { | 836 | { |
837 | writel(bits | priv(dev)->bits[offset / sizeof(uint32_t)], | 837 | writel(bits | priv(dev)->bits[offset / sizeof(uint32_t)], |
838 | priv(dev)->hpdi_iobase + offset); | 838 | priv(dev)->hpdi_iobase + offset); |
839 | } | 839 | } |
840 | 840 | ||
841 | static int di_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 841 | static int di_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
842 | { | 842 | { |
843 | uint32_t bits; | 843 | uint32_t bits; |
844 | unsigned long flags; | 844 | unsigned long flags; |
@@ -891,7 +891,7 @@ static int di_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
891 | return 0; | 891 | return 0; |
892 | } | 892 | } |
893 | 893 | ||
894 | static int hpdi_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 894 | static int hpdi_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
895 | { | 895 | { |
896 | if (priv(dev)->dio_config_output) { | 896 | if (priv(dev)->dio_config_output) { |
897 | return -EINVAL; | 897 | return -EINVAL; |
@@ -899,7 +899,7 @@ static int hpdi_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
899 | return di_cmd(dev, s); | 899 | return di_cmd(dev, s); |
900 | } | 900 | } |
901 | 901 | ||
902 | static void drain_dma_buffers(struct comedi_device * dev, unsigned int channel) | 902 | static void drain_dma_buffers(struct comedi_device *dev, unsigned int channel) |
903 | { | 903 | { |
904 | struct comedi_async *async = dev->read_subdev->async; | 904 | struct comedi_async *async = dev->read_subdev->async; |
905 | uint32_t next_transfer_addr; | 905 | uint32_t next_transfer_addr; |
@@ -1036,7 +1036,7 @@ static irqreturn_t handle_interrupt(int irq, void *d) | |||
1036 | return IRQ_HANDLED; | 1036 | return IRQ_HANDLED; |
1037 | } | 1037 | } |
1038 | 1038 | ||
1039 | void abort_dma(struct comedi_device * dev, unsigned int channel) | 1039 | void abort_dma(struct comedi_device *dev, unsigned int channel) |
1040 | { | 1040 | { |
1041 | unsigned long flags; | 1041 | unsigned long flags; |
1042 | 1042 | ||
@@ -1048,7 +1048,7 @@ void abort_dma(struct comedi_device * dev, unsigned int channel) | |||
1048 | comedi_spin_unlock_irqrestore(&dev->spinlock, flags); | 1048 | comedi_spin_unlock_irqrestore(&dev->spinlock, flags); |
1049 | } | 1049 | } |
1050 | 1050 | ||
1051 | static int hpdi_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 1051 | static int hpdi_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
1052 | { | 1052 | { |
1053 | hpdi_writel(dev, 0, BOARD_CONTROL_REG); | 1053 | hpdi_writel(dev, 0, BOARD_CONTROL_REG); |
1054 | 1054 | ||
diff --git a/drivers/staging/comedi/drivers/ii_pci20kc.c b/drivers/staging/comedi/drivers/ii_pci20kc.c index 80825ba2541..fd8eb85ddbe 100644 --- a/drivers/staging/comedi/drivers/ii_pci20kc.c +++ b/drivers/staging/comedi/drivers/ii_pci20kc.c | |||
@@ -158,8 +158,8 @@ struct pci20xxx_private { | |||
158 | #define devpriv ((struct pci20xxx_private *)dev->private) | 158 | #define devpriv ((struct pci20xxx_private *)dev->private) |
159 | #define CHAN (CR_CHAN(it->chanlist[0])) | 159 | #define CHAN (CR_CHAN(it->chanlist[0])) |
160 | 160 | ||
161 | static int pci20xxx_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 161 | static int pci20xxx_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
162 | static int pci20xxx_detach(struct comedi_device * dev); | 162 | static int pci20xxx_detach(struct comedi_device *dev); |
163 | 163 | ||
164 | static struct comedi_driver driver_pci20xxx = { | 164 | static struct comedi_driver driver_pci20xxx = { |
165 | driver_name:"ii_pci20kc", | 165 | driver_name:"ii_pci20kc", |
@@ -168,11 +168,11 @@ static struct comedi_driver driver_pci20xxx = { | |||
168 | detach:pci20xxx_detach, | 168 | detach:pci20xxx_detach, |
169 | }; | 169 | }; |
170 | 170 | ||
171 | static int pci20006_init(struct comedi_device * dev, struct comedi_subdevice * s, | 171 | static int pci20006_init(struct comedi_device *dev, struct comedi_subdevice *s, |
172 | int opt0, int opt1); | 172 | int opt0, int opt1); |
173 | static int pci20341_init(struct comedi_device * dev, struct comedi_subdevice * s, | 173 | static int pci20341_init(struct comedi_device *dev, struct comedi_subdevice *s, |
174 | int opt0, int opt1); | 174 | int opt0, int opt1); |
175 | static int pci20xxx_dio_init(struct comedi_device * dev, struct comedi_subdevice * s); | 175 | static int pci20xxx_dio_init(struct comedi_device *dev, struct comedi_subdevice *s); |
176 | 176 | ||
177 | /* | 177 | /* |
178 | options[0] Board base address | 178 | options[0] Board base address |
@@ -201,7 +201,7 @@ static int pci20xxx_dio_init(struct comedi_device * dev, struct comedi_subdevice | |||
201 | 1 == unipolar 10V (0V -- +10V) | 201 | 1 == unipolar 10V (0V -- +10V) |
202 | 2 == bipolar 5V (-5V -- +5V) | 202 | 2 == bipolar 5V (-5V -- +5V) |
203 | */ | 203 | */ |
204 | static int pci20xxx_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 204 | static int pci20xxx_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
205 | { | 205 | { |
206 | unsigned char i; | 206 | unsigned char i; |
207 | int ret; | 207 | int ret; |
@@ -263,7 +263,7 @@ static int pci20xxx_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
263 | return 1; | 263 | return 1; |
264 | } | 264 | } |
265 | 265 | ||
266 | static int pci20xxx_detach(struct comedi_device * dev) | 266 | static int pci20xxx_detach(struct comedi_device *dev) |
267 | { | 267 | { |
268 | printk("comedi%d: pci20xxx: remove\n", dev->minor); | 268 | printk("comedi%d: pci20xxx: remove\n", dev->minor); |
269 | 269 | ||
@@ -272,10 +272,10 @@ static int pci20xxx_detach(struct comedi_device * dev) | |||
272 | 272 | ||
273 | /* pci20006m */ | 273 | /* pci20006m */ |
274 | 274 | ||
275 | static int pci20006_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 275 | static int pci20006_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
276 | struct comedi_insn * insn, unsigned int * data); | 276 | struct comedi_insn *insn, unsigned int *data); |
277 | static int pci20006_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 277 | static int pci20006_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
278 | struct comedi_insn * insn, unsigned int * data); | 278 | struct comedi_insn *insn, unsigned int *data); |
279 | 279 | ||
280 | static const struct comedi_lrange *pci20006_range_list[] = { | 280 | static const struct comedi_lrange *pci20006_range_list[] = { |
281 | &range_bipolar10, | 281 | &range_bipolar10, |
@@ -283,7 +283,7 @@ static const struct comedi_lrange *pci20006_range_list[] = { | |||
283 | &range_bipolar5, | 283 | &range_bipolar5, |
284 | }; | 284 | }; |
285 | 285 | ||
286 | static int pci20006_init(struct comedi_device * dev, struct comedi_subdevice * s, | 286 | static int pci20006_init(struct comedi_device *dev, struct comedi_subdevice *s, |
287 | int opt0, int opt1) | 287 | int opt0, int opt1) |
288 | { | 288 | { |
289 | union pci20xxx_subdev_private *sdp = s->private; | 289 | union pci20xxx_subdev_private *sdp = s->private; |
@@ -308,8 +308,8 @@ static int pci20006_init(struct comedi_device * dev, struct comedi_subdevice * s | |||
308 | return 0; | 308 | return 0; |
309 | } | 309 | } |
310 | 310 | ||
311 | static int pci20006_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 311 | static int pci20006_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
312 | struct comedi_insn * insn, unsigned int * data) | 312 | struct comedi_insn *insn, unsigned int *data) |
313 | { | 313 | { |
314 | union pci20xxx_subdev_private *sdp = s->private; | 314 | union pci20xxx_subdev_private *sdp = s->private; |
315 | 315 | ||
@@ -318,8 +318,8 @@ static int pci20006_insn_read(struct comedi_device * dev, struct comedi_subdevic | |||
318 | return 1; | 318 | return 1; |
319 | } | 319 | } |
320 | 320 | ||
321 | static int pci20006_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 321 | static int pci20006_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
322 | struct comedi_insn * insn, unsigned int * data) | 322 | struct comedi_insn *insn, unsigned int *data) |
323 | { | 323 | { |
324 | union pci20xxx_subdev_private *sdp = s->private; | 324 | union pci20xxx_subdev_private *sdp = s->private; |
325 | int hi, lo; | 325 | int hi, lo; |
@@ -351,8 +351,8 @@ static int pci20006_insn_write(struct comedi_device * dev, struct comedi_subdevi | |||
351 | 351 | ||
352 | /* PCI20341M */ | 352 | /* PCI20341M */ |
353 | 353 | ||
354 | static int pci20341_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 354 | static int pci20341_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
355 | struct comedi_insn * insn, unsigned int * data); | 355 | struct comedi_insn *insn, unsigned int *data); |
356 | 356 | ||
357 | static const int pci20341_timebase[] = { 0x00, 0x00, 0x00, 0x04 }; | 357 | static const int pci20341_timebase[] = { 0x00, 0x00, 0x00, 0x04 }; |
358 | static const int pci20341_settling_time[] = { 0x58, 0x58, 0x93, 0x99 }; | 358 | static const int pci20341_settling_time[] = { 0x58, 0x58, 0x93, 0x99 }; |
@@ -368,7 +368,7 @@ static const struct comedi_lrange *const pci20341_ranges[] = { | |||
368 | &range_bipolar0_025, | 368 | &range_bipolar0_025, |
369 | }; | 369 | }; |
370 | 370 | ||
371 | static int pci20341_init(struct comedi_device * dev, struct comedi_subdevice * s, | 371 | static int pci20341_init(struct comedi_device *dev, struct comedi_subdevice *s, |
372 | int opt0, int opt1) | 372 | int opt0, int opt1) |
373 | { | 373 | { |
374 | union pci20xxx_subdev_private *sdp = s->private; | 374 | union pci20xxx_subdev_private *sdp = s->private; |
@@ -399,8 +399,8 @@ static int pci20341_init(struct comedi_device * dev, struct comedi_subdevice * s | |||
399 | return 0; | 399 | return 0; |
400 | } | 400 | } |
401 | 401 | ||
402 | static int pci20341_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 402 | static int pci20341_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
403 | struct comedi_insn * insn, unsigned int * data) | 403 | struct comedi_insn *insn, unsigned int *data) |
404 | { | 404 | { |
405 | union pci20xxx_subdev_private *sdp = s->private; | 405 | union pci20xxx_subdev_private *sdp = s->private; |
406 | unsigned int i = 0, j = 0; | 406 | unsigned int i = 0, j = 0; |
@@ -445,14 +445,14 @@ static int pci20341_insn_read(struct comedi_device * dev, struct comedi_subdevic | |||
445 | 445 | ||
446 | /* native DIO */ | 446 | /* native DIO */ |
447 | 447 | ||
448 | static void pci20xxx_dio_config(struct comedi_device * dev, struct comedi_subdevice * s); | 448 | static void pci20xxx_dio_config(struct comedi_device *dev, struct comedi_subdevice *s); |
449 | static int pci20xxx_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 449 | static int pci20xxx_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
450 | struct comedi_insn * insn, unsigned int * data); | 450 | struct comedi_insn *insn, unsigned int *data); |
451 | static int pci20xxx_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 451 | static int pci20xxx_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
452 | struct comedi_insn * insn, unsigned int * data); | 452 | struct comedi_insn *insn, unsigned int *data); |
453 | 453 | ||
454 | /* initialize struct pci20xxx_private */ | 454 | /* initialize struct pci20xxx_private */ |
455 | static int pci20xxx_dio_init(struct comedi_device * dev, struct comedi_subdevice * s) | 455 | static int pci20xxx_dio_init(struct comedi_device *dev, struct comedi_subdevice *s) |
456 | { | 456 | { |
457 | 457 | ||
458 | s->type = COMEDI_SUBD_DIO; | 458 | s->type = COMEDI_SUBD_DIO; |
@@ -471,8 +471,8 @@ static int pci20xxx_dio_init(struct comedi_device * dev, struct comedi_subdevice | |||
471 | return 0; | 471 | return 0; |
472 | } | 472 | } |
473 | 473 | ||
474 | static int pci20xxx_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 474 | static int pci20xxx_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
475 | struct comedi_insn * insn, unsigned int * data) | 475 | struct comedi_insn *insn, unsigned int *data) |
476 | { | 476 | { |
477 | int mask, bits; | 477 | int mask, bits; |
478 | 478 | ||
@@ -496,8 +496,8 @@ static int pci20xxx_dio_insn_config(struct comedi_device * dev, struct comedi_su | |||
496 | return 1; | 496 | return 1; |
497 | } | 497 | } |
498 | 498 | ||
499 | static int pci20xxx_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 499 | static int pci20xxx_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
500 | struct comedi_insn * insn, unsigned int * data) | 500 | struct comedi_insn *insn, unsigned int *data) |
501 | { | 501 | { |
502 | unsigned int mask = data[0]; | 502 | unsigned int mask = data[0]; |
503 | 503 | ||
@@ -526,7 +526,7 @@ static int pci20xxx_dio_insn_bits(struct comedi_device * dev, struct comedi_subd | |||
526 | return 2; | 526 | return 2; |
527 | } | 527 | } |
528 | 528 | ||
529 | static void pci20xxx_dio_config(struct comedi_device * dev, struct comedi_subdevice * s) | 529 | static void pci20xxx_dio_config(struct comedi_device *dev, struct comedi_subdevice *s) |
530 | { | 530 | { |
531 | unsigned char control_01; | 531 | unsigned char control_01; |
532 | unsigned char control_23; | 532 | unsigned char control_23; |
@@ -582,7 +582,7 @@ static void pci20xxx_dio_config(struct comedi_device * dev, struct comedi_subdev | |||
582 | } | 582 | } |
583 | 583 | ||
584 | #if 0 | 584 | #if 0 |
585 | static void pci20xxx_do(struct comedi_device * dev, struct comedi_subdevice * s) | 585 | static void pci20xxx_do(struct comedi_device *dev, struct comedi_subdevice *s) |
586 | { | 586 | { |
587 | /* XXX if the channel is configured for input, does this | 587 | /* XXX if the channel is configured for input, does this |
588 | do bad things? */ | 588 | do bad things? */ |
@@ -595,7 +595,7 @@ static void pci20xxx_do(struct comedi_device * dev, struct comedi_subdevice * s) | |||
595 | writeb((s->state >> 24) & 0xff, devpriv->ioaddr + PCI20000_DIO_3); | 595 | writeb((s->state >> 24) & 0xff, devpriv->ioaddr + PCI20000_DIO_3); |
596 | } | 596 | } |
597 | 597 | ||
598 | static unsigned int pci20xxx_di(struct comedi_device * dev, struct comedi_subdevice * s) | 598 | static unsigned int pci20xxx_di(struct comedi_device *dev, struct comedi_subdevice *s) |
599 | { | 599 | { |
600 | /* XXX same note as above */ | 600 | /* XXX same note as above */ |
601 | unsigned int bits; | 601 | unsigned int bits; |
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c index c360492159b..8a943347231 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.c +++ b/drivers/staging/comedi/drivers/jr3_pci.c | |||
@@ -54,8 +54,8 @@ Devices: [JR3] PCI force sensor board (jr3_pci) | |||
54 | #define PCI_DEVICE_ID_JR3_3_CHANNEL 0x3113 | 54 | #define PCI_DEVICE_ID_JR3_3_CHANNEL 0x3113 |
55 | #define PCI_DEVICE_ID_JR3_4_CHANNEL 0x3114 | 55 | #define PCI_DEVICE_ID_JR3_4_CHANNEL 0x3114 |
56 | 56 | ||
57 | static int jr3_pci_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 57 | static int jr3_pci_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
58 | static int jr3_pci_detach(struct comedi_device * dev); | 58 | static int jr3_pci_detach(struct comedi_device *dev); |
59 | 59 | ||
60 | static struct comedi_driver driver_jr3_pci = { | 60 | static struct comedi_driver driver_jr3_pci = { |
61 | driver_name:"jr3_pci", | 61 | driver_name:"jr3_pci", |
@@ -259,8 +259,8 @@ static struct six_axis_t get_max_full_scales(volatile struct jr3_channel *channe | |||
259 | return result; | 259 | return result; |
260 | } | 260 | } |
261 | 261 | ||
262 | static int jr3_pci_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 262 | static int jr3_pci_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
263 | struct comedi_insn * insn, unsigned int * data) | 263 | struct comedi_insn *insn, unsigned int *data) |
264 | { | 264 | { |
265 | int result; | 265 | int result; |
266 | struct jr3_pci_subdev_private *p; | 266 | struct jr3_pci_subdev_private *p; |
@@ -375,7 +375,7 @@ static int jr3_pci_ai_insn_read(struct comedi_device * dev, struct comedi_subdev | |||
375 | return result; | 375 | return result; |
376 | } | 376 | } |
377 | 377 | ||
378 | static void jr3_pci_open(struct comedi_device * dev) | 378 | static void jr3_pci_open(struct comedi_device *dev) |
379 | { | 379 | { |
380 | int i; | 380 | int i; |
381 | struct jr3_pci_dev_private *devpriv = dev->private; | 381 | struct jr3_pci_dev_private *devpriv = dev->private; |
@@ -392,7 +392,7 @@ static void jr3_pci_open(struct comedi_device * dev) | |||
392 | } | 392 | } |
393 | } | 393 | } |
394 | 394 | ||
395 | int read_idm_word(const u8 * data, size_t size, int *pos, unsigned int *val) | 395 | int read_idm_word(const u8 *data, size_t size, int *pos, unsigned int *val) |
396 | { | 396 | { |
397 | int result = 0; | 397 | int result = 0; |
398 | if (pos != 0 && val != 0) { | 398 | if (pos != 0 && val != 0) { |
@@ -414,7 +414,7 @@ int read_idm_word(const u8 * data, size_t size, int *pos, unsigned int *val) | |||
414 | return result; | 414 | return result; |
415 | } | 415 | } |
416 | 416 | ||
417 | static int jr3_download_firmware(struct comedi_device * dev, const u8 * data, | 417 | static int jr3_download_firmware(struct comedi_device *dev, const u8 *data, |
418 | size_t size) | 418 | size_t size) |
419 | { | 419 | { |
420 | /* | 420 | /* |
@@ -513,7 +513,7 @@ static int jr3_download_firmware(struct comedi_device * dev, const u8 * data, | |||
513 | return result; | 513 | return result; |
514 | } | 514 | } |
515 | 515 | ||
516 | static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice * s) | 516 | static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s) |
517 | { | 517 | { |
518 | struct poll_delay_t result = poll_delay_min_max(1000, 2000); | 518 | struct poll_delay_t result = poll_delay_min_max(1000, 2000); |
519 | struct jr3_pci_subdev_private *p = s->private; | 519 | struct jr3_pci_subdev_private *p = s->private; |
@@ -763,7 +763,7 @@ static void jr3_pci_poll_dev(unsigned long data) | |||
763 | add_timer(&devpriv->timer); | 763 | add_timer(&devpriv->timer); |
764 | } | 764 | } |
765 | 765 | ||
766 | static int jr3_pci_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 766 | static int jr3_pci_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
767 | { | 767 | { |
768 | int result = 0; | 768 | int result = 0; |
769 | struct pci_dev *card = NULL; | 769 | struct pci_dev *card = NULL; |
@@ -938,7 +938,7 @@ static int jr3_pci_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
938 | return result; | 938 | return result; |
939 | } | 939 | } |
940 | 940 | ||
941 | static int jr3_pci_detach(struct comedi_device * dev) | 941 | static int jr3_pci_detach(struct comedi_device *dev) |
942 | { | 942 | { |
943 | int i; | 943 | int i; |
944 | struct jr3_pci_dev_private *devpriv = dev->private; | 944 | struct jr3_pci_dev_private *devpriv = dev->private; |
diff --git a/drivers/staging/comedi/drivers/jr3_pci.h b/drivers/staging/comedi/drivers/jr3_pci.h index 3585f2941bc..4f4bfb24c6d 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.h +++ b/drivers/staging/comedi/drivers/jr3_pci.h | |||
@@ -2,22 +2,22 @@ | |||
2 | * is 16 bits, but aligned on a 32 bit PCI boundary | 2 | * is 16 bits, but aligned on a 32 bit PCI boundary |
3 | */ | 3 | */ |
4 | 4 | ||
5 | static inline u16 get_u16(volatile const u32 * p) | 5 | static inline u16 get_u16(volatile const u32 *p) |
6 | { | 6 | { |
7 | return (u16) readl(p); | 7 | return (u16) readl(p); |
8 | } | 8 | } |
9 | 9 | ||
10 | static inline void set_u16(volatile u32 * p, u16 val) | 10 | static inline void set_u16(volatile u32 *p, u16 val) |
11 | { | 11 | { |
12 | writel(val, p); | 12 | writel(val, p); |
13 | } | 13 | } |
14 | 14 | ||
15 | static inline s16 get_s16(volatile const s32 * p) | 15 | static inline s16 get_s16(volatile const s32 *p) |
16 | { | 16 | { |
17 | return (s16) readl(p); | 17 | return (s16) readl(p); |
18 | } | 18 | } |
19 | 19 | ||
20 | static inline void set_s16(volatile s32 * p, s16 val) | 20 | static inline void set_s16(volatile s32 *p, s16 val) |
21 | { | 21 | { |
22 | writel(val, p); | 22 | writel(val, p); |
23 | } | 23 | } |
diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c index e7284576706..cff8ea71e28 100644 --- a/drivers/staging/comedi/drivers/ke_counter.c +++ b/drivers/staging/comedi/drivers/ke_counter.c | |||
@@ -48,8 +48,8 @@ Kolter Electronic PCI Counter Card. | |||
48 | 48 | ||
49 | /*-- function prototypes ----------------------------------------------------*/ | 49 | /*-- function prototypes ----------------------------------------------------*/ |
50 | 50 | ||
51 | static int cnt_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 51 | static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
52 | static int cnt_detach(struct comedi_device * dev); | 52 | static int cnt_detach(struct comedi_device *dev); |
53 | 53 | ||
54 | static DEFINE_PCI_DEVICE_TABLE(cnt_pci_table) = { | 54 | static DEFINE_PCI_DEVICE_TABLE(cnt_pci_table) = { |
55 | {PCI_VENDOR_ID_KOLTER, CNT_CARD_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, | 55 | {PCI_VENDOR_ID_KOLTER, CNT_CARD_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, |
@@ -103,8 +103,8 @@ COMEDI_PCI_INITCLEANUP(cnt_driver, cnt_pci_table); | |||
103 | 103 | ||
104 | /* This should be used only for resetting the counters; maybe it is better | 104 | /* This should be used only for resetting the counters; maybe it is better |
105 | to make a special command 'reset'. */ | 105 | to make a special command 'reset'. */ |
106 | static int cnt_winsn(struct comedi_device * dev, | 106 | static int cnt_winsn(struct comedi_device *dev, |
107 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 107 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
108 | { | 108 | { |
109 | int chan = CR_CHAN(insn->chanspec); | 109 | int chan = CR_CHAN(insn->chanspec); |
110 | 110 | ||
@@ -123,8 +123,8 @@ static int cnt_winsn(struct comedi_device * dev, | |||
123 | 123 | ||
124 | /*-- counter read -----------------------------------------------------------*/ | 124 | /*-- counter read -----------------------------------------------------------*/ |
125 | 125 | ||
126 | static int cnt_rinsn(struct comedi_device * dev, | 126 | static int cnt_rinsn(struct comedi_device *dev, |
127 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 127 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
128 | { | 128 | { |
129 | unsigned char a0, a1, a2, a3, a4; | 129 | unsigned char a0, a1, a2, a3, a4; |
130 | int chan = CR_CHAN(insn->chanspec); | 130 | int chan = CR_CHAN(insn->chanspec); |
@@ -148,7 +148,7 @@ static int cnt_rinsn(struct comedi_device * dev, | |||
148 | 148 | ||
149 | /*-- attach -----------------------------------------------------------------*/ | 149 | /*-- attach -----------------------------------------------------------------*/ |
150 | 150 | ||
151 | static int cnt_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 151 | static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
152 | { | 152 | { |
153 | struct comedi_subdevice *subdevice; | 153 | struct comedi_subdevice *subdevice; |
154 | struct pci_dev *pci_device; | 154 | struct pci_dev *pci_device; |
@@ -241,7 +241,7 @@ static int cnt_attach(struct comedi_device * dev, struct comedi_devconfig * it) | |||
241 | 241 | ||
242 | /*-- detach -----------------------------------------------------------------*/ | 242 | /*-- detach -----------------------------------------------------------------*/ |
243 | 243 | ||
244 | static int cnt_detach(struct comedi_device * dev) | 244 | static int cnt_detach(struct comedi_device *dev) |
245 | { | 245 | { |
246 | if (devpriv && devpriv->pcidev) { | 246 | if (devpriv && devpriv->pcidev) { |
247 | if (dev->iobase) { | 247 | if (dev->iobase) { |
diff --git a/drivers/staging/comedi/drivers/mpc624.c b/drivers/staging/comedi/drivers/mpc624.c index c3fb504feb1..bd7cb4406e1 100644 --- a/drivers/staging/comedi/drivers/mpc624.c +++ b/drivers/staging/comedi/drivers/mpc624.c | |||
@@ -146,8 +146,8 @@ static const struct comedi_lrange range_mpc624_bipolar10 = { | |||
146 | }; | 146 | }; |
147 | 147 | ||
148 | /* ---------------------------------------------------------------------------- */ | 148 | /* ---------------------------------------------------------------------------- */ |
149 | static int mpc624_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 149 | static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
150 | static int mpc624_detach(struct comedi_device * dev); | 150 | static int mpc624_detach(struct comedi_device *dev); |
151 | /* ---------------------------------------------------------------------------- */ | 151 | /* ---------------------------------------------------------------------------- */ |
152 | static struct comedi_driver driver_mpc624 = { | 152 | static struct comedi_driver driver_mpc624 = { |
153 | driver_name:"mpc624", | 153 | driver_name:"mpc624", |
@@ -157,10 +157,10 @@ static struct comedi_driver driver_mpc624 = { | |||
157 | }; | 157 | }; |
158 | 158 | ||
159 | /* ---------------------------------------------------------------------------- */ | 159 | /* ---------------------------------------------------------------------------- */ |
160 | static int mpc624_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 160 | static int mpc624_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
161 | struct comedi_insn * insn, unsigned int * data); | 161 | struct comedi_insn *insn, unsigned int *data); |
162 | /* ---------------------------------------------------------------------------- */ | 162 | /* ---------------------------------------------------------------------------- */ |
163 | static int mpc624_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 163 | static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
164 | { | 164 | { |
165 | struct comedi_subdevice *s; | 165 | struct comedi_subdevice *s; |
166 | unsigned long iobase; | 166 | unsigned long iobase; |
@@ -257,7 +257,7 @@ static int mpc624_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
257 | return 1; | 257 | return 1; |
258 | } | 258 | } |
259 | 259 | ||
260 | static int mpc624_detach(struct comedi_device * dev) | 260 | static int mpc624_detach(struct comedi_device *dev) |
261 | { | 261 | { |
262 | rt_printk("comedi%d: mpc624: remove\n", dev->minor); | 262 | rt_printk("comedi%d: mpc624: remove\n", dev->minor); |
263 | 263 | ||
@@ -270,8 +270,8 @@ static int mpc624_detach(struct comedi_device * dev) | |||
270 | /* Timeout 200ms */ | 270 | /* Timeout 200ms */ |
271 | #define TIMEOUT 200 | 271 | #define TIMEOUT 200 |
272 | 272 | ||
273 | static int mpc624_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 273 | static int mpc624_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
274 | struct comedi_insn * insn, unsigned int * data) | 274 | struct comedi_insn *insn, unsigned int *data) |
275 | { | 275 | { |
276 | int n, i; | 276 | int n, i; |
277 | unsigned long int data_in, data_out; | 277 | unsigned long int data_in, data_out; |
diff --git a/drivers/staging/comedi/drivers/mpc8260cpm.c b/drivers/staging/comedi/drivers/mpc8260cpm.c index bac0a7bb9cb..147108f7202 100644 --- a/drivers/staging/comedi/drivers/mpc8260cpm.c +++ b/drivers/staging/comedi/drivers/mpc8260cpm.c | |||
@@ -46,8 +46,8 @@ struct mpc8260cpm_private { | |||
46 | 46 | ||
47 | #define devpriv ((struct mpc8260cpm_private *)dev->private) | 47 | #define devpriv ((struct mpc8260cpm_private *)dev->private) |
48 | 48 | ||
49 | static int mpc8260cpm_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 49 | static int mpc8260cpm_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
50 | static int mpc8260cpm_detach(struct comedi_device * dev); | 50 | static int mpc8260cpm_detach(struct comedi_device *dev); |
51 | static struct comedi_driver driver_mpc8260cpm = { | 51 | static struct comedi_driver driver_mpc8260cpm = { |
52 | driver_name:"mpc8260cpm", | 52 | driver_name:"mpc8260cpm", |
53 | module:THIS_MODULE, | 53 | module:THIS_MODULE, |
@@ -57,12 +57,12 @@ static struct comedi_driver driver_mpc8260cpm = { | |||
57 | 57 | ||
58 | COMEDI_INITCLEANUP(driver_mpc8260cpm); | 58 | COMEDI_INITCLEANUP(driver_mpc8260cpm); |
59 | 59 | ||
60 | static int mpc8260cpm_dio_config(struct comedi_device * dev, struct comedi_subdevice * s, | 60 | static int mpc8260cpm_dio_config(struct comedi_device *dev, struct comedi_subdevice *s, |
61 | struct comedi_insn * insn, unsigned int * data); | 61 | struct comedi_insn *insn, unsigned int *data); |
62 | static int mpc8260cpm_dio_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 62 | static int mpc8260cpm_dio_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
63 | struct comedi_insn * insn, unsigned int * data); | 63 | struct comedi_insn *insn, unsigned int *data); |
64 | 64 | ||
65 | static int mpc8260cpm_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 65 | static int mpc8260cpm_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
66 | { | 66 | { |
67 | struct comedi_subdevice *s; | 67 | struct comedi_subdevice *s; |
68 | int i; | 68 | int i; |
@@ -93,7 +93,7 @@ static int mpc8260cpm_attach(struct comedi_device * dev, struct comedi_devconfig | |||
93 | return 1; | 93 | return 1; |
94 | } | 94 | } |
95 | 95 | ||
96 | static int mpc8260cpm_detach(struct comedi_device * dev) | 96 | static int mpc8260cpm_detach(struct comedi_device *dev) |
97 | { | 97 | { |
98 | printk("comedi%d: mpc8260cpm: remove\n", dev->minor); | 98 | printk("comedi%d: mpc8260cpm: remove\n", dev->minor); |
99 | 99 | ||
@@ -114,8 +114,8 @@ static unsigned long *cpm_pdat(int port) | |||
114 | } | 114 | } |
115 | } | 115 | } |
116 | 116 | ||
117 | static int mpc8260cpm_dio_config(struct comedi_device * dev, struct comedi_subdevice * s, | 117 | static int mpc8260cpm_dio_config(struct comedi_device *dev, struct comedi_subdevice *s, |
118 | struct comedi_insn * insn, unsigned int * data) | 118 | struct comedi_insn *insn, unsigned int *data) |
119 | { | 119 | { |
120 | int n; | 120 | int n; |
121 | unsigned int d; | 121 | unsigned int d; |
@@ -157,8 +157,8 @@ static int mpc8260cpm_dio_config(struct comedi_device * dev, struct comedi_subde | |||
157 | return 1; | 157 | return 1; |
158 | } | 158 | } |
159 | 159 | ||
160 | static int mpc8260cpm_dio_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 160 | static int mpc8260cpm_dio_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
161 | struct comedi_insn * insn, unsigned int * data) | 161 | struct comedi_insn *insn, unsigned int *data) |
162 | { | 162 | { |
163 | int port; | 163 | int port; |
164 | unsigned long *p; | 164 | unsigned long *p; |
diff --git a/drivers/staging/comedi/drivers/multiq3.c b/drivers/staging/comedi/drivers/multiq3.c index 9e47574171d..5b155be0cf9 100644 --- a/drivers/staging/comedi/drivers/multiq3.c +++ b/drivers/staging/comedi/drivers/multiq3.c | |||
@@ -82,8 +82,8 @@ Devices: [Quanser Consulting] MultiQ-3 (multiq3) | |||
82 | 82 | ||
83 | #define MULTIQ3_TIMEOUT 30 | 83 | #define MULTIQ3_TIMEOUT 30 |
84 | 84 | ||
85 | static int multiq3_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 85 | static int multiq3_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
86 | static int multiq3_detach(struct comedi_device * dev); | 86 | static int multiq3_detach(struct comedi_device *dev); |
87 | static struct comedi_driver driver_multiq3 = { | 87 | static struct comedi_driver driver_multiq3 = { |
88 | driver_name:"multiq3", | 88 | driver_name:"multiq3", |
89 | module:THIS_MODULE, | 89 | module:THIS_MODULE, |
@@ -98,8 +98,8 @@ struct multiq3_private { | |||
98 | }; | 98 | }; |
99 | #define devpriv ((struct multiq3_private *)dev->private) | 99 | #define devpriv ((struct multiq3_private *)dev->private) |
100 | 100 | ||
101 | static int multiq3_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 101 | static int multiq3_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
102 | struct comedi_insn * insn, unsigned int * data) | 102 | struct comedi_insn *insn, unsigned int *data) |
103 | { | 103 | { |
104 | int i, n; | 104 | int i, n; |
105 | int chan; | 105 | int chan; |
@@ -134,8 +134,8 @@ static int multiq3_ai_insn_read(struct comedi_device * dev, struct comedi_subdev | |||
134 | return n; | 134 | return n; |
135 | } | 135 | } |
136 | 136 | ||
137 | static int multiq3_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 137 | static int multiq3_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
138 | struct comedi_insn * insn, unsigned int * data) | 138 | struct comedi_insn *insn, unsigned int *data) |
139 | { | 139 | { |
140 | int i; | 140 | int i; |
141 | int chan = CR_CHAN(insn->chanspec); | 141 | int chan = CR_CHAN(insn->chanspec); |
@@ -147,8 +147,8 @@ static int multiq3_ao_insn_read(struct comedi_device * dev, struct comedi_subdev | |||
147 | return i; | 147 | return i; |
148 | } | 148 | } |
149 | 149 | ||
150 | static int multiq3_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 150 | static int multiq3_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
151 | struct comedi_insn * insn, unsigned int * data) | 151 | struct comedi_insn *insn, unsigned int *data) |
152 | { | 152 | { |
153 | int i; | 153 | int i; |
154 | int chan = CR_CHAN(insn->chanspec); | 154 | int chan = CR_CHAN(insn->chanspec); |
@@ -165,8 +165,8 @@ static int multiq3_ao_insn_write(struct comedi_device * dev, struct comedi_subde | |||
165 | return i; | 165 | return i; |
166 | } | 166 | } |
167 | 167 | ||
168 | static int multiq3_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 168 | static int multiq3_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
169 | struct comedi_insn * insn, unsigned int * data) | 169 | struct comedi_insn *insn, unsigned int *data) |
170 | { | 170 | { |
171 | if (insn->n != 2) | 171 | if (insn->n != 2) |
172 | return -EINVAL; | 172 | return -EINVAL; |
@@ -176,8 +176,8 @@ static int multiq3_di_insn_bits(struct comedi_device * dev, struct comedi_subdev | |||
176 | return 2; | 176 | return 2; |
177 | } | 177 | } |
178 | 178 | ||
179 | static int multiq3_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 179 | static int multiq3_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
180 | struct comedi_insn * insn, unsigned int * data) | 180 | struct comedi_insn *insn, unsigned int *data) |
181 | { | 181 | { |
182 | if (insn->n != 2) | 182 | if (insn->n != 2) |
183 | return -EINVAL; | 183 | return -EINVAL; |
@@ -191,8 +191,8 @@ static int multiq3_do_insn_bits(struct comedi_device * dev, struct comedi_subdev | |||
191 | return 2; | 191 | return 2; |
192 | } | 192 | } |
193 | 193 | ||
194 | static int multiq3_encoder_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 194 | static int multiq3_encoder_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
195 | struct comedi_insn * insn, unsigned int * data) | 195 | struct comedi_insn *insn, unsigned int *data) |
196 | { | 196 | { |
197 | int n; | 197 | int n; |
198 | int chan = CR_CHAN(insn->chanspec); | 198 | int chan = CR_CHAN(insn->chanspec); |
@@ -212,7 +212,7 @@ static int multiq3_encoder_insn_read(struct comedi_device * dev, struct comedi_s | |||
212 | return n; | 212 | return n; |
213 | } | 213 | } |
214 | 214 | ||
215 | static void encoder_reset(struct comedi_device * dev) | 215 | static void encoder_reset(struct comedi_device *dev) |
216 | { | 216 | { |
217 | int chan; | 217 | int chan; |
218 | for (chan = 0; chan < dev->subdevices[4].n_chan; chan++) { | 218 | for (chan = 0; chan < dev->subdevices[4].n_chan; chan++) { |
@@ -235,7 +235,7 @@ static void encoder_reset(struct comedi_device * dev) | |||
235 | options[2] - number of encoder chips installed | 235 | options[2] - number of encoder chips installed |
236 | */ | 236 | */ |
237 | 237 | ||
238 | static int multiq3_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 238 | static int multiq3_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
239 | { | 239 | { |
240 | int result = 0; | 240 | int result = 0; |
241 | unsigned long iobase; | 241 | unsigned long iobase; |
@@ -318,7 +318,7 @@ static int multiq3_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
318 | return 0; | 318 | return 0; |
319 | } | 319 | } |
320 | 320 | ||
321 | static int multiq3_detach(struct comedi_device * dev) | 321 | static int multiq3_detach(struct comedi_device *dev) |
322 | { | 322 | { |
323 | printk("comedi%d: multiq3: remove\n", dev->minor); | 323 | printk("comedi%d: multiq3: remove\n", dev->minor); |
324 | 324 | ||
diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c index d7c7c0f6be8..4f476ec2d2f 100644 --- a/drivers/staging/comedi/drivers/ni_6527.c +++ b/drivers/staging/comedi/drivers/ni_6527.c | |||
@@ -75,8 +75,8 @@ Updated: Sat, 25 Jan 2003 13:24:40 -0800 | |||
75 | #define Rising_Edge_Detection_Enable(x) (0x018+(x)) | 75 | #define Rising_Edge_Detection_Enable(x) (0x018+(x)) |
76 | #define Falling_Edge_Detection_Enable(x) (0x020+(x)) | 76 | #define Falling_Edge_Detection_Enable(x) (0x020+(x)) |
77 | 77 | ||
78 | static int ni6527_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 78 | static int ni6527_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
79 | static int ni6527_detach(struct comedi_device * dev); | 79 | static int ni6527_detach(struct comedi_device *dev); |
80 | static struct comedi_driver driver_ni6527 = { | 80 | static struct comedi_driver driver_ni6527 = { |
81 | driver_name:"ni6527", | 81 | driver_name:"ni6527", |
82 | module:THIS_MODULE, | 82 | module:THIS_MODULE, |
@@ -120,10 +120,10 @@ struct ni6527_private { | |||
120 | 120 | ||
121 | #define devpriv ((struct ni6527_private *)dev->private) | 121 | #define devpriv ((struct ni6527_private *)dev->private) |
122 | 122 | ||
123 | static int ni6527_find_device(struct comedi_device * dev, int bus, int slot); | 123 | static int ni6527_find_device(struct comedi_device *dev, int bus, int slot); |
124 | 124 | ||
125 | static int ni6527_di_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 125 | static int ni6527_di_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
126 | struct comedi_insn * insn, unsigned int * data) | 126 | struct comedi_insn *insn, unsigned int *data) |
127 | { | 127 | { |
128 | int chan = CR_CHAN(insn->chanspec); | 128 | int chan = CR_CHAN(insn->chanspec); |
129 | unsigned int interval; | 129 | unsigned int interval; |
@@ -170,8 +170,8 @@ static int ni6527_di_insn_config(struct comedi_device * dev, struct comedi_subde | |||
170 | return 2; | 170 | return 2; |
171 | } | 171 | } |
172 | 172 | ||
173 | static int ni6527_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 173 | static int ni6527_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
174 | struct comedi_insn * insn, unsigned int * data) | 174 | struct comedi_insn *insn, unsigned int *data) |
175 | { | 175 | { |
176 | if (insn->n != 2) | 176 | if (insn->n != 2) |
177 | return -EINVAL; | 177 | return -EINVAL; |
@@ -183,8 +183,8 @@ static int ni6527_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi | |||
183 | return 2; | 183 | return 2; |
184 | } | 184 | } |
185 | 185 | ||
186 | static int ni6527_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 186 | static int ni6527_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
187 | struct comedi_insn * insn, unsigned int * data) | 187 | struct comedi_insn *insn, unsigned int *data) |
188 | { | 188 | { |
189 | if (insn->n != 2) | 189 | if (insn->n != 2) |
190 | return -EINVAL; | 190 | return -EINVAL; |
@@ -233,8 +233,8 @@ static irqreturn_t ni6527_interrupt(int irq, void *d) | |||
233 | return IRQ_HANDLED; | 233 | return IRQ_HANDLED; |
234 | } | 234 | } |
235 | 235 | ||
236 | static int ni6527_intr_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 236 | static int ni6527_intr_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
237 | struct comedi_cmd * cmd) | 237 | struct comedi_cmd *cmd) |
238 | { | 238 | { |
239 | int err = 0; | 239 | int err = 0; |
240 | int tmp; | 240 | int tmp; |
@@ -309,7 +309,7 @@ static int ni6527_intr_cmdtest(struct comedi_device * dev, struct comedi_subdevi | |||
309 | return 0; | 309 | return 0; |
310 | } | 310 | } |
311 | 311 | ||
312 | static int ni6527_intr_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 312 | static int ni6527_intr_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
313 | { | 313 | { |
314 | /* struct comedi_cmd *cmd = &s->async->cmd; */ | 314 | /* struct comedi_cmd *cmd = &s->async->cmd; */ |
315 | 315 | ||
@@ -322,15 +322,15 @@ static int ni6527_intr_cmd(struct comedi_device * dev, struct comedi_subdevice * | |||
322 | return 0; | 322 | return 0; |
323 | } | 323 | } |
324 | 324 | ||
325 | static int ni6527_intr_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 325 | static int ni6527_intr_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
326 | { | 326 | { |
327 | writeb(0x00, devpriv->mite->daq_io_addr + Master_Interrupt_Control); | 327 | writeb(0x00, devpriv->mite->daq_io_addr + Master_Interrupt_Control); |
328 | 328 | ||
329 | return 0; | 329 | return 0; |
330 | } | 330 | } |
331 | 331 | ||
332 | static int ni6527_intr_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 332 | static int ni6527_intr_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
333 | struct comedi_insn * insn, unsigned int * data) | 333 | struct comedi_insn *insn, unsigned int *data) |
334 | { | 334 | { |
335 | if (insn->n < 1) | 335 | if (insn->n < 1) |
336 | return -EINVAL; | 336 | return -EINVAL; |
@@ -339,8 +339,8 @@ static int ni6527_intr_insn_bits(struct comedi_device * dev, struct comedi_subde | |||
339 | return 2; | 339 | return 2; |
340 | } | 340 | } |
341 | 341 | ||
342 | static int ni6527_intr_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 342 | static int ni6527_intr_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
343 | struct comedi_insn * insn, unsigned int * data) | 343 | struct comedi_insn *insn, unsigned int *data) |
344 | { | 344 | { |
345 | if (insn->n < 1) | 345 | if (insn->n < 1) |
346 | return -EINVAL; | 346 | return -EINVAL; |
@@ -364,7 +364,7 @@ static int ni6527_intr_insn_config(struct comedi_device * dev, struct comedi_sub | |||
364 | return 2; | 364 | return 2; |
365 | } | 365 | } |
366 | 366 | ||
367 | static int ni6527_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 367 | static int ni6527_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
368 | { | 368 | { |
369 | struct comedi_subdevice *s; | 369 | struct comedi_subdevice *s; |
370 | int ret; | 370 | int ret; |
@@ -442,7 +442,7 @@ static int ni6527_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
442 | return 0; | 442 | return 0; |
443 | } | 443 | } |
444 | 444 | ||
445 | static int ni6527_detach(struct comedi_device * dev) | 445 | static int ni6527_detach(struct comedi_device *dev) |
446 | { | 446 | { |
447 | if (devpriv && devpriv->mite && devpriv->mite->daq_io_addr) { | 447 | if (devpriv && devpriv->mite && devpriv->mite->daq_io_addr) { |
448 | writeb(0x00, | 448 | writeb(0x00, |
@@ -460,7 +460,7 @@ static int ni6527_detach(struct comedi_device * dev) | |||
460 | return 0; | 460 | return 0; |
461 | } | 461 | } |
462 | 462 | ||
463 | static int ni6527_find_device(struct comedi_device * dev, int bus, int slot) | 463 | static int ni6527_find_device(struct comedi_device *dev, int bus, int slot) |
464 | { | 464 | { |
465 | struct mite_struct *mite; | 465 | struct mite_struct *mite; |
466 | int i; | 466 | int i; |
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c index 60dfec59333..72005a40ad9 100644 --- a/drivers/staging/comedi/drivers/ni_65xx.c +++ b/drivers/staging/comedi/drivers/ni_65xx.c | |||
@@ -102,8 +102,8 @@ static inline unsigned Filter_Enable(unsigned port) | |||
102 | #define OverflowIntEnable 0x02 | 102 | #define OverflowIntEnable 0x02 |
103 | #define EdgeIntEnable 0x01 | 103 | #define EdgeIntEnable 0x01 |
104 | 104 | ||
105 | static int ni_65xx_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 105 | static int ni_65xx_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
106 | static int ni_65xx_detach(struct comedi_device * dev); | 106 | static int ni_65xx_detach(struct comedi_device *dev); |
107 | static struct comedi_driver driver_ni_65xx = { | 107 | static struct comedi_driver driver_ni_65xx = { |
108 | driver_name:"ni_65xx", | 108 | driver_name:"ni_65xx", |
109 | module:THIS_MODULE, | 109 | module:THIS_MODULE, |
@@ -249,7 +249,7 @@ static inline unsigned ni_65xx_port_by_channel(unsigned channel) | |||
249 | { | 249 | { |
250 | return channel / ni_65xx_channels_per_port; | 250 | return channel / ni_65xx_channels_per_port; |
251 | } | 251 | } |
252 | static inline unsigned ni_65xx_total_num_ports(const struct ni_65xx_board * board) | 252 | static inline unsigned ni_65xx_total_num_ports(const struct ni_65xx_board *board) |
253 | { | 253 | { |
254 | return board->num_dio_ports + board->num_di_ports + board->num_do_ports; | 254 | return board->num_dio_ports + board->num_di_ports + board->num_do_ports; |
255 | } | 255 | } |
@@ -312,10 +312,10 @@ static struct ni_65xx_subdevice_private *ni_65xx_alloc_subdevice_private(void) | |||
312 | return subdev_private; | 312 | return subdev_private; |
313 | } | 313 | } |
314 | 314 | ||
315 | static int ni_65xx_find_device(struct comedi_device * dev, int bus, int slot); | 315 | static int ni_65xx_find_device(struct comedi_device *dev, int bus, int slot); |
316 | 316 | ||
317 | static int ni_65xx_config_filter(struct comedi_device * dev, struct comedi_subdevice * s, | 317 | static int ni_65xx_config_filter(struct comedi_device *dev, struct comedi_subdevice *s, |
318 | struct comedi_insn * insn, unsigned int * data) | 318 | struct comedi_insn *insn, unsigned int *data) |
319 | { | 319 | { |
320 | const unsigned chan = CR_CHAN(insn->chanspec); | 320 | const unsigned chan = CR_CHAN(insn->chanspec); |
321 | const unsigned port = | 321 | const unsigned port = |
@@ -353,8 +353,8 @@ static int ni_65xx_config_filter(struct comedi_device * dev, struct comedi_subde | |||
353 | return 2; | 353 | return 2; |
354 | } | 354 | } |
355 | 355 | ||
356 | static int ni_65xx_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 356 | static int ni_65xx_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
357 | struct comedi_insn * insn, unsigned int * data) | 357 | struct comedi_insn *insn, unsigned int *data) |
358 | { | 358 | { |
359 | unsigned port; | 359 | unsigned port; |
360 | 360 | ||
@@ -392,8 +392,8 @@ static int ni_65xx_dio_insn_config(struct comedi_device * dev, struct comedi_sub | |||
392 | return -EINVAL; | 392 | return -EINVAL; |
393 | } | 393 | } |
394 | 394 | ||
395 | static int ni_65xx_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 395 | static int ni_65xx_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
396 | struct comedi_insn * insn, unsigned int * data) | 396 | struct comedi_insn *insn, unsigned int *data) |
397 | { | 397 | { |
398 | unsigned base_bitfield_channel; | 398 | unsigned base_bitfield_channel; |
399 | const unsigned max_ports_per_bitfield = 5; | 399 | const unsigned max_ports_per_bitfield = 5; |
@@ -475,8 +475,8 @@ static irqreturn_t ni_65xx_interrupt(int irq, void *d) | |||
475 | return IRQ_HANDLED; | 475 | return IRQ_HANDLED; |
476 | } | 476 | } |
477 | 477 | ||
478 | static int ni_65xx_intr_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 478 | static int ni_65xx_intr_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
479 | struct comedi_cmd * cmd) | 479 | struct comedi_cmd *cmd) |
480 | { | 480 | { |
481 | int err = 0; | 481 | int err = 0; |
482 | int tmp; | 482 | int tmp; |
@@ -551,7 +551,7 @@ static int ni_65xx_intr_cmdtest(struct comedi_device * dev, struct comedi_subdev | |||
551 | return 0; | 551 | return 0; |
552 | } | 552 | } |
553 | 553 | ||
554 | static int ni_65xx_intr_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 554 | static int ni_65xx_intr_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
555 | { | 555 | { |
556 | /* struct comedi_cmd *cmd = &s->async->cmd; */ | 556 | /* struct comedi_cmd *cmd = &s->async->cmd; */ |
557 | 557 | ||
@@ -564,7 +564,7 @@ static int ni_65xx_intr_cmd(struct comedi_device * dev, struct comedi_subdevice | |||
564 | return 0; | 564 | return 0; |
565 | } | 565 | } |
566 | 566 | ||
567 | static int ni_65xx_intr_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 567 | static int ni_65xx_intr_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
568 | { | 568 | { |
569 | writeb(0x00, | 569 | writeb(0x00, |
570 | private(dev)->mite->daq_io_addr + Master_Interrupt_Control); | 570 | private(dev)->mite->daq_io_addr + Master_Interrupt_Control); |
@@ -572,8 +572,8 @@ static int ni_65xx_intr_cancel(struct comedi_device * dev, struct comedi_subdevi | |||
572 | return 0; | 572 | return 0; |
573 | } | 573 | } |
574 | 574 | ||
575 | static int ni_65xx_intr_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 575 | static int ni_65xx_intr_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
576 | struct comedi_insn * insn, unsigned int * data) | 576 | struct comedi_insn *insn, unsigned int *data) |
577 | { | 577 | { |
578 | if (insn->n < 1) | 578 | if (insn->n < 1) |
579 | return -EINVAL; | 579 | return -EINVAL; |
@@ -582,8 +582,8 @@ static int ni_65xx_intr_insn_bits(struct comedi_device * dev, struct comedi_subd | |||
582 | return 2; | 582 | return 2; |
583 | } | 583 | } |
584 | 584 | ||
585 | static int ni_65xx_intr_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 585 | static int ni_65xx_intr_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
586 | struct comedi_insn * insn, unsigned int * data) | 586 | struct comedi_insn *insn, unsigned int *data) |
587 | { | 587 | { |
588 | if (insn->n < 1) | 588 | if (insn->n < 1) |
589 | return -EINVAL; | 589 | return -EINVAL; |
@@ -619,7 +619,7 @@ static int ni_65xx_intr_insn_config(struct comedi_device * dev, struct comedi_su | |||
619 | return 2; | 619 | return 2; |
620 | } | 620 | } |
621 | 621 | ||
622 | static int ni_65xx_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 622 | static int ni_65xx_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
623 | { | 623 | { |
624 | struct comedi_subdevice *s; | 624 | struct comedi_subdevice *s; |
625 | unsigned i; | 625 | unsigned i; |
@@ -752,7 +752,7 @@ static int ni_65xx_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
752 | return 0; | 752 | return 0; |
753 | } | 753 | } |
754 | 754 | ||
755 | static int ni_65xx_detach(struct comedi_device * dev) | 755 | static int ni_65xx_detach(struct comedi_device *dev) |
756 | { | 756 | { |
757 | if (private(dev) && private(dev)->mite | 757 | if (private(dev) && private(dev)->mite |
758 | && private(dev)->mite->daq_io_addr) { | 758 | && private(dev)->mite->daq_io_addr) { |
@@ -780,7 +780,7 @@ static int ni_65xx_detach(struct comedi_device * dev) | |||
780 | return 0; | 780 | return 0; |
781 | } | 781 | } |
782 | 782 | ||
783 | static int ni_65xx_find_device(struct comedi_device * dev, int bus, int slot) | 783 | static int ni_65xx_find_device(struct comedi_device *dev, int bus, int slot) |
784 | { | 784 | { |
785 | struct mite_struct *mite; | 785 | struct mite_struct *mite; |
786 | int i; | 786 | int i; |
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c index 6b0fe5c4022..d4a6cf3dde6 100644 --- a/drivers/staging/comedi/drivers/ni_660x.c +++ b/drivers/staging/comedi/drivers/ni_660x.c | |||
@@ -448,10 +448,10 @@ static inline const struct ni_660x_board *board(struct comedi_device * dev) | |||
448 | 448 | ||
449 | #define n_ni_660x_boards (sizeof(ni_660x_boards)/sizeof(ni_660x_boards[0])) | 449 | #define n_ni_660x_boards (sizeof(ni_660x_boards)/sizeof(ni_660x_boards[0])) |
450 | 450 | ||
451 | static int ni_660x_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 451 | static int ni_660x_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
452 | static int ni_660x_detach(struct comedi_device * dev); | 452 | static int ni_660x_detach(struct comedi_device *dev); |
453 | static void init_tio_chip(struct comedi_device * dev, int chipset); | 453 | static void init_tio_chip(struct comedi_device *dev, int chipset); |
454 | static void ni_660x_select_pfi_output(struct comedi_device * dev, unsigned pfi_channel, | 454 | static void ni_660x_select_pfi_output(struct comedi_device *dev, unsigned pfi_channel, |
455 | unsigned output_select); | 455 | unsigned output_select); |
456 | 456 | ||
457 | static struct comedi_driver driver_ni_660x = { | 457 | static struct comedi_driver driver_ni_660x = { |
@@ -463,25 +463,25 @@ static struct comedi_driver driver_ni_660x = { | |||
463 | 463 | ||
464 | COMEDI_PCI_INITCLEANUP(driver_ni_660x, ni_660x_pci_table); | 464 | COMEDI_PCI_INITCLEANUP(driver_ni_660x, ni_660x_pci_table); |
465 | 465 | ||
466 | static int ni_660x_find_device(struct comedi_device * dev, int bus, int slot); | 466 | static int ni_660x_find_device(struct comedi_device *dev, int bus, int slot); |
467 | static int ni_660x_set_pfi_routing(struct comedi_device * dev, unsigned chan, | 467 | static int ni_660x_set_pfi_routing(struct comedi_device *dev, unsigned chan, |
468 | unsigned source); | 468 | unsigned source); |
469 | 469 | ||
470 | /* Possible instructions for a GPCT */ | 470 | /* Possible instructions for a GPCT */ |
471 | static int ni_660x_GPCT_rinsn(struct comedi_device * dev, | 471 | static int ni_660x_GPCT_rinsn(struct comedi_device *dev, |
472 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 472 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); |
473 | static int ni_660x_GPCT_insn_config(struct comedi_device * dev, | 473 | static int ni_660x_GPCT_insn_config(struct comedi_device *dev, |
474 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 474 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); |
475 | static int ni_660x_GPCT_winsn(struct comedi_device * dev, | 475 | static int ni_660x_GPCT_winsn(struct comedi_device *dev, |
476 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 476 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); |
477 | 477 | ||
478 | /* Possible instructions for Digital IO */ | 478 | /* Possible instructions for Digital IO */ |
479 | static int ni_660x_dio_insn_config(struct comedi_device * dev, | 479 | static int ni_660x_dio_insn_config(struct comedi_device *dev, |
480 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 480 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); |
481 | static int ni_660x_dio_insn_bits(struct comedi_device * dev, | 481 | static int ni_660x_dio_insn_bits(struct comedi_device *dev, |
482 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 482 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); |
483 | 483 | ||
484 | static inline unsigned ni_660x_num_counters(struct comedi_device * dev) | 484 | static inline unsigned ni_660x_num_counters(struct comedi_device *dev) |
485 | { | 485 | { |
486 | return board(dev)->n_chips * counters_per_chip; | 486 | return board(dev)->n_chips * counters_per_chip; |
487 | } | 487 | } |
@@ -704,7 +704,7 @@ static enum NI_660x_Register ni_gpct_to_660x_register(enum ni_gpct_register reg) | |||
704 | return ni_660x_register; | 704 | return ni_660x_register; |
705 | } | 705 | } |
706 | 706 | ||
707 | static inline void ni_660x_write_register(struct comedi_device * dev, | 707 | static inline void ni_660x_write_register(struct comedi_device *dev, |
708 | unsigned chip_index, unsigned bits, enum NI_660x_Register reg) | 708 | unsigned chip_index, unsigned bits, enum NI_660x_Register reg) |
709 | { | 709 | { |
710 | void *const write_address = | 710 | void *const write_address = |
@@ -726,7 +726,7 @@ static inline void ni_660x_write_register(struct comedi_device * dev, | |||
726 | } | 726 | } |
727 | } | 727 | } |
728 | 728 | ||
729 | static inline unsigned ni_660x_read_register(struct comedi_device * dev, | 729 | static inline unsigned ni_660x_read_register(struct comedi_device *dev, |
730 | unsigned chip_index, enum NI_660x_Register reg) | 730 | unsigned chip_index, enum NI_660x_Register reg) |
731 | { | 731 | { |
732 | void *const read_address = | 732 | void *const read_address = |
@@ -773,7 +773,7 @@ static inline struct mite_dma_descriptor_ring *mite_ring(struct ni_660x_private | |||
773 | return priv->mite_rings[counter->chip_index][counter->counter_index]; | 773 | return priv->mite_rings[counter->chip_index][counter->counter_index]; |
774 | } | 774 | } |
775 | 775 | ||
776 | static inline void ni_660x_set_dma_channel(struct comedi_device * dev, | 776 | static inline void ni_660x_set_dma_channel(struct comedi_device *dev, |
777 | unsigned mite_channel, struct ni_gpct *counter) | 777 | unsigned mite_channel, struct ni_gpct *counter) |
778 | { | 778 | { |
779 | unsigned long flags; | 779 | unsigned long flags; |
@@ -791,7 +791,7 @@ static inline void ni_660x_set_dma_channel(struct comedi_device * dev, | |||
791 | comedi_spin_unlock_irqrestore(&private(dev)->soft_reg_copy_lock, flags); | 791 | comedi_spin_unlock_irqrestore(&private(dev)->soft_reg_copy_lock, flags); |
792 | } | 792 | } |
793 | 793 | ||
794 | static inline void ni_660x_unset_dma_channel(struct comedi_device * dev, | 794 | static inline void ni_660x_unset_dma_channel(struct comedi_device *dev, |
795 | unsigned mite_channel, struct ni_gpct *counter) | 795 | unsigned mite_channel, struct ni_gpct *counter) |
796 | { | 796 | { |
797 | unsigned long flags; | 797 | unsigned long flags; |
@@ -807,7 +807,7 @@ static inline void ni_660x_unset_dma_channel(struct comedi_device * dev, | |||
807 | comedi_spin_unlock_irqrestore(&private(dev)->soft_reg_copy_lock, flags); | 807 | comedi_spin_unlock_irqrestore(&private(dev)->soft_reg_copy_lock, flags); |
808 | } | 808 | } |
809 | 809 | ||
810 | static int ni_660x_request_mite_channel(struct comedi_device * dev, | 810 | static int ni_660x_request_mite_channel(struct comedi_device *dev, |
811 | struct ni_gpct *counter, enum comedi_io_direction direction) | 811 | struct ni_gpct *counter, enum comedi_io_direction direction) |
812 | { | 812 | { |
813 | unsigned long flags; | 813 | unsigned long flags; |
@@ -832,7 +832,7 @@ static int ni_660x_request_mite_channel(struct comedi_device * dev, | |||
832 | return 0; | 832 | return 0; |
833 | } | 833 | } |
834 | 834 | ||
835 | void ni_660x_release_mite_channel(struct comedi_device * dev, struct ni_gpct *counter) | 835 | void ni_660x_release_mite_channel(struct comedi_device *dev, struct ni_gpct *counter) |
836 | { | 836 | { |
837 | unsigned long flags; | 837 | unsigned long flags; |
838 | 838 | ||
@@ -847,7 +847,7 @@ void ni_660x_release_mite_channel(struct comedi_device * dev, struct ni_gpct *co | |||
847 | comedi_spin_unlock_irqrestore(&private(dev)->mite_channel_lock, flags); | 847 | comedi_spin_unlock_irqrestore(&private(dev)->mite_channel_lock, flags); |
848 | } | 848 | } |
849 | 849 | ||
850 | static int ni_660x_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 850 | static int ni_660x_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
851 | { | 851 | { |
852 | int retval; | 852 | int retval; |
853 | 853 | ||
@@ -866,15 +866,15 @@ static int ni_660x_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
866 | return retval; | 866 | return retval; |
867 | } | 867 | } |
868 | 868 | ||
869 | static int ni_660x_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 869 | static int ni_660x_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
870 | struct comedi_cmd * cmd) | 870 | struct comedi_cmd *cmd) |
871 | { | 871 | { |
872 | struct ni_gpct *counter = subdev_to_counter(s); | 872 | struct ni_gpct *counter = subdev_to_counter(s); |
873 | 873 | ||
874 | return ni_tio_cmdtest(counter, cmd); | 874 | return ni_tio_cmdtest(counter, cmd); |
875 | } | 875 | } |
876 | 876 | ||
877 | static int ni_660x_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 877 | static int ni_660x_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
878 | { | 878 | { |
879 | struct ni_gpct *counter = subdev_to_counter(s); | 879 | struct ni_gpct *counter = subdev_to_counter(s); |
880 | int retval; | 880 | int retval; |
@@ -884,7 +884,7 @@ static int ni_660x_cancel(struct comedi_device * dev, struct comedi_subdevice * | |||
884 | return retval; | 884 | return retval; |
885 | } | 885 | } |
886 | 886 | ||
887 | static void set_tio_counterswap(struct comedi_device * dev, int chipset) | 887 | static void set_tio_counterswap(struct comedi_device *dev, int chipset) |
888 | { | 888 | { |
889 | /* See P. 3.5 of the Register-Level Programming manual. The | 889 | /* See P. 3.5 of the Register-Level Programming manual. The |
890 | CounterSwap bit has to be set on the second chip, otherwise | 890 | CounterSwap bit has to be set on the second chip, otherwise |
@@ -897,8 +897,8 @@ static void set_tio_counterswap(struct comedi_device * dev, int chipset) | |||
897 | ni_660x_write_register(dev, chipset, 0, ClockConfigRegister); | 897 | ni_660x_write_register(dev, chipset, 0, ClockConfigRegister); |
898 | } | 898 | } |
899 | 899 | ||
900 | static void ni_660x_handle_gpct_interrupt(struct comedi_device * dev, | 900 | static void ni_660x_handle_gpct_interrupt(struct comedi_device *dev, |
901 | struct comedi_subdevice * s) | 901 | struct comedi_subdevice *s) |
902 | { | 902 | { |
903 | ni_tio_handle_interrupt(subdev_to_counter(s), s); | 903 | ni_tio_handle_interrupt(subdev_to_counter(s), s); |
904 | if (s->async->events) { | 904 | if (s->async->events) { |
@@ -942,7 +942,7 @@ static int ni_660x_input_poll(struct comedi_device *dev, | |||
942 | return comedi_buf_read_n_available(s->async); | 942 | return comedi_buf_read_n_available(s->async); |
943 | } | 943 | } |
944 | 944 | ||
945 | static int ni_660x_buf_change(struct comedi_device * dev, struct comedi_subdevice * s, | 945 | static int ni_660x_buf_change(struct comedi_device *dev, struct comedi_subdevice *s, |
946 | unsigned long new_size) | 946 | unsigned long new_size) |
947 | { | 947 | { |
948 | int ret; | 948 | int ret; |
@@ -955,7 +955,7 @@ static int ni_660x_buf_change(struct comedi_device * dev, struct comedi_subdevic | |||
955 | return 0; | 955 | return 0; |
956 | } | 956 | } |
957 | 957 | ||
958 | static int ni_660x_allocate_private(struct comedi_device * dev) | 958 | static int ni_660x_allocate_private(struct comedi_device *dev) |
959 | { | 959 | { |
960 | int retval; | 960 | int retval; |
961 | unsigned i; | 961 | unsigned i; |
@@ -971,7 +971,7 @@ static int ni_660x_allocate_private(struct comedi_device * dev) | |||
971 | return 0; | 971 | return 0; |
972 | } | 972 | } |
973 | 973 | ||
974 | static int ni_660x_alloc_mite_rings(struct comedi_device * dev) | 974 | static int ni_660x_alloc_mite_rings(struct comedi_device *dev) |
975 | { | 975 | { |
976 | unsigned i; | 976 | unsigned i; |
977 | unsigned j; | 977 | unsigned j; |
@@ -988,7 +988,7 @@ static int ni_660x_alloc_mite_rings(struct comedi_device * dev) | |||
988 | return 0; | 988 | return 0; |
989 | } | 989 | } |
990 | 990 | ||
991 | static void ni_660x_free_mite_rings(struct comedi_device * dev) | 991 | static void ni_660x_free_mite_rings(struct comedi_device *dev) |
992 | { | 992 | { |
993 | unsigned i; | 993 | unsigned i; |
994 | unsigned j; | 994 | unsigned j; |
@@ -1000,7 +1000,7 @@ static void ni_660x_free_mite_rings(struct comedi_device * dev) | |||
1000 | } | 1000 | } |
1001 | } | 1001 | } |
1002 | 1002 | ||
1003 | static int ni_660x_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 1003 | static int ni_660x_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
1004 | { | 1004 | { |
1005 | struct comedi_subdevice *s; | 1005 | struct comedi_subdevice *s; |
1006 | int ret; | 1006 | int ret; |
@@ -1121,7 +1121,7 @@ static int ni_660x_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
1121 | return 0; | 1121 | return 0; |
1122 | } | 1122 | } |
1123 | 1123 | ||
1124 | static int ni_660x_detach(struct comedi_device * dev) | 1124 | static int ni_660x_detach(struct comedi_device *dev) |
1125 | { | 1125 | { |
1126 | printk("comedi%d: ni_660x: remove\n", dev->minor); | 1126 | printk("comedi%d: ni_660x: remove\n", dev->minor); |
1127 | 1127 | ||
@@ -1141,13 +1141,13 @@ static int ni_660x_detach(struct comedi_device * dev) | |||
1141 | } | 1141 | } |
1142 | 1142 | ||
1143 | static int | 1143 | static int |
1144 | ni_660x_GPCT_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 1144 | ni_660x_GPCT_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
1145 | struct comedi_insn * insn, unsigned int * data) | 1145 | struct comedi_insn *insn, unsigned int *data) |
1146 | { | 1146 | { |
1147 | return ni_tio_rinsn(subdev_to_counter(s), insn, data); | 1147 | return ni_tio_rinsn(subdev_to_counter(s), insn, data); |
1148 | } | 1148 | } |
1149 | 1149 | ||
1150 | static void init_tio_chip(struct comedi_device * dev, int chipset) | 1150 | static void init_tio_chip(struct comedi_device *dev, int chipset) |
1151 | { | 1151 | { |
1152 | unsigned i; | 1152 | unsigned i; |
1153 | 1153 | ||
@@ -1168,19 +1168,19 @@ static void init_tio_chip(struct comedi_device * dev, int chipset) | |||
1168 | } | 1168 | } |
1169 | 1169 | ||
1170 | static int | 1170 | static int |
1171 | ni_660x_GPCT_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 1171 | ni_660x_GPCT_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
1172 | struct comedi_insn * insn, unsigned int * data) | 1172 | struct comedi_insn *insn, unsigned int *data) |
1173 | { | 1173 | { |
1174 | return ni_tio_insn_config(subdev_to_counter(s), insn, data); | 1174 | return ni_tio_insn_config(subdev_to_counter(s), insn, data); |
1175 | } | 1175 | } |
1176 | 1176 | ||
1177 | static int ni_660x_GPCT_winsn(struct comedi_device * dev, | 1177 | static int ni_660x_GPCT_winsn(struct comedi_device *dev, |
1178 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1178 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1179 | { | 1179 | { |
1180 | return ni_tio_winsn(subdev_to_counter(s), insn, data); | 1180 | return ni_tio_winsn(subdev_to_counter(s), insn, data); |
1181 | } | 1181 | } |
1182 | 1182 | ||
1183 | static int ni_660x_find_device(struct comedi_device * dev, int bus, int slot) | 1183 | static int ni_660x_find_device(struct comedi_device *dev, int bus, int slot) |
1184 | { | 1184 | { |
1185 | struct mite_struct *mite; | 1185 | struct mite_struct *mite; |
1186 | int i; | 1186 | int i; |
@@ -1207,8 +1207,8 @@ static int ni_660x_find_device(struct comedi_device * dev, int bus, int slot) | |||
1207 | return -EIO; | 1207 | return -EIO; |
1208 | } | 1208 | } |
1209 | 1209 | ||
1210 | static int ni_660x_dio_insn_bits(struct comedi_device * dev, | 1210 | static int ni_660x_dio_insn_bits(struct comedi_device *dev, |
1211 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1211 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1212 | { | 1212 | { |
1213 | unsigned base_bitfield_channel = CR_CHAN(insn->chanspec); | 1213 | unsigned base_bitfield_channel = CR_CHAN(insn->chanspec); |
1214 | 1214 | ||
@@ -1227,7 +1227,7 @@ static int ni_660x_dio_insn_bits(struct comedi_device * dev, | |||
1227 | return 2; | 1227 | return 2; |
1228 | } | 1228 | } |
1229 | 1229 | ||
1230 | static void ni_660x_select_pfi_output(struct comedi_device * dev, unsigned pfi_channel, | 1230 | static void ni_660x_select_pfi_output(struct comedi_device *dev, unsigned pfi_channel, |
1231 | unsigned output_select) | 1231 | unsigned output_select) |
1232 | { | 1232 | { |
1233 | static const unsigned counter_4_7_first_pfi = 8; | 1233 | static const unsigned counter_4_7_first_pfi = 8; |
@@ -1262,7 +1262,7 @@ static void ni_660x_select_pfi_output(struct comedi_device * dev, unsigned pfi_c | |||
1262 | ni_660x_write_register(dev, active_chipset, active_bits, IOConfigReg(pfi_channel)); | 1262 | ni_660x_write_register(dev, active_chipset, active_bits, IOConfigReg(pfi_channel)); |
1263 | } | 1263 | } |
1264 | 1264 | ||
1265 | static int ni_660x_set_pfi_routing(struct comedi_device * dev, unsigned chan, | 1265 | static int ni_660x_set_pfi_routing(struct comedi_device *dev, unsigned chan, |
1266 | unsigned source) | 1266 | unsigned source) |
1267 | { | 1267 | { |
1268 | if (source > num_pfi_output_selects) | 1268 | if (source > num_pfi_output_selects) |
@@ -1285,13 +1285,13 @@ static int ni_660x_set_pfi_routing(struct comedi_device * dev, unsigned chan, | |||
1285 | return 0; | 1285 | return 0; |
1286 | } | 1286 | } |
1287 | 1287 | ||
1288 | static unsigned ni_660x_get_pfi_routing(struct comedi_device * dev, unsigned chan) | 1288 | static unsigned ni_660x_get_pfi_routing(struct comedi_device *dev, unsigned chan) |
1289 | { | 1289 | { |
1290 | BUG_ON(chan >= NUM_PFI_CHANNELS); | 1290 | BUG_ON(chan >= NUM_PFI_CHANNELS); |
1291 | return private(dev)->pfi_output_selects[chan]; | 1291 | return private(dev)->pfi_output_selects[chan]; |
1292 | } | 1292 | } |
1293 | 1293 | ||
1294 | static void ni660x_config_filter(struct comedi_device * dev, unsigned pfi_channel, | 1294 | static void ni660x_config_filter(struct comedi_device *dev, unsigned pfi_channel, |
1295 | enum ni_gpct_filter_select filter) | 1295 | enum ni_gpct_filter_select filter) |
1296 | { | 1296 | { |
1297 | unsigned bits = ni_660x_read_register(dev, 0, IOConfigReg(pfi_channel)); | 1297 | unsigned bits = ni_660x_read_register(dev, 0, IOConfigReg(pfi_channel)); |
@@ -1300,8 +1300,8 @@ static void ni660x_config_filter(struct comedi_device * dev, unsigned pfi_channe | |||
1300 | ni_660x_write_register(dev, 0, bits, IOConfigReg(pfi_channel)); | 1300 | ni_660x_write_register(dev, 0, bits, IOConfigReg(pfi_channel)); |
1301 | } | 1301 | } |
1302 | 1302 | ||
1303 | static int ni_660x_dio_insn_config(struct comedi_device * dev, | 1303 | static int ni_660x_dio_insn_config(struct comedi_device *dev, |
1304 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 1304 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
1305 | { | 1305 | { |
1306 | int chan = CR_CHAN(insn->chanspec); | 1306 | int chan = CR_CHAN(insn->chanspec); |
1307 | 1307 | ||
diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c index 05dcc5ba255..c00bd0d4045 100644 --- a/drivers/staging/comedi/drivers/ni_670x.c +++ b/drivers/staging/comedi/drivers/ni_670x.c | |||
@@ -111,8 +111,8 @@ struct ni_670x_private { | |||
111 | #define devpriv ((struct ni_670x_private *)dev->private) | 111 | #define devpriv ((struct ni_670x_private *)dev->private) |
112 | #define n_ni_670x_boards (sizeof(ni_670x_boards)/sizeof(ni_670x_boards[0])) | 112 | #define n_ni_670x_boards (sizeof(ni_670x_boards)/sizeof(ni_670x_boards[0])) |
113 | 113 | ||
114 | static int ni_670x_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 114 | static int ni_670x_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
115 | static int ni_670x_detach(struct comedi_device * dev); | 115 | static int ni_670x_detach(struct comedi_device *dev); |
116 | 116 | ||
117 | static struct comedi_driver driver_ni_670x = { | 117 | static struct comedi_driver driver_ni_670x = { |
118 | driver_name:"ni_670x", | 118 | driver_name:"ni_670x", |
@@ -125,18 +125,18 @@ COMEDI_PCI_INITCLEANUP(driver_ni_670x, ni_670x_pci_table); | |||
125 | 125 | ||
126 | static struct comedi_lrange range_0_20mA = { 1, {RANGE_mA(0, 20)} }; | 126 | static struct comedi_lrange range_0_20mA = { 1, {RANGE_mA(0, 20)} }; |
127 | 127 | ||
128 | static int ni_670x_find_device(struct comedi_device * dev, int bus, int slot); | 128 | static int ni_670x_find_device(struct comedi_device *dev, int bus, int slot); |
129 | 129 | ||
130 | static int ni_670x_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 130 | static int ni_670x_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
131 | struct comedi_insn * insn, unsigned int * data); | 131 | struct comedi_insn *insn, unsigned int *data); |
132 | static int ni_670x_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 132 | static int ni_670x_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
133 | struct comedi_insn * insn, unsigned int * data); | 133 | struct comedi_insn *insn, unsigned int *data); |
134 | static int ni_670x_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 134 | static int ni_670x_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
135 | struct comedi_insn * insn, unsigned int * data); | 135 | struct comedi_insn *insn, unsigned int *data); |
136 | static int ni_670x_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 136 | static int ni_670x_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
137 | struct comedi_insn * insn, unsigned int * data); | 137 | struct comedi_insn *insn, unsigned int *data); |
138 | 138 | ||
139 | static int ni_670x_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 139 | static int ni_670x_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
140 | { | 140 | { |
141 | struct comedi_subdevice *s; | 141 | struct comedi_subdevice *s; |
142 | int ret; | 142 | int ret; |
@@ -205,7 +205,7 @@ static int ni_670x_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
205 | return 1; | 205 | return 1; |
206 | } | 206 | } |
207 | 207 | ||
208 | static int ni_670x_detach(struct comedi_device * dev) | 208 | static int ni_670x_detach(struct comedi_device *dev) |
209 | { | 209 | { |
210 | printk("comedi%d: ni_670x: remove\n", dev->minor); | 210 | printk("comedi%d: ni_670x: remove\n", dev->minor); |
211 | 211 | ||
@@ -221,8 +221,8 @@ static int ni_670x_detach(struct comedi_device * dev) | |||
221 | return 0; | 221 | return 0; |
222 | } | 222 | } |
223 | 223 | ||
224 | static int ni_670x_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 224 | static int ni_670x_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
225 | struct comedi_insn * insn, unsigned int * data) | 225 | struct comedi_insn *insn, unsigned int *data) |
226 | { | 226 | { |
227 | int i; | 227 | int i; |
228 | int chan = CR_CHAN(insn->chanspec); | 228 | int chan = CR_CHAN(insn->chanspec); |
@@ -247,8 +247,8 @@ static int ni_670x_ao_winsn(struct comedi_device * dev, struct comedi_subdevice | |||
247 | return i; | 247 | return i; |
248 | } | 248 | } |
249 | 249 | ||
250 | static int ni_670x_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 250 | static int ni_670x_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
251 | struct comedi_insn * insn, unsigned int * data) | 251 | struct comedi_insn *insn, unsigned int *data) |
252 | { | 252 | { |
253 | int i; | 253 | int i; |
254 | int chan = CR_CHAN(insn->chanspec); | 254 | int chan = CR_CHAN(insn->chanspec); |
@@ -259,8 +259,8 @@ static int ni_670x_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice | |||
259 | return i; | 259 | return i; |
260 | } | 260 | } |
261 | 261 | ||
262 | static int ni_670x_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 262 | static int ni_670x_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
263 | struct comedi_insn * insn, unsigned int * data) | 263 | struct comedi_insn *insn, unsigned int *data) |
264 | { | 264 | { |
265 | if (insn->n != 2) | 265 | if (insn->n != 2) |
266 | return -EINVAL; | 266 | return -EINVAL; |
@@ -281,8 +281,8 @@ static int ni_670x_dio_insn_bits(struct comedi_device * dev, struct comedi_subde | |||
281 | return 2; | 281 | return 2; |
282 | } | 282 | } |
283 | 283 | ||
284 | static int ni_670x_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 284 | static int ni_670x_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
285 | struct comedi_insn * insn, unsigned int * data) | 285 | struct comedi_insn *insn, unsigned int *data) |
286 | { | 286 | { |
287 | int chan = CR_CHAN(insn->chanspec); | 287 | int chan = CR_CHAN(insn->chanspec); |
288 | 288 | ||
@@ -308,7 +308,7 @@ static int ni_670x_dio_insn_config(struct comedi_device * dev, struct comedi_sub | |||
308 | return insn->n; | 308 | return insn->n; |
309 | } | 309 | } |
310 | 310 | ||
311 | static int ni_670x_find_device(struct comedi_device * dev, int bus, int slot) | 311 | static int ni_670x_find_device(struct comedi_device *dev, int bus, int slot) |
312 | { | 312 | { |
313 | struct mite_struct *mite; | 313 | struct mite_struct *mite; |
314 | int i; | 314 | int i; |
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c index 8b73a793ad0..62754d5372a 100644 --- a/drivers/staging/comedi/drivers/ni_at_a2150.c +++ b/drivers/staging/comedi/drivers/ni_at_a2150.c | |||
@@ -169,9 +169,9 @@ struct a2150_private { | |||
169 | 169 | ||
170 | #define devpriv ((struct a2150_private *)dev->private) | 170 | #define devpriv ((struct a2150_private *)dev->private) |
171 | 171 | ||
172 | static int a2150_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 172 | static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
173 | static int a2150_detach(struct comedi_device * dev); | 173 | static int a2150_detach(struct comedi_device *dev); |
174 | static int a2150_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 174 | static int a2150_cancel(struct comedi_device *dev, struct comedi_subdevice *s); |
175 | 175 | ||
176 | static struct comedi_driver driver_a2150 = { | 176 | static struct comedi_driver driver_a2150 = { |
177 | driver_name:"ni_at_a2150", | 177 | driver_name:"ni_at_a2150", |
@@ -199,7 +199,7 @@ COMEDI_INITCLEANUP(driver_a2150); | |||
199 | 199 | ||
200 | #ifdef A2150_DEBUG | 200 | #ifdef A2150_DEBUG |
201 | 201 | ||
202 | static void ni_dump_regs(struct comedi_device * dev) | 202 | static void ni_dump_regs(struct comedi_device *dev) |
203 | { | 203 | { |
204 | rt_printk("config bits 0x%x\n", devpriv->config_bits); | 204 | rt_printk("config bits 0x%x\n", devpriv->config_bits); |
205 | rt_printk("irq dma bits 0x%x\n", devpriv->irq_dma_bits); | 205 | rt_printk("irq dma bits 0x%x\n", devpriv->irq_dma_bits); |
@@ -318,13 +318,13 @@ static irqreturn_t a2150_interrupt(int irq, void *d) | |||
318 | } | 318 | } |
319 | 319 | ||
320 | /* probes board type, returns offset */ | 320 | /* probes board type, returns offset */ |
321 | static int a2150_probe(struct comedi_device * dev) | 321 | static int a2150_probe(struct comedi_device *dev) |
322 | { | 322 | { |
323 | int status = inw(dev->iobase + STATUS_REG); | 323 | int status = inw(dev->iobase + STATUS_REG); |
324 | return ID_BITS(status); | 324 | return ID_BITS(status); |
325 | } | 325 | } |
326 | 326 | ||
327 | static int a2150_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 327 | static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
328 | { | 328 | { |
329 | struct comedi_subdevice *s; | 329 | struct comedi_subdevice *s; |
330 | unsigned long iobase = it->options[0]; | 330 | unsigned long iobase = it->options[0]; |
@@ -449,7 +449,7 @@ static int a2150_attach(struct comedi_device * dev, struct comedi_devconfig * it | |||
449 | return 0; | 449 | return 0; |
450 | }; | 450 | }; |
451 | 451 | ||
452 | static int a2150_detach(struct comedi_device * dev) | 452 | static int a2150_detach(struct comedi_device *dev) |
453 | { | 453 | { |
454 | printk("comedi%d: %s: remove\n", dev->minor, driver_a2150.driver_name); | 454 | printk("comedi%d: %s: remove\n", dev->minor, driver_a2150.driver_name); |
455 | 455 | ||
@@ -472,7 +472,7 @@ static int a2150_detach(struct comedi_device * dev) | |||
472 | return 0; | 472 | return 0; |
473 | }; | 473 | }; |
474 | 474 | ||
475 | static int a2150_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 475 | static int a2150_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
476 | { | 476 | { |
477 | /* disable dma on card */ | 477 | /* disable dma on card */ |
478 | devpriv->irq_dma_bits &= ~DMA_INTR_EN_BIT & ~DMA_EN_BIT; | 478 | devpriv->irq_dma_bits &= ~DMA_INTR_EN_BIT & ~DMA_EN_BIT; |
@@ -487,8 +487,8 @@ static int a2150_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | |||
487 | return 0; | 487 | return 0; |
488 | } | 488 | } |
489 | 489 | ||
490 | static int a2150_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 490 | static int a2150_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
491 | struct comedi_cmd * cmd) | 491 | struct comedi_cmd *cmd) |
492 | { | 492 | { |
493 | int err = 0; | 493 | int err = 0; |
494 | int tmp; | 494 | int tmp; |
@@ -617,7 +617,7 @@ static int a2150_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice | |||
617 | return 0; | 617 | return 0; |
618 | } | 618 | } |
619 | 619 | ||
620 | static int a2150_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 620 | static int a2150_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
621 | { | 621 | { |
622 | struct comedi_async *async = s->async; | 622 | struct comedi_async *async = s->async; |
623 | struct comedi_cmd *cmd = &async->cmd; | 623 | struct comedi_cmd *cmd = &async->cmd; |
@@ -728,8 +728,8 @@ static int a2150_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
728 | return 0; | 728 | return 0; |
729 | } | 729 | } |
730 | 730 | ||
731 | static int a2150_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 731 | static int a2150_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
732 | struct comedi_insn * insn, unsigned int * data) | 732 | struct comedi_insn *insn, unsigned int *data) |
733 | { | 733 | { |
734 | unsigned int i, n; | 734 | unsigned int i, n; |
735 | static const int timeout = 100000; | 735 | static const int timeout = 100000; |
@@ -802,7 +802,7 @@ static int a2150_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * | |||
802 | 802 | ||
803 | /* sets bits in devpriv->clock_bits to nearest approximation of requested period, | 803 | /* sets bits in devpriv->clock_bits to nearest approximation of requested period, |
804 | * adjusts requested period to actual timing. */ | 804 | * adjusts requested period to actual timing. */ |
805 | static int a2150_get_timing(struct comedi_device * dev, unsigned int *period, | 805 | static int a2150_get_timing(struct comedi_device *dev, unsigned int *period, |
806 | int flags) | 806 | int flags) |
807 | { | 807 | { |
808 | int lub, glb, temp; | 808 | int lub, glb, temp; |
@@ -876,7 +876,7 @@ static int a2150_get_timing(struct comedi_device * dev, unsigned int *period, | |||
876 | return 0; | 876 | return 0; |
877 | } | 877 | } |
878 | 878 | ||
879 | static int a2150_set_chanlist(struct comedi_device * dev, unsigned int start_channel, | 879 | static int a2150_set_chanlist(struct comedi_device *dev, unsigned int start_channel, |
880 | unsigned int num_channels) | 880 | unsigned int num_channels) |
881 | { | 881 | { |
882 | if (start_channel + num_channels > 4) | 882 | if (start_channel + num_channels > 4) |
diff --git a/drivers/staging/comedi/drivers/ni_at_ao.c b/drivers/staging/comedi/drivers/ni_at_ao.c index 089fb428b41..282457ccefb 100644 --- a/drivers/staging/comedi/drivers/ni_at_ao.c +++ b/drivers/staging/comedi/drivers/ni_at_ao.c | |||
@@ -181,8 +181,8 @@ struct atao_private { | |||
181 | 181 | ||
182 | #define devpriv ((struct atao_private *)dev->private) | 182 | #define devpriv ((struct atao_private *)dev->private) |
183 | 183 | ||
184 | static int atao_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 184 | static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
185 | static int atao_detach(struct comedi_device * dev); | 185 | static int atao_detach(struct comedi_device *dev); |
186 | static struct comedi_driver driver_atao = { | 186 | static struct comedi_driver driver_atao = { |
187 | driver_name:"ni_at_ao", | 187 | driver_name:"ni_at_ao", |
188 | module:THIS_MODULE, | 188 | module:THIS_MODULE, |
@@ -195,22 +195,22 @@ static struct comedi_driver driver_atao = { | |||
195 | 195 | ||
196 | COMEDI_INITCLEANUP(driver_atao); | 196 | COMEDI_INITCLEANUP(driver_atao); |
197 | 197 | ||
198 | static void atao_reset(struct comedi_device * dev); | 198 | static void atao_reset(struct comedi_device *dev); |
199 | 199 | ||
200 | static int atao_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 200 | static int atao_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
201 | struct comedi_insn * insn, unsigned int * data); | 201 | struct comedi_insn *insn, unsigned int *data); |
202 | static int atao_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 202 | static int atao_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
203 | struct comedi_insn * insn, unsigned int * data); | 203 | struct comedi_insn *insn, unsigned int *data); |
204 | static int atao_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 204 | static int atao_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
205 | struct comedi_insn * insn, unsigned int * data); | 205 | struct comedi_insn *insn, unsigned int *data); |
206 | static int atao_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 206 | static int atao_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
207 | struct comedi_insn * insn, unsigned int * data); | 207 | struct comedi_insn *insn, unsigned int *data); |
208 | static int atao_calib_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 208 | static int atao_calib_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
209 | struct comedi_insn * insn, unsigned int * data); | 209 | struct comedi_insn *insn, unsigned int *data); |
210 | static int atao_calib_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 210 | static int atao_calib_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
211 | struct comedi_insn * insn, unsigned int * data); | 211 | struct comedi_insn *insn, unsigned int *data); |
212 | 212 | ||
213 | static int atao_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 213 | static int atao_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
214 | { | 214 | { |
215 | struct comedi_subdevice *s; | 215 | struct comedi_subdevice *s; |
216 | unsigned long iobase; | 216 | unsigned long iobase; |
@@ -283,7 +283,7 @@ static int atao_attach(struct comedi_device * dev, struct comedi_devconfig * it) | |||
283 | return 0; | 283 | return 0; |
284 | } | 284 | } |
285 | 285 | ||
286 | static int atao_detach(struct comedi_device * dev) | 286 | static int atao_detach(struct comedi_device *dev) |
287 | { | 287 | { |
288 | printk("comedi%d: atao: remove\n", dev->minor); | 288 | printk("comedi%d: atao: remove\n", dev->minor); |
289 | 289 | ||
@@ -293,7 +293,7 @@ static int atao_detach(struct comedi_device * dev) | |||
293 | return 0; | 293 | return 0; |
294 | } | 294 | } |
295 | 295 | ||
296 | static void atao_reset(struct comedi_device * dev) | 296 | static void atao_reset(struct comedi_device *dev) |
297 | { | 297 | { |
298 | /* This is the reset sequence described in the manual */ | 298 | /* This is the reset sequence described in the manual */ |
299 | 299 | ||
@@ -323,8 +323,8 @@ static void atao_reset(struct comedi_device * dev) | |||
323 | outw(devpriv->cfg1, dev->iobase + ATAO_CFG1); | 323 | outw(devpriv->cfg1, dev->iobase + ATAO_CFG1); |
324 | } | 324 | } |
325 | 325 | ||
326 | static int atao_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 326 | static int atao_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
327 | struct comedi_insn * insn, unsigned int * data) | 327 | struct comedi_insn *insn, unsigned int *data) |
328 | { | 328 | { |
329 | int i; | 329 | int i; |
330 | int chan = CR_CHAN(insn->chanspec); | 330 | int chan = CR_CHAN(insn->chanspec); |
@@ -347,8 +347,8 @@ static int atao_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s | |||
347 | return i; | 347 | return i; |
348 | } | 348 | } |
349 | 349 | ||
350 | static int atao_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 350 | static int atao_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
351 | struct comedi_insn * insn, unsigned int * data) | 351 | struct comedi_insn *insn, unsigned int *data) |
352 | { | 352 | { |
353 | int i; | 353 | int i; |
354 | int chan = CR_CHAN(insn->chanspec); | 354 | int chan = CR_CHAN(insn->chanspec); |
@@ -359,8 +359,8 @@ static int atao_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s | |||
359 | return i; | 359 | return i; |
360 | } | 360 | } |
361 | 361 | ||
362 | static int atao_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 362 | static int atao_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
363 | struct comedi_insn * insn, unsigned int * data) | 363 | struct comedi_insn *insn, unsigned int *data) |
364 | { | 364 | { |
365 | if (insn->n != 2) | 365 | if (insn->n != 2) |
366 | return -EINVAL; | 366 | return -EINVAL; |
@@ -376,8 +376,8 @@ static int atao_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevic | |||
376 | return 2; | 376 | return 2; |
377 | } | 377 | } |
378 | 378 | ||
379 | static int atao_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 379 | static int atao_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
380 | struct comedi_insn * insn, unsigned int * data) | 380 | struct comedi_insn *insn, unsigned int *data) |
381 | { | 381 | { |
382 | int chan = CR_CHAN(insn->chanspec); | 382 | int chan = CR_CHAN(insn->chanspec); |
383 | unsigned int mask, bit; | 383 | unsigned int mask, bit; |
@@ -421,8 +421,8 @@ static int atao_dio_insn_config(struct comedi_device * dev, struct comedi_subdev | |||
421 | * DACs. It is not explicitly stated in the manual how to access | 421 | * DACs. It is not explicitly stated in the manual how to access |
422 | * the caldacs, but we can guess. | 422 | * the caldacs, but we can guess. |
423 | */ | 423 | */ |
424 | static int atao_calib_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 424 | static int atao_calib_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
425 | struct comedi_insn * insn, unsigned int * data) | 425 | struct comedi_insn *insn, unsigned int *data) |
426 | { | 426 | { |
427 | int i; | 427 | int i; |
428 | for (i = 0; i < insn->n; i++) { | 428 | for (i = 0; i < insn->n; i++) { |
@@ -431,8 +431,8 @@ static int atao_calib_insn_read(struct comedi_device * dev, struct comedi_subdev | |||
431 | return insn->n; | 431 | return insn->n; |
432 | } | 432 | } |
433 | 433 | ||
434 | static int atao_calib_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 434 | static int atao_calib_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
435 | struct comedi_insn * insn, unsigned int * data) | 435 | struct comedi_insn *insn, unsigned int *data) |
436 | { | 436 | { |
437 | unsigned int bitstring, bit; | 437 | unsigned int bitstring, bit; |
438 | unsigned int chan = CR_CHAN(insn->chanspec); | 438 | unsigned int chan = CR_CHAN(insn->chanspec); |
diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c index dcd44874aaf..8de904832dc 100644 --- a/drivers/staging/comedi/drivers/ni_atmio.c +++ b/drivers/staging/comedi/drivers/ni_atmio.c | |||
@@ -297,7 +297,7 @@ struct ni_private { | |||
297 | * read/written directly in the I/O space of the board. The | 297 | * read/written directly in the I/O space of the board. The |
298 | * AT-MIO devices map the low 8 STC registers to iobase+addr*2. */ | 298 | * AT-MIO devices map the low 8 STC registers to iobase+addr*2. */ |
299 | 299 | ||
300 | static void ni_atmio_win_out(struct comedi_device * dev, uint16_t data, int addr) | 300 | static void ni_atmio_win_out(struct comedi_device *dev, uint16_t data, int addr) |
301 | { | 301 | { |
302 | unsigned long flags; | 302 | unsigned long flags; |
303 | 303 | ||
@@ -311,7 +311,7 @@ static void ni_atmio_win_out(struct comedi_device * dev, uint16_t data, int addr | |||
311 | comedi_spin_unlock_irqrestore(&devpriv->window_lock, flags); | 311 | comedi_spin_unlock_irqrestore(&devpriv->window_lock, flags); |
312 | } | 312 | } |
313 | 313 | ||
314 | static uint16_t ni_atmio_win_in(struct comedi_device * dev, int addr) | 314 | static uint16_t ni_atmio_win_in(struct comedi_device *dev, int addr) |
315 | { | 315 | { |
316 | unsigned long flags; | 316 | unsigned long flags; |
317 | uint16_t ret; | 317 | uint16_t ret; |
@@ -339,8 +339,8 @@ static struct pnp_device_id device_ids[] = { | |||
339 | 339 | ||
340 | MODULE_DEVICE_TABLE(pnp, device_ids); | 340 | MODULE_DEVICE_TABLE(pnp, device_ids); |
341 | 341 | ||
342 | static int ni_atmio_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 342 | static int ni_atmio_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
343 | static int ni_atmio_detach(struct comedi_device * dev); | 343 | static int ni_atmio_detach(struct comedi_device *dev); |
344 | static struct comedi_driver driver_atmio = { | 344 | static struct comedi_driver driver_atmio = { |
345 | driver_name:"ni_atmio", | 345 | driver_name:"ni_atmio", |
346 | module:THIS_MODULE, | 346 | module:THIS_MODULE, |
@@ -352,10 +352,10 @@ COMEDI_INITCLEANUP(driver_atmio); | |||
352 | 352 | ||
353 | #include "ni_mio_common.c" | 353 | #include "ni_mio_common.c" |
354 | 354 | ||
355 | static int ni_getboardtype(struct comedi_device * dev); | 355 | static int ni_getboardtype(struct comedi_device *dev); |
356 | 356 | ||
357 | /* clean up allocated resources */ | 357 | /* clean up allocated resources */ |
358 | static int ni_atmio_detach(struct comedi_device * dev) | 358 | static int ni_atmio_detach(struct comedi_device *dev) |
359 | { | 359 | { |
360 | mio_common_detach(dev); | 360 | mio_common_detach(dev); |
361 | 361 | ||
@@ -405,7 +405,7 @@ static int ni_isapnp_find_board(struct pnp_dev **dev) | |||
405 | return 0; | 405 | return 0; |
406 | } | 406 | } |
407 | 407 | ||
408 | static int ni_atmio_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 408 | static int ni_atmio_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
409 | { | 409 | { |
410 | struct pnp_dev *isapnp_dev; | 410 | struct pnp_dev *isapnp_dev; |
411 | int ret; | 411 | int ret; |
@@ -493,7 +493,7 @@ static int ni_atmio_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
493 | return 0; | 493 | return 0; |
494 | } | 494 | } |
495 | 495 | ||
496 | static int ni_getboardtype(struct comedi_device * dev) | 496 | static int ni_getboardtype(struct comedi_device *dev) |
497 | { | 497 | { |
498 | int device_id = ni_read_eeprom(dev, 511); | 498 | int device_id = ni_read_eeprom(dev, 511); |
499 | int i; | 499 | int i; |
diff --git a/drivers/staging/comedi/drivers/ni_atmio16d.c b/drivers/staging/comedi/drivers/ni_atmio16d.c index 44b67ec86c3..442bfe717a1 100644 --- a/drivers/staging/comedi/drivers/ni_atmio16d.c +++ b/drivers/staging/comedi/drivers/ni_atmio16d.c | |||
@@ -187,7 +187,7 @@ struct atmio16d_private { | |||
187 | unsigned int com_reg_2_state; /* current state of command register 2 */ | 187 | unsigned int com_reg_2_state; /* current state of command register 2 */ |
188 | }; | 188 | }; |
189 | 189 | ||
190 | static void reset_counters(struct comedi_device * dev) | 190 | static void reset_counters(struct comedi_device *dev) |
191 | { | 191 | { |
192 | /* Counter 2 */ | 192 | /* Counter 2 */ |
193 | outw(0xFFC2, dev->iobase + AM9513A_COM_REG); | 193 | outw(0xFFC2, dev->iobase + AM9513A_COM_REG); |
@@ -225,7 +225,7 @@ static void reset_counters(struct comedi_device * dev) | |||
225 | outw(0, dev->iobase + AD_CLEAR_REG); | 225 | outw(0, dev->iobase + AD_CLEAR_REG); |
226 | } | 226 | } |
227 | 227 | ||
228 | static void reset_atmio16d(struct comedi_device * dev) | 228 | static void reset_atmio16d(struct comedi_device *dev) |
229 | { | 229 | { |
230 | int i; | 230 | int i; |
231 | 231 | ||
@@ -270,8 +270,8 @@ static irqreturn_t atmio16d_interrupt(int irq, void *d) | |||
270 | return IRQ_HANDLED; | 270 | return IRQ_HANDLED; |
271 | } | 271 | } |
272 | 272 | ||
273 | static int atmio16d_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 273 | static int atmio16d_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
274 | struct comedi_cmd * cmd) | 274 | struct comedi_cmd *cmd) |
275 | { | 275 | { |
276 | int err = 0, tmp; | 276 | int err = 0, tmp; |
277 | #ifdef DEBUG1 | 277 | #ifdef DEBUG1 |
@@ -371,7 +371,7 @@ static int atmio16d_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevi | |||
371 | return 0; | 371 | return 0; |
372 | } | 372 | } |
373 | 373 | ||
374 | static int atmio16d_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 374 | static int atmio16d_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
375 | { | 375 | { |
376 | struct comedi_cmd *cmd = &s->async->cmd; | 376 | struct comedi_cmd *cmd = &s->async->cmd; |
377 | unsigned int timer, base_clock; | 377 | unsigned int timer, base_clock; |
@@ -519,7 +519,7 @@ static int atmio16d_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * | |||
519 | } | 519 | } |
520 | 520 | ||
521 | /* This will cancel a running acquisition operation */ | 521 | /* This will cancel a running acquisition operation */ |
522 | static int atmio16d_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 522 | static int atmio16d_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
523 | { | 523 | { |
524 | reset_atmio16d(dev); | 524 | reset_atmio16d(dev); |
525 | 525 | ||
@@ -527,8 +527,8 @@ static int atmio16d_ai_cancel(struct comedi_device * dev, struct comedi_subdevic | |||
527 | } | 527 | } |
528 | 528 | ||
529 | /* Mode 0 is used to get a single conversion on demand */ | 529 | /* Mode 0 is used to get a single conversion on demand */ |
530 | static int atmio16d_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 530 | static int atmio16d_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
531 | struct comedi_insn * insn, unsigned int * data) | 531 | struct comedi_insn *insn, unsigned int *data) |
532 | { | 532 | { |
533 | int i, t; | 533 | int i, t; |
534 | int chan; | 534 | int chan; |
@@ -586,8 +586,8 @@ static int atmio16d_ai_insn_read(struct comedi_device * dev, struct comedi_subde | |||
586 | return i; | 586 | return i; |
587 | } | 587 | } |
588 | 588 | ||
589 | static int atmio16d_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 589 | static int atmio16d_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
590 | struct comedi_insn * insn, unsigned int * data) | 590 | struct comedi_insn *insn, unsigned int *data) |
591 | { | 591 | { |
592 | int i; | 592 | int i; |
593 | #ifdef DEBUG1 | 593 | #ifdef DEBUG1 |
@@ -601,8 +601,8 @@ static int atmio16d_ao_insn_read(struct comedi_device * dev, struct comedi_subde | |||
601 | return i; | 601 | return i; |
602 | } | 602 | } |
603 | 603 | ||
604 | static int atmio16d_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 604 | static int atmio16d_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
605 | struct comedi_insn * insn, unsigned int * data) | 605 | struct comedi_insn *insn, unsigned int *data) |
606 | { | 606 | { |
607 | int i; | 607 | int i; |
608 | int chan; | 608 | int chan; |
@@ -636,8 +636,8 @@ static int atmio16d_ao_insn_write(struct comedi_device * dev, struct comedi_subd | |||
636 | return i; | 636 | return i; |
637 | } | 637 | } |
638 | 638 | ||
639 | static int atmio16d_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 639 | static int atmio16d_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
640 | struct comedi_insn * insn, unsigned int * data) | 640 | struct comedi_insn *insn, unsigned int *data) |
641 | { | 641 | { |
642 | if (insn->n != 2) | 642 | if (insn->n != 2) |
643 | return -EINVAL; | 643 | return -EINVAL; |
@@ -652,8 +652,8 @@ static int atmio16d_dio_insn_bits(struct comedi_device * dev, struct comedi_subd | |||
652 | return 2; | 652 | return 2; |
653 | } | 653 | } |
654 | 654 | ||
655 | static int atmio16d_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 655 | static int atmio16d_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
656 | struct comedi_insn * insn, unsigned int * data) | 656 | struct comedi_insn *insn, unsigned int *data) |
657 | { | 657 | { |
658 | int i; | 658 | int i; |
659 | int mask; | 659 | int mask; |
@@ -706,7 +706,7 @@ static int atmio16d_dio_insn_config(struct comedi_device * dev, struct comedi_su | |||
706 | options[12] - dac1 coding | 706 | options[12] - dac1 coding |
707 | */ | 707 | */ |
708 | 708 | ||
709 | static int atmio16d_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 709 | static int atmio16d_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
710 | { | 710 | { |
711 | unsigned int irq; | 711 | unsigned int irq; |
712 | unsigned long iobase; | 712 | unsigned long iobase; |
@@ -841,7 +841,7 @@ static int atmio16d_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
841 | return 0; | 841 | return 0; |
842 | } | 842 | } |
843 | 843 | ||
844 | static int atmio16d_detach(struct comedi_device * dev) | 844 | static int atmio16d_detach(struct comedi_device *dev) |
845 | { | 845 | { |
846 | printk("comedi%d: atmio16d: remove\n", dev->minor); | 846 | printk("comedi%d: atmio16d: remove\n", dev->minor); |
847 | 847 | ||
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index cbefda8e9de..21c71c9b300 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c | |||
@@ -55,8 +55,8 @@ static struct pcmcia_device *pcmcia_cur_dev = NULL; | |||
55 | 55 | ||
56 | #define DIO700_SIZE 8 /* size of io region used by board */ | 56 | #define DIO700_SIZE 8 /* size of io region used by board */ |
57 | 57 | ||
58 | static int dio700_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 58 | static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
59 | static int dio700_detach(struct comedi_device * dev); | 59 | static int dio700_detach(struct comedi_device *dev); |
60 | 60 | ||
61 | enum dio700_bustype { pcmcia_bustype }; | 61 | enum dio700_bustype { pcmcia_bustype }; |
62 | 62 | ||
@@ -128,9 +128,9 @@ struct subdev_700_struct { | |||
128 | #define CALLBACK_FUNC (((struct subdev_700_struct *)s->private)->cb_func) | 128 | #define CALLBACK_FUNC (((struct subdev_700_struct *)s->private)->cb_func) |
129 | #define subdevpriv ((struct subdev_700_struct *)s->private) | 129 | #define subdevpriv ((struct subdev_700_struct *)s->private) |
130 | 130 | ||
131 | static void do_config(struct comedi_device * dev, struct comedi_subdevice * s); | 131 | static void do_config(struct comedi_device *dev, struct comedi_subdevice *s); |
132 | 132 | ||
133 | void subdev_700_interrupt(struct comedi_device * dev, struct comedi_subdevice * s) | 133 | void subdev_700_interrupt(struct comedi_device *dev, struct comedi_subdevice *s) |
134 | { | 134 | { |
135 | short d; | 135 | short d; |
136 | 136 | ||
@@ -155,8 +155,8 @@ static int subdev_700_cb(int dir, int port, int data, unsigned long arg) | |||
155 | } | 155 | } |
156 | } | 156 | } |
157 | 157 | ||
158 | static int subdev_700_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 158 | static int subdev_700_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
159 | struct comedi_insn * insn, unsigned int * data) | 159 | struct comedi_insn *insn, unsigned int *data) |
160 | { | 160 | { |
161 | if (data[0]) { | 161 | if (data[0]) { |
162 | s->state &= ~data[0]; | 162 | s->state &= ~data[0]; |
@@ -173,8 +173,8 @@ static int subdev_700_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
173 | return 2; | 173 | return 2; |
174 | } | 174 | } |
175 | 175 | ||
176 | static int subdev_700_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 176 | static int subdev_700_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
177 | struct comedi_insn * insn, unsigned int * data) | 177 | struct comedi_insn *insn, unsigned int *data) |
178 | { | 178 | { |
179 | 179 | ||
180 | switch (data[0]) { | 180 | switch (data[0]) { |
@@ -196,13 +196,13 @@ static int subdev_700_insn_config(struct comedi_device * dev, struct comedi_subd | |||
196 | return 1; | 196 | return 1; |
197 | } | 197 | } |
198 | 198 | ||
199 | static void do_config(struct comedi_device * dev, struct comedi_subdevice * s) | 199 | static void do_config(struct comedi_device *dev, struct comedi_subdevice *s) |
200 | { /* use powerup defaults */ | 200 | { /* use powerup defaults */ |
201 | return; | 201 | return; |
202 | } | 202 | } |
203 | 203 | ||
204 | static int subdev_700_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 204 | static int subdev_700_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
205 | struct comedi_cmd * cmd) | 205 | struct comedi_cmd *cmd) |
206 | { | 206 | { |
207 | int err = 0; | 207 | int err = 0; |
208 | unsigned int tmp; | 208 | unsigned int tmp; |
@@ -276,21 +276,21 @@ static int subdev_700_cmdtest(struct comedi_device * dev, struct comedi_subdevic | |||
276 | return 0; | 276 | return 0; |
277 | } | 277 | } |
278 | 278 | ||
279 | static int subdev_700_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 279 | static int subdev_700_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
280 | { | 280 | { |
281 | /* FIXME */ | 281 | /* FIXME */ |
282 | 282 | ||
283 | return 0; | 283 | return 0; |
284 | } | 284 | } |
285 | 285 | ||
286 | static int subdev_700_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 286 | static int subdev_700_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
287 | { | 287 | { |
288 | /* FIXME */ | 288 | /* FIXME */ |
289 | 289 | ||
290 | return 0; | 290 | return 0; |
291 | } | 291 | } |
292 | 292 | ||
293 | int subdev_700_init(struct comedi_device * dev, struct comedi_subdevice * s, int (*cb) (int, | 293 | int subdev_700_init(struct comedi_device *dev, struct comedi_subdevice *s, int (*cb) (int, |
294 | int, int, unsigned long), unsigned long arg) | 294 | int, int, unsigned long), unsigned long arg) |
295 | { | 295 | { |
296 | s->type = COMEDI_SUBD_DIO; | 296 | s->type = COMEDI_SUBD_DIO; |
@@ -319,7 +319,7 @@ int subdev_700_init(struct comedi_device * dev, struct comedi_subdevice * s, int | |||
319 | return 0; | 319 | return 0; |
320 | } | 320 | } |
321 | 321 | ||
322 | int subdev_700_init_irq(struct comedi_device * dev, struct comedi_subdevice * s, | 322 | int subdev_700_init_irq(struct comedi_device *dev, struct comedi_subdevice *s, |
323 | int (*cb) (int, int, int, unsigned long), unsigned long arg) | 323 | int (*cb) (int, int, int, unsigned long), unsigned long arg) |
324 | { | 324 | { |
325 | int ret; | 325 | int ret; |
@@ -337,7 +337,7 @@ int subdev_700_init_irq(struct comedi_device * dev, struct comedi_subdevice * s, | |||
337 | return 0; | 337 | return 0; |
338 | } | 338 | } |
339 | 339 | ||
340 | void subdev_700_cleanup(struct comedi_device * dev, struct comedi_subdevice * s) | 340 | void subdev_700_cleanup(struct comedi_device *dev, struct comedi_subdevice *s) |
341 | { | 341 | { |
342 | if (s->private) { | 342 | if (s->private) { |
343 | if (subdevpriv->have_irq) { | 343 | if (subdevpriv->have_irq) { |
@@ -352,7 +352,7 @@ EXPORT_SYMBOL(subdev_700_init_irq); | |||
352 | EXPORT_SYMBOL(subdev_700_cleanup); | 352 | EXPORT_SYMBOL(subdev_700_cleanup); |
353 | EXPORT_SYMBOL(subdev_700_interrupt); | 353 | EXPORT_SYMBOL(subdev_700_interrupt); |
354 | 354 | ||
355 | static int dio700_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 355 | static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
356 | { | 356 | { |
357 | struct comedi_subdevice *s; | 357 | struct comedi_subdevice *s; |
358 | unsigned long iobase = 0; | 358 | unsigned long iobase = 0; |
@@ -415,7 +415,7 @@ static int dio700_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
415 | return 0; | 415 | return 0; |
416 | }; | 416 | }; |
417 | 417 | ||
418 | static int dio700_detach(struct comedi_device * dev) | 418 | static int dio700_detach(struct comedi_device *dev) |
419 | { | 419 | { |
420 | printk("comedi%d: ni_daq_700: cs-remove\n", dev->minor); | 420 | printk("comedi%d: ni_daq_700: cs-remove\n", dev->minor); |
421 | 421 | ||
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c index 7f9e502403c..6474591eb0c 100644 --- a/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c | |||
@@ -56,8 +56,8 @@ static struct pcmcia_device *pcmcia_cur_dev = NULL; | |||
56 | 56 | ||
57 | #define DIO24_SIZE 4 /* size of io region used by board */ | 57 | #define DIO24_SIZE 4 /* size of io region used by board */ |
58 | 58 | ||
59 | static int dio24_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 59 | static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
60 | static int dio24_detach(struct comedi_device * dev); | 60 | static int dio24_detach(struct comedi_device *dev); |
61 | 61 | ||
62 | enum dio24_bustype { pcmcia_bustype }; | 62 | enum dio24_bustype { pcmcia_bustype }; |
63 | 63 | ||
@@ -109,7 +109,7 @@ static struct comedi_driver driver_dio24 = { | |||
109 | offset:sizeof(struct dio24_board_struct), | 109 | offset:sizeof(struct dio24_board_struct), |
110 | }; | 110 | }; |
111 | 111 | ||
112 | static int dio24_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 112 | static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
113 | { | 113 | { |
114 | struct comedi_subdevice *s; | 114 | struct comedi_subdevice *s; |
115 | unsigned long iobase = 0; | 115 | unsigned long iobase = 0; |
@@ -172,7 +172,7 @@ static int dio24_attach(struct comedi_device * dev, struct comedi_devconfig * it | |||
172 | return 0; | 172 | return 0; |
173 | }; | 173 | }; |
174 | 174 | ||
175 | static int dio24_detach(struct comedi_device * dev) | 175 | static int dio24_detach(struct comedi_device *dev) |
176 | { | 176 | { |
177 | printk("comedi%d: ni_daq_dio24: remove\n", dev->minor); | 177 | printk("comedi%d: ni_daq_dio24: remove\n", dev->minor); |
178 | 178 | ||
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 15172c20251..caec783ca89 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c | |||
@@ -448,7 +448,7 @@ static DEFINE_PCI_DEVICE_TABLE(labpc_pci_table) = { | |||
448 | MODULE_DEVICE_TABLE(pci, labpc_pci_table); | 448 | MODULE_DEVICE_TABLE(pci, labpc_pci_table); |
449 | #endif /* CONFIG_COMEDI_PCI */ | 449 | #endif /* CONFIG_COMEDI_PCI */ |
450 | 450 | ||
451 | static inline int labpc_counter_load(struct comedi_device * dev, | 451 | static inline int labpc_counter_load(struct comedi_device *dev, |
452 | unsigned long base_address, unsigned int counter_number, | 452 | unsigned long base_address, unsigned int counter_number, |
453 | unsigned int count, unsigned int mode) | 453 | unsigned int count, unsigned int mode) |
454 | { | 454 | { |
@@ -459,7 +459,7 @@ static inline int labpc_counter_load(struct comedi_device * dev, | |||
459 | return i8254_load(base_address, 0, counter_number, count, mode); | 459 | return i8254_load(base_address, 0, counter_number, count, mode); |
460 | } | 460 | } |
461 | 461 | ||
462 | int labpc_common_attach(struct comedi_device * dev, unsigned long iobase, | 462 | int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, |
463 | unsigned int irq, unsigned int dma_chan) | 463 | unsigned int irq, unsigned int dma_chan) |
464 | { | 464 | { |
465 | struct comedi_subdevice *s; | 465 | struct comedi_subdevice *s; |
@@ -643,7 +643,7 @@ int labpc_common_attach(struct comedi_device * dev, unsigned long iobase, | |||
643 | return 0; | 643 | return 0; |
644 | } | 644 | } |
645 | 645 | ||
646 | static int labpc_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 646 | static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
647 | { | 647 | { |
648 | unsigned long iobase = 0; | 648 | unsigned long iobase = 0; |
649 | unsigned int irq = 0; | 649 | unsigned int irq = 0; |
@@ -724,7 +724,7 @@ static int labpc_find_device(struct comedi_device *dev, int bus, int slot) | |||
724 | } | 724 | } |
725 | #endif | 725 | #endif |
726 | 726 | ||
727 | int labpc_common_detach(struct comedi_device * dev) | 727 | int labpc_common_detach(struct comedi_device *dev) |
728 | { | 728 | { |
729 | printk("comedi%d: ni_labpc: detach\n", dev->minor); | 729 | printk("comedi%d: ni_labpc: detach\n", dev->minor); |
730 | 730 | ||
@@ -748,14 +748,14 @@ int labpc_common_detach(struct comedi_device * dev) | |||
748 | return 0; | 748 | return 0; |
749 | }; | 749 | }; |
750 | 750 | ||
751 | static void labpc_clear_adc_fifo(const struct comedi_device * dev) | 751 | static void labpc_clear_adc_fifo(const struct comedi_device *dev) |
752 | { | 752 | { |
753 | devpriv->write_byte(0x1, dev->iobase + ADC_CLEAR_REG); | 753 | devpriv->write_byte(0x1, dev->iobase + ADC_CLEAR_REG); |
754 | devpriv->read_byte(dev->iobase + ADC_FIFO_REG); | 754 | devpriv->read_byte(dev->iobase + ADC_FIFO_REG); |
755 | devpriv->read_byte(dev->iobase + ADC_FIFO_REG); | 755 | devpriv->read_byte(dev->iobase + ADC_FIFO_REG); |
756 | } | 756 | } |
757 | 757 | ||
758 | static int labpc_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 758 | static int labpc_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
759 | { | 759 | { |
760 | unsigned long flags; | 760 | unsigned long flags; |
761 | 761 | ||
@@ -770,7 +770,7 @@ static int labpc_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | |||
770 | return 0; | 770 | return 0; |
771 | } | 771 | } |
772 | 772 | ||
773 | static enum scan_mode labpc_ai_scan_mode(const struct comedi_cmd * cmd) | 773 | static enum scan_mode labpc_ai_scan_mode(const struct comedi_cmd *cmd) |
774 | { | 774 | { |
775 | if (cmd->chanlist_len == 1) | 775 | if (cmd->chanlist_len == 1) |
776 | return MODE_SINGLE_CHAN; | 776 | return MODE_SINGLE_CHAN; |
@@ -793,8 +793,8 @@ static enum scan_mode labpc_ai_scan_mode(const struct comedi_cmd * cmd) | |||
793 | return 0; | 793 | return 0; |
794 | } | 794 | } |
795 | 795 | ||
796 | static int labpc_ai_chanlist_invalid(const struct comedi_device * dev, | 796 | static int labpc_ai_chanlist_invalid(const struct comedi_device *dev, |
797 | const struct comedi_cmd * cmd) | 797 | const struct comedi_cmd *cmd) |
798 | { | 798 | { |
799 | int mode, channel, range, aref, i; | 799 | int mode, channel, range, aref, i; |
800 | 800 | ||
@@ -865,7 +865,7 @@ static int labpc_ai_chanlist_invalid(const struct comedi_device * dev, | |||
865 | return 0; | 865 | return 0; |
866 | } | 866 | } |
867 | 867 | ||
868 | static int labpc_use_continuous_mode(const struct comedi_cmd * cmd) | 868 | static int labpc_use_continuous_mode(const struct comedi_cmd *cmd) |
869 | { | 869 | { |
870 | if (labpc_ai_scan_mode(cmd) == MODE_SINGLE_CHAN) | 870 | if (labpc_ai_scan_mode(cmd) == MODE_SINGLE_CHAN) |
871 | return 1; | 871 | return 1; |
@@ -876,7 +876,7 @@ static int labpc_use_continuous_mode(const struct comedi_cmd * cmd) | |||
876 | return 0; | 876 | return 0; |
877 | } | 877 | } |
878 | 878 | ||
879 | static unsigned int labpc_ai_convert_period(const struct comedi_cmd * cmd) | 879 | static unsigned int labpc_ai_convert_period(const struct comedi_cmd *cmd) |
880 | { | 880 | { |
881 | if (cmd->convert_src != TRIG_TIMER) | 881 | if (cmd->convert_src != TRIG_TIMER) |
882 | return 0; | 882 | return 0; |
@@ -888,7 +888,7 @@ static unsigned int labpc_ai_convert_period(const struct comedi_cmd * cmd) | |||
888 | return cmd->convert_arg; | 888 | return cmd->convert_arg; |
889 | } | 889 | } |
890 | 890 | ||
891 | static void labpc_set_ai_convert_period(struct comedi_cmd * cmd, unsigned int ns) | 891 | static void labpc_set_ai_convert_period(struct comedi_cmd *cmd, unsigned int ns) |
892 | { | 892 | { |
893 | if (cmd->convert_src != TRIG_TIMER) | 893 | if (cmd->convert_src != TRIG_TIMER) |
894 | return; | 894 | return; |
@@ -902,7 +902,7 @@ static void labpc_set_ai_convert_period(struct comedi_cmd * cmd, unsigned int ns | |||
902 | cmd->convert_arg = ns; | 902 | cmd->convert_arg = ns; |
903 | } | 903 | } |
904 | 904 | ||
905 | static unsigned int labpc_ai_scan_period(const struct comedi_cmd * cmd) | 905 | static unsigned int labpc_ai_scan_period(const struct comedi_cmd *cmd) |
906 | { | 906 | { |
907 | if (cmd->scan_begin_src != TRIG_TIMER) | 907 | if (cmd->scan_begin_src != TRIG_TIMER) |
908 | return 0; | 908 | return 0; |
@@ -914,7 +914,7 @@ static unsigned int labpc_ai_scan_period(const struct comedi_cmd * cmd) | |||
914 | return cmd->scan_begin_arg; | 914 | return cmd->scan_begin_arg; |
915 | } | 915 | } |
916 | 916 | ||
917 | static void labpc_set_ai_scan_period(struct comedi_cmd * cmd, unsigned int ns) | 917 | static void labpc_set_ai_scan_period(struct comedi_cmd *cmd, unsigned int ns) |
918 | { | 918 | { |
919 | if (cmd->scan_begin_src != TRIG_TIMER) | 919 | if (cmd->scan_begin_src != TRIG_TIMER) |
920 | return; | 920 | return; |
@@ -926,8 +926,8 @@ static void labpc_set_ai_scan_period(struct comedi_cmd * cmd, unsigned int ns) | |||
926 | cmd->scan_begin_arg = ns; | 926 | cmd->scan_begin_arg = ns; |
927 | } | 927 | } |
928 | 928 | ||
929 | static int labpc_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 929 | static int labpc_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
930 | struct comedi_cmd * cmd) | 930 | struct comedi_cmd *cmd) |
931 | { | 931 | { |
932 | int err = 0; | 932 | int err = 0; |
933 | int tmp, tmp2; | 933 | int tmp, tmp2; |
@@ -1063,7 +1063,7 @@ static int labpc_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice | |||
1063 | return 0; | 1063 | return 0; |
1064 | } | 1064 | } |
1065 | 1065 | ||
1066 | static int labpc_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 1066 | static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
1067 | { | 1067 | { |
1068 | int channel, range, aref; | 1068 | int channel, range, aref; |
1069 | unsigned long irq_flags; | 1069 | unsigned long irq_flags; |
@@ -1393,7 +1393,7 @@ static irqreturn_t labpc_interrupt(int irq, void *d) | |||
1393 | } | 1393 | } |
1394 | 1394 | ||
1395 | /* read all available samples from ai fifo */ | 1395 | /* read all available samples from ai fifo */ |
1396 | static int labpc_drain_fifo(struct comedi_device * dev) | 1396 | static int labpc_drain_fifo(struct comedi_device *dev) |
1397 | { | 1397 | { |
1398 | unsigned int lsb, msb; | 1398 | unsigned int lsb, msb; |
1399 | short data; | 1399 | short data; |
@@ -1427,7 +1427,7 @@ static int labpc_drain_fifo(struct comedi_device * dev) | |||
1427 | return 0; | 1427 | return 0; |
1428 | } | 1428 | } |
1429 | 1429 | ||
1430 | static void labpc_drain_dma(struct comedi_device * dev) | 1430 | static void labpc_drain_dma(struct comedi_device *dev) |
1431 | { | 1431 | { |
1432 | struct comedi_subdevice *s = dev->read_subdev; | 1432 | struct comedi_subdevice *s = dev->read_subdev; |
1433 | struct comedi_async *async = s->async; | 1433 | struct comedi_async *async = s->async; |
@@ -1480,7 +1480,7 @@ static void labpc_drain_dma(struct comedi_device * dev) | |||
1480 | async->events |= COMEDI_CB_BLOCK; | 1480 | async->events |= COMEDI_CB_BLOCK; |
1481 | } | 1481 | } |
1482 | 1482 | ||
1483 | static void handle_isa_dma(struct comedi_device * dev) | 1483 | static void handle_isa_dma(struct comedi_device *dev) |
1484 | { | 1484 | { |
1485 | labpc_drain_dma(dev); | 1485 | labpc_drain_dma(dev); |
1486 | 1486 | ||
@@ -1492,7 +1492,7 @@ static void handle_isa_dma(struct comedi_device * dev) | |||
1492 | 1492 | ||
1493 | /* makes sure all data aquired by board is transfered to comedi (used | 1493 | /* makes sure all data aquired by board is transfered to comedi (used |
1494 | * when aquisition is terminated by stop_src == TRIG_EXT). */ | 1494 | * when aquisition is terminated by stop_src == TRIG_EXT). */ |
1495 | static void labpc_drain_dregs(struct comedi_device * dev) | 1495 | static void labpc_drain_dregs(struct comedi_device *dev) |
1496 | { | 1496 | { |
1497 | if (devpriv->current_transfer == isa_dma_transfer) | 1497 | if (devpriv->current_transfer == isa_dma_transfer) |
1498 | labpc_drain_dma(dev); | 1498 | labpc_drain_dma(dev); |
@@ -1500,8 +1500,8 @@ static void labpc_drain_dregs(struct comedi_device * dev) | |||
1500 | labpc_drain_fifo(dev); | 1500 | labpc_drain_fifo(dev); |
1501 | } | 1501 | } |
1502 | 1502 | ||
1503 | static int labpc_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 1503 | static int labpc_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
1504 | struct comedi_insn * insn, unsigned int * data) | 1504 | struct comedi_insn *insn, unsigned int *data) |
1505 | { | 1505 | { |
1506 | int i, n; | 1506 | int i, n; |
1507 | int chan, range; | 1507 | int chan, range; |
@@ -1586,8 +1586,8 @@ static int labpc_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * | |||
1586 | } | 1586 | } |
1587 | 1587 | ||
1588 | /* analog output insn */ | 1588 | /* analog output insn */ |
1589 | static int labpc_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 1589 | static int labpc_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
1590 | struct comedi_insn * insn, unsigned int * data) | 1590 | struct comedi_insn *insn, unsigned int *data) |
1591 | { | 1591 | { |
1592 | int channel, range; | 1592 | int channel, range; |
1593 | unsigned long flags; | 1593 | unsigned long flags; |
@@ -1627,24 +1627,24 @@ static int labpc_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * | |||
1627 | } | 1627 | } |
1628 | 1628 | ||
1629 | /* analog output readback insn */ | 1629 | /* analog output readback insn */ |
1630 | static int labpc_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 1630 | static int labpc_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
1631 | struct comedi_insn * insn, unsigned int * data) | 1631 | struct comedi_insn *insn, unsigned int *data) |
1632 | { | 1632 | { |
1633 | data[0] = devpriv->ao_value[CR_CHAN(insn->chanspec)]; | 1633 | data[0] = devpriv->ao_value[CR_CHAN(insn->chanspec)]; |
1634 | 1634 | ||
1635 | return 1; | 1635 | return 1; |
1636 | } | 1636 | } |
1637 | 1637 | ||
1638 | static int labpc_calib_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 1638 | static int labpc_calib_read_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
1639 | struct comedi_insn * insn, unsigned int * data) | 1639 | struct comedi_insn *insn, unsigned int *data) |
1640 | { | 1640 | { |
1641 | data[0] = devpriv->caldac[CR_CHAN(insn->chanspec)]; | 1641 | data[0] = devpriv->caldac[CR_CHAN(insn->chanspec)]; |
1642 | 1642 | ||
1643 | return 1; | 1643 | return 1; |
1644 | } | 1644 | } |
1645 | 1645 | ||
1646 | static int labpc_calib_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 1646 | static int labpc_calib_write_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
1647 | struct comedi_insn * insn, unsigned int * data) | 1647 | struct comedi_insn *insn, unsigned int *data) |
1648 | { | 1648 | { |
1649 | int channel = CR_CHAN(insn->chanspec); | 1649 | int channel = CR_CHAN(insn->chanspec); |
1650 | 1650 | ||
@@ -1652,16 +1652,16 @@ static int labpc_calib_write_insn(struct comedi_device * dev, struct comedi_subd | |||
1652 | return 1; | 1652 | return 1; |
1653 | } | 1653 | } |
1654 | 1654 | ||
1655 | static int labpc_eeprom_read_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 1655 | static int labpc_eeprom_read_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
1656 | struct comedi_insn * insn, unsigned int * data) | 1656 | struct comedi_insn *insn, unsigned int *data) |
1657 | { | 1657 | { |
1658 | data[0] = devpriv->eeprom_data[CR_CHAN(insn->chanspec)]; | 1658 | data[0] = devpriv->eeprom_data[CR_CHAN(insn->chanspec)]; |
1659 | 1659 | ||
1660 | return 1; | 1660 | return 1; |
1661 | } | 1661 | } |
1662 | 1662 | ||
1663 | static int labpc_eeprom_write_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 1663 | static int labpc_eeprom_write_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
1664 | struct comedi_insn * insn, unsigned int * data) | 1664 | struct comedi_insn *insn, unsigned int *data) |
1665 | { | 1665 | { |
1666 | int channel = CR_CHAN(insn->chanspec); | 1666 | int channel = CR_CHAN(insn->chanspec); |
1667 | int ret; | 1667 | int ret; |
@@ -1704,7 +1704,7 @@ static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd) | |||
1704 | } | 1704 | } |
1705 | 1705 | ||
1706 | /* figures out what counter values to use based on command */ | 1706 | /* figures out what counter values to use based on command */ |
1707 | static void labpc_adc_timing(struct comedi_device * dev, struct comedi_cmd * cmd) | 1707 | static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd) |
1708 | { | 1708 | { |
1709 | const int max_counter_value = 0x10000; /* max value for 16 bit counter in mode 2 */ | 1709 | const int max_counter_value = 0x10000; /* max value for 16 bit counter in mode 2 */ |
1710 | const int min_counter_value = 2; /* min value for 16 bit counter in mode 2 */ | 1710 | const int min_counter_value = 2; /* min value for 16 bit counter in mode 2 */ |
@@ -1796,7 +1796,7 @@ static int labpc_dio_mem_callback(int dir, int port, int data, | |||
1796 | } | 1796 | } |
1797 | 1797 | ||
1798 | /* lowlevel write to eeprom/dac */ | 1798 | /* lowlevel write to eeprom/dac */ |
1799 | static void labpc_serial_out(struct comedi_device * dev, unsigned int value, | 1799 | static void labpc_serial_out(struct comedi_device *dev, unsigned int value, |
1800 | unsigned int value_width) | 1800 | unsigned int value_width) |
1801 | { | 1801 | { |
1802 | int i; | 1802 | int i; |
@@ -1821,7 +1821,7 @@ static void labpc_serial_out(struct comedi_device * dev, unsigned int value, | |||
1821 | } | 1821 | } |
1822 | 1822 | ||
1823 | /* lowlevel read from eeprom */ | 1823 | /* lowlevel read from eeprom */ |
1824 | static unsigned int labpc_serial_in(struct comedi_device * dev) | 1824 | static unsigned int labpc_serial_in(struct comedi_device *dev) |
1825 | { | 1825 | { |
1826 | unsigned int value = 0; | 1826 | unsigned int value = 0; |
1827 | int i; | 1827 | int i; |
@@ -1850,7 +1850,7 @@ static unsigned int labpc_serial_in(struct comedi_device * dev) | |||
1850 | return value; | 1850 | return value; |
1851 | } | 1851 | } |
1852 | 1852 | ||
1853 | static unsigned int labpc_eeprom_read(struct comedi_device * dev, unsigned int address) | 1853 | static unsigned int labpc_eeprom_read(struct comedi_device *dev, unsigned int address) |
1854 | { | 1854 | { |
1855 | unsigned int value; | 1855 | unsigned int value; |
1856 | const int read_instruction = 0x3; /* bits to tell eeprom to expect a read */ | 1856 | const int read_instruction = 0x3; /* bits to tell eeprom to expect a read */ |
@@ -1879,7 +1879,7 @@ static unsigned int labpc_eeprom_read(struct comedi_device * dev, unsigned int a | |||
1879 | return value; | 1879 | return value; |
1880 | } | 1880 | } |
1881 | 1881 | ||
1882 | static unsigned int labpc_eeprom_write(struct comedi_device * dev, | 1882 | static unsigned int labpc_eeprom_write(struct comedi_device *dev, |
1883 | unsigned int address, unsigned int value) | 1883 | unsigned int address, unsigned int value) |
1884 | { | 1884 | { |
1885 | const int write_enable_instruction = 0x6; | 1885 | const int write_enable_instruction = 0x6; |
@@ -1937,7 +1937,7 @@ static unsigned int labpc_eeprom_write(struct comedi_device * dev, | |||
1937 | return 0; | 1937 | return 0; |
1938 | } | 1938 | } |
1939 | 1939 | ||
1940 | static unsigned int labpc_eeprom_read_status(struct comedi_device * dev) | 1940 | static unsigned int labpc_eeprom_read_status(struct comedi_device *dev) |
1941 | { | 1941 | { |
1942 | unsigned int value; | 1942 | unsigned int value; |
1943 | const int read_status_instruction = 0x5; | 1943 | const int read_status_instruction = 0x5; |
@@ -1965,7 +1965,7 @@ static unsigned int labpc_eeprom_read_status(struct comedi_device * dev) | |||
1965 | } | 1965 | } |
1966 | 1966 | ||
1967 | /* writes to 8 bit calibration dacs */ | 1967 | /* writes to 8 bit calibration dacs */ |
1968 | static void write_caldac(struct comedi_device * dev, unsigned int channel, | 1968 | static void write_caldac(struct comedi_device *dev, unsigned int channel, |
1969 | unsigned int value) | 1969 | unsigned int value) |
1970 | { | 1970 | { |
1971 | if (value == devpriv->caldac[channel]) | 1971 | if (value == devpriv->caldac[channel]) |
diff --git a/drivers/staging/comedi/drivers/ni_labpc.h b/drivers/staging/comedi/drivers/ni_labpc.h index 1171ec816b6..c5d2d212612 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.h +++ b/drivers/staging/comedi/drivers/ni_labpc.h | |||
@@ -74,9 +74,9 @@ struct labpc_private { | |||
74 | void (*write_byte) (unsigned int byte, unsigned long address); | 74 | void (*write_byte) (unsigned int byte, unsigned long address); |
75 | }; | 75 | }; |
76 | 76 | ||
77 | int labpc_common_attach(struct comedi_device * dev, unsigned long iobase, | 77 | int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, |
78 | unsigned int irq, unsigned int dma); | 78 | unsigned int irq, unsigned int dma); |
79 | int labpc_common_detach(struct comedi_device * dev); | 79 | int labpc_common_detach(struct comedi_device *dev); |
80 | 80 | ||
81 | extern const int labpc_1200_is_unipolar[]; | 81 | extern const int labpc_1200_is_unipolar[]; |
82 | extern const int labpc_1200_ai_gain_bits[]; | 82 | extern const int labpc_1200_ai_gain_bits[]; |
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c index ac3352fed6d..b0c523e9f19 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c | |||
@@ -79,7 +79,7 @@ NI manuals: | |||
79 | 79 | ||
80 | static struct pcmcia_device *pcmcia_cur_dev = NULL; | 80 | static struct pcmcia_device *pcmcia_cur_dev = NULL; |
81 | 81 | ||
82 | static int labpc_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 82 | static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
83 | 83 | ||
84 | static const struct labpc_board_struct labpc_cs_boards[] = { | 84 | static const struct labpc_board_struct labpc_cs_boards[] = { |
85 | { | 85 | { |
@@ -126,7 +126,7 @@ static struct comedi_driver driver_labpc_cs = { | |||
126 | .offset = sizeof(struct labpc_board_struct), | 126 | .offset = sizeof(struct labpc_board_struct), |
127 | }; | 127 | }; |
128 | 128 | ||
129 | static int labpc_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 129 | static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
130 | { | 130 | { |
131 | unsigned long iobase = 0; | 131 | unsigned long iobase = 0; |
132 | unsigned int irq = 0; | 132 | unsigned int irq = 0; |
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 838487868c6..f277ca6b73d 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c | |||
@@ -193,49 +193,49 @@ static const struct comedi_lrange *const ni_range_lkup[] = { | |||
193 | [ai_gain_6143] = &range_ni_S_ai_6143 | 193 | [ai_gain_6143] = &range_ni_S_ai_6143 |
194 | }; | 194 | }; |
195 | 195 | ||
196 | static int ni_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 196 | static int ni_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
197 | struct comedi_insn * insn, unsigned int * data); | 197 | struct comedi_insn *insn, unsigned int *data); |
198 | static int ni_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 198 | static int ni_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
199 | struct comedi_insn * insn, unsigned int * data); | 199 | struct comedi_insn *insn, unsigned int *data); |
200 | static int ni_cdio_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 200 | static int ni_cdio_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
201 | struct comedi_cmd * cmd); | 201 | struct comedi_cmd *cmd); |
202 | static int ni_cdio_cmd(struct comedi_device * dev, struct comedi_subdevice * s); | 202 | static int ni_cdio_cmd(struct comedi_device *dev, struct comedi_subdevice *s); |
203 | static int ni_cdio_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 203 | static int ni_cdio_cancel(struct comedi_device *dev, struct comedi_subdevice *s); |
204 | static void handle_cdio_interrupt(struct comedi_device * dev); | 204 | static void handle_cdio_interrupt(struct comedi_device *dev); |
205 | static int ni_cdo_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, | 205 | static int ni_cdo_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, |
206 | unsigned int trignum); | 206 | unsigned int trignum); |
207 | 207 | ||
208 | static int ni_serial_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 208 | static int ni_serial_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
209 | struct comedi_insn * insn, unsigned int * data); | 209 | struct comedi_insn *insn, unsigned int *data); |
210 | static int ni_serial_hw_readwrite8(struct comedi_device * dev, struct comedi_subdevice * s, | 210 | static int ni_serial_hw_readwrite8(struct comedi_device *dev, struct comedi_subdevice *s, |
211 | unsigned char data_out, unsigned char *data_in); | 211 | unsigned char data_out, unsigned char *data_in); |
212 | static int ni_serial_sw_readwrite8(struct comedi_device * dev, struct comedi_subdevice * s, | 212 | static int ni_serial_sw_readwrite8(struct comedi_device *dev, struct comedi_subdevice *s, |
213 | unsigned char data_out, unsigned char *data_in); | 213 | unsigned char data_out, unsigned char *data_in); |
214 | 214 | ||
215 | static int ni_calib_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 215 | static int ni_calib_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
216 | struct comedi_insn * insn, unsigned int * data); | 216 | struct comedi_insn *insn, unsigned int *data); |
217 | static int ni_calib_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 217 | static int ni_calib_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
218 | struct comedi_insn * insn, unsigned int * data); | 218 | struct comedi_insn *insn, unsigned int *data); |
219 | 219 | ||
220 | static int ni_eeprom_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 220 | static int ni_eeprom_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
221 | struct comedi_insn * insn, unsigned int * data); | 221 | struct comedi_insn *insn, unsigned int *data); |
222 | static int ni_m_series_eeprom_insn_read(struct comedi_device * dev, | 222 | static int ni_m_series_eeprom_insn_read(struct comedi_device *dev, |
223 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 223 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); |
224 | 224 | ||
225 | static int ni_pfi_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 225 | static int ni_pfi_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
226 | struct comedi_insn * insn, unsigned int * data); | 226 | struct comedi_insn *insn, unsigned int *data); |
227 | static int ni_pfi_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 227 | static int ni_pfi_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
228 | struct comedi_insn * insn, unsigned int * data); | 228 | struct comedi_insn *insn, unsigned int *data); |
229 | static unsigned ni_old_get_pfi_routing(struct comedi_device * dev, unsigned chan); | 229 | static unsigned ni_old_get_pfi_routing(struct comedi_device *dev, unsigned chan); |
230 | 230 | ||
231 | static void ni_rtsi_init(struct comedi_device * dev); | 231 | static void ni_rtsi_init(struct comedi_device *dev); |
232 | static int ni_rtsi_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 232 | static int ni_rtsi_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
233 | struct comedi_insn * insn, unsigned int * data); | 233 | struct comedi_insn *insn, unsigned int *data); |
234 | static int ni_rtsi_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 234 | static int ni_rtsi_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
235 | struct comedi_insn * insn, unsigned int * data); | 235 | struct comedi_insn *insn, unsigned int *data); |
236 | 236 | ||
237 | static void caldac_setup(struct comedi_device * dev, struct comedi_subdevice * s); | 237 | static void caldac_setup(struct comedi_device *dev, struct comedi_subdevice *s); |
238 | static int ni_read_eeprom(struct comedi_device * dev, int addr); | 238 | static int ni_read_eeprom(struct comedi_device *dev, int addr); |
239 | 239 | ||
240 | #ifdef DEBUG_STATUS_A | 240 | #ifdef DEBUG_STATUS_A |
241 | static void ni_mio_print_status_a(int status); | 241 | static void ni_mio_print_status_a(int status); |
@@ -248,58 +248,58 @@ static void ni_mio_print_status_b(int status); | |||
248 | #define ni_mio_print_status_b(a) | 248 | #define ni_mio_print_status_b(a) |
249 | #endif | 249 | #endif |
250 | 250 | ||
251 | static int ni_ai_reset(struct comedi_device * dev, struct comedi_subdevice * s); | 251 | static int ni_ai_reset(struct comedi_device *dev, struct comedi_subdevice *s); |
252 | #ifndef PCIDMA | 252 | #ifndef PCIDMA |
253 | static void ni_handle_fifo_half_full(struct comedi_device * dev); | 253 | static void ni_handle_fifo_half_full(struct comedi_device *dev); |
254 | static int ni_ao_fifo_half_empty(struct comedi_device * dev, struct comedi_subdevice * s); | 254 | static int ni_ao_fifo_half_empty(struct comedi_device *dev, struct comedi_subdevice *s); |
255 | #endif | 255 | #endif |
256 | static void ni_handle_fifo_dregs(struct comedi_device * dev); | 256 | static void ni_handle_fifo_dregs(struct comedi_device *dev); |
257 | static int ni_ai_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, | 257 | static int ni_ai_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, |
258 | unsigned int trignum); | 258 | unsigned int trignum); |
259 | static void ni_load_channelgain_list(struct comedi_device * dev, unsigned int n_chan, | 259 | static void ni_load_channelgain_list(struct comedi_device *dev, unsigned int n_chan, |
260 | unsigned int *list); | 260 | unsigned int *list); |
261 | static void shutdown_ai_command(struct comedi_device * dev); | 261 | static void shutdown_ai_command(struct comedi_device *dev); |
262 | 262 | ||
263 | static int ni_ao_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, | 263 | static int ni_ao_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, |
264 | unsigned int trignum); | 264 | unsigned int trignum); |
265 | 265 | ||
266 | static int ni_ao_reset(struct comedi_device * dev, struct comedi_subdevice * s); | 266 | static int ni_ao_reset(struct comedi_device *dev, struct comedi_subdevice *s); |
267 | 267 | ||
268 | static int ni_8255_callback(int dir, int port, int data, unsigned long arg); | 268 | static int ni_8255_callback(int dir, int port, int data, unsigned long arg); |
269 | 269 | ||
270 | static int ni_gpct_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 270 | static int ni_gpct_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
271 | struct comedi_insn * insn, unsigned int * data); | 271 | struct comedi_insn *insn, unsigned int *data); |
272 | static int ni_gpct_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 272 | static int ni_gpct_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
273 | struct comedi_insn * insn, unsigned int * data); | 273 | struct comedi_insn *insn, unsigned int *data); |
274 | static int ni_gpct_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 274 | static int ni_gpct_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
275 | struct comedi_insn * insn, unsigned int * data); | 275 | struct comedi_insn *insn, unsigned int *data); |
276 | static int ni_gpct_cmd(struct comedi_device * dev, struct comedi_subdevice * s); | 276 | static int ni_gpct_cmd(struct comedi_device *dev, struct comedi_subdevice *s); |
277 | static int ni_gpct_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 277 | static int ni_gpct_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
278 | struct comedi_cmd * cmd); | 278 | struct comedi_cmd *cmd); |
279 | static int ni_gpct_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 279 | static int ni_gpct_cancel(struct comedi_device *dev, struct comedi_subdevice *s); |
280 | static void handle_gpct_interrupt(struct comedi_device * dev, | 280 | static void handle_gpct_interrupt(struct comedi_device *dev, |
281 | unsigned short counter_index); | 281 | unsigned short counter_index); |
282 | 282 | ||
283 | static int init_cs5529(struct comedi_device * dev); | 283 | static int init_cs5529(struct comedi_device *dev); |
284 | static int cs5529_do_conversion(struct comedi_device * dev, unsigned short *data); | 284 | static int cs5529_do_conversion(struct comedi_device *dev, unsigned short *data); |
285 | static int cs5529_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 285 | static int cs5529_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
286 | struct comedi_insn * insn, unsigned int * data); | 286 | struct comedi_insn *insn, unsigned int *data); |
287 | #ifdef NI_CS5529_DEBUG | 287 | #ifdef NI_CS5529_DEBUG |
288 | static unsigned int cs5529_config_read(struct comedi_device * dev, | 288 | static unsigned int cs5529_config_read(struct comedi_device *dev, |
289 | unsigned int reg_select_bits); | 289 | unsigned int reg_select_bits); |
290 | #endif | 290 | #endif |
291 | static void cs5529_config_write(struct comedi_device * dev, unsigned int value, | 291 | static void cs5529_config_write(struct comedi_device *dev, unsigned int value, |
292 | unsigned int reg_select_bits); | 292 | unsigned int reg_select_bits); |
293 | 293 | ||
294 | static int ni_m_series_pwm_config(struct comedi_device * dev, struct comedi_subdevice * s, | 294 | static int ni_m_series_pwm_config(struct comedi_device *dev, struct comedi_subdevice *s, |
295 | struct comedi_insn * insn, unsigned int * data); | 295 | struct comedi_insn *insn, unsigned int *data); |
296 | static int ni_6143_pwm_config(struct comedi_device * dev, struct comedi_subdevice * s, | 296 | static int ni_6143_pwm_config(struct comedi_device *dev, struct comedi_subdevice *s, |
297 | struct comedi_insn * insn, unsigned int * data); | 297 | struct comedi_insn *insn, unsigned int *data); |
298 | 298 | ||
299 | static int ni_set_master_clock(struct comedi_device * dev, unsigned source, | 299 | static int ni_set_master_clock(struct comedi_device *dev, unsigned source, |
300 | unsigned period_ns); | 300 | unsigned period_ns); |
301 | static void ack_a_interrupt(struct comedi_device * dev, unsigned short a_status); | 301 | static void ack_a_interrupt(struct comedi_device *dev, unsigned short a_status); |
302 | static void ack_b_interrupt(struct comedi_device * dev, unsigned short b_status); | 302 | static void ack_b_interrupt(struct comedi_device *dev, unsigned short b_status); |
303 | 303 | ||
304 | enum aimodes { | 304 | enum aimodes { |
305 | AIMODE_NONE = 0, | 305 | AIMODE_NONE = 0, |
@@ -353,14 +353,14 @@ enum timebase_nanoseconds { | |||
353 | 353 | ||
354 | static const int num_adc_stages_611x = 3; | 354 | static const int num_adc_stages_611x = 3; |
355 | 355 | ||
356 | static void handle_a_interrupt(struct comedi_device * dev, unsigned short status, | 356 | static void handle_a_interrupt(struct comedi_device *dev, unsigned short status, |
357 | unsigned ai_mite_status); | 357 | unsigned ai_mite_status); |
358 | static void handle_b_interrupt(struct comedi_device * dev, unsigned short status, | 358 | static void handle_b_interrupt(struct comedi_device *dev, unsigned short status, |
359 | unsigned ao_mite_status); | 359 | unsigned ao_mite_status); |
360 | static void get_last_sample_611x(struct comedi_device * dev); | 360 | static void get_last_sample_611x(struct comedi_device *dev); |
361 | static void get_last_sample_6143(struct comedi_device * dev); | 361 | static void get_last_sample_6143(struct comedi_device *dev); |
362 | 362 | ||
363 | static inline void ni_set_bitfield(struct comedi_device * dev, int reg, | 363 | static inline void ni_set_bitfield(struct comedi_device *dev, int reg, |
364 | unsigned bit_mask, unsigned bit_values) | 364 | unsigned bit_mask, unsigned bit_values) |
365 | { | 365 | { |
366 | unsigned long flags; | 366 | unsigned long flags; |
@@ -406,12 +406,12 @@ static inline void ni_set_bitfield(struct comedi_device * dev, int reg, | |||
406 | } | 406 | } |
407 | 407 | ||
408 | #ifdef PCIDMA | 408 | #ifdef PCIDMA |
409 | static int ni_ai_drain_dma(struct comedi_device * dev); | 409 | static int ni_ai_drain_dma(struct comedi_device *dev); |
410 | 410 | ||
411 | /* DMA channel setup */ | 411 | /* DMA channel setup */ |
412 | 412 | ||
413 | /* negative channel means no channel */ | 413 | /* negative channel means no channel */ |
414 | static inline void ni_set_ai_dma_channel(struct comedi_device * dev, int channel) | 414 | static inline void ni_set_ai_dma_channel(struct comedi_device *dev, int channel) |
415 | { | 415 | { |
416 | unsigned bitfield; | 416 | unsigned bitfield; |
417 | 417 | ||
@@ -426,7 +426,7 @@ static inline void ni_set_ai_dma_channel(struct comedi_device * dev, int channel | |||
426 | } | 426 | } |
427 | 427 | ||
428 | /* negative channel means no channel */ | 428 | /* negative channel means no channel */ |
429 | static inline void ni_set_ao_dma_channel(struct comedi_device * dev, int channel) | 429 | static inline void ni_set_ao_dma_channel(struct comedi_device *dev, int channel) |
430 | { | 430 | { |
431 | unsigned bitfield; | 431 | unsigned bitfield; |
432 | 432 | ||
@@ -441,7 +441,7 @@ static inline void ni_set_ao_dma_channel(struct comedi_device * dev, int channel | |||
441 | } | 441 | } |
442 | 442 | ||
443 | /* negative mite_channel means no channel */ | 443 | /* negative mite_channel means no channel */ |
444 | static inline void ni_set_gpct_dma_channel(struct comedi_device * dev, | 444 | static inline void ni_set_gpct_dma_channel(struct comedi_device *dev, |
445 | unsigned gpct_index, int mite_channel) | 445 | unsigned gpct_index, int mite_channel) |
446 | { | 446 | { |
447 | unsigned bitfield; | 447 | unsigned bitfield; |
@@ -456,7 +456,7 @@ static inline void ni_set_gpct_dma_channel(struct comedi_device * dev, | |||
456 | } | 456 | } |
457 | 457 | ||
458 | /* negative mite_channel means no channel */ | 458 | /* negative mite_channel means no channel */ |
459 | static inline void ni_set_cdo_dma_channel(struct comedi_device * dev, int mite_channel) | 459 | static inline void ni_set_cdo_dma_channel(struct comedi_device *dev, int mite_channel) |
460 | { | 460 | { |
461 | unsigned long flags; | 461 | unsigned long flags; |
462 | 462 | ||
@@ -475,7 +475,7 @@ static inline void ni_set_cdo_dma_channel(struct comedi_device * dev, int mite_c | |||
475 | comedi_spin_unlock_irqrestore(&devpriv->soft_reg_copy_lock, flags); | 475 | comedi_spin_unlock_irqrestore(&devpriv->soft_reg_copy_lock, flags); |
476 | } | 476 | } |
477 | 477 | ||
478 | static int ni_request_ai_mite_channel(struct comedi_device * dev) | 478 | static int ni_request_ai_mite_channel(struct comedi_device *dev) |
479 | { | 479 | { |
480 | unsigned long flags; | 480 | unsigned long flags; |
481 | 481 | ||
@@ -496,7 +496,7 @@ static int ni_request_ai_mite_channel(struct comedi_device * dev) | |||
496 | return 0; | 496 | return 0; |
497 | } | 497 | } |
498 | 498 | ||
499 | static int ni_request_ao_mite_channel(struct comedi_device * dev) | 499 | static int ni_request_ao_mite_channel(struct comedi_device *dev) |
500 | { | 500 | { |
501 | unsigned long flags; | 501 | unsigned long flags; |
502 | 502 | ||
@@ -517,7 +517,7 @@ static int ni_request_ao_mite_channel(struct comedi_device * dev) | |||
517 | return 0; | 517 | return 0; |
518 | } | 518 | } |
519 | 519 | ||
520 | static int ni_request_gpct_mite_channel(struct comedi_device * dev, | 520 | static int ni_request_gpct_mite_channel(struct comedi_device *dev, |
521 | unsigned gpct_index, enum comedi_io_direction direction) | 521 | unsigned gpct_index, enum comedi_io_direction direction) |
522 | { | 522 | { |
523 | unsigned long flags; | 523 | unsigned long flags; |
@@ -546,7 +546,7 @@ static int ni_request_gpct_mite_channel(struct comedi_device * dev, | |||
546 | 546 | ||
547 | #endif /* PCIDMA */ | 547 | #endif /* PCIDMA */ |
548 | 548 | ||
549 | static int ni_request_cdo_mite_channel(struct comedi_device * dev) | 549 | static int ni_request_cdo_mite_channel(struct comedi_device *dev) |
550 | { | 550 | { |
551 | #ifdef PCIDMA | 551 | #ifdef PCIDMA |
552 | unsigned long flags; | 552 | unsigned long flags; |
@@ -569,7 +569,7 @@ static int ni_request_cdo_mite_channel(struct comedi_device * dev) | |||
569 | return 0; | 569 | return 0; |
570 | } | 570 | } |
571 | 571 | ||
572 | static void ni_release_ai_mite_channel(struct comedi_device * dev) | 572 | static void ni_release_ai_mite_channel(struct comedi_device *dev) |
573 | { | 573 | { |
574 | #ifdef PCIDMA | 574 | #ifdef PCIDMA |
575 | unsigned long flags; | 575 | unsigned long flags; |
@@ -584,7 +584,7 @@ static void ni_release_ai_mite_channel(struct comedi_device * dev) | |||
584 | #endif /* PCIDMA */ | 584 | #endif /* PCIDMA */ |
585 | } | 585 | } |
586 | 586 | ||
587 | static void ni_release_ao_mite_channel(struct comedi_device * dev) | 587 | static void ni_release_ao_mite_channel(struct comedi_device *dev) |
588 | { | 588 | { |
589 | #ifdef PCIDMA | 589 | #ifdef PCIDMA |
590 | unsigned long flags; | 590 | unsigned long flags; |
@@ -599,7 +599,7 @@ static void ni_release_ao_mite_channel(struct comedi_device * dev) | |||
599 | #endif /* PCIDMA */ | 599 | #endif /* PCIDMA */ |
600 | } | 600 | } |
601 | 601 | ||
602 | void ni_release_gpct_mite_channel(struct comedi_device * dev, unsigned gpct_index) | 602 | void ni_release_gpct_mite_channel(struct comedi_device *dev, unsigned gpct_index) |
603 | { | 603 | { |
604 | #ifdef PCIDMA | 604 | #ifdef PCIDMA |
605 | unsigned long flags; | 605 | unsigned long flags; |
@@ -619,7 +619,7 @@ void ni_release_gpct_mite_channel(struct comedi_device * dev, unsigned gpct_inde | |||
619 | #endif /* PCIDMA */ | 619 | #endif /* PCIDMA */ |
620 | } | 620 | } |
621 | 621 | ||
622 | static void ni_release_cdo_mite_channel(struct comedi_device * dev) | 622 | static void ni_release_cdo_mite_channel(struct comedi_device *dev) |
623 | { | 623 | { |
624 | #ifdef PCIDMA | 624 | #ifdef PCIDMA |
625 | unsigned long flags; | 625 | unsigned long flags; |
@@ -636,7 +636,7 @@ static void ni_release_cdo_mite_channel(struct comedi_device * dev) | |||
636 | 636 | ||
637 | /* e-series boards use the second irq signals to generate dma requests for their counters */ | 637 | /* e-series boards use the second irq signals to generate dma requests for their counters */ |
638 | #ifdef PCIDMA | 638 | #ifdef PCIDMA |
639 | static void ni_e_series_enable_second_irq(struct comedi_device * dev, | 639 | static void ni_e_series_enable_second_irq(struct comedi_device *dev, |
640 | unsigned gpct_index, short enable) | 640 | unsigned gpct_index, short enable) |
641 | { | 641 | { |
642 | if (boardtype.reg_type & ni_reg_m_series_mask) | 642 | if (boardtype.reg_type & ni_reg_m_series_mask) |
@@ -667,7 +667,7 @@ static void ni_e_series_enable_second_irq(struct comedi_device * dev, | |||
667 | } | 667 | } |
668 | #endif /* PCIDMA */ | 668 | #endif /* PCIDMA */ |
669 | 669 | ||
670 | static void ni_clear_ai_fifo(struct comedi_device * dev) | 670 | static void ni_clear_ai_fifo(struct comedi_device *dev) |
671 | { | 671 | { |
672 | if (boardtype.reg_type == ni_reg_6143) { | 672 | if (boardtype.reg_type == ni_reg_6143) { |
673 | /* Flush the 6143 data FIFO */ | 673 | /* Flush the 6143 data FIFO */ |
@@ -693,13 +693,13 @@ static void ni_clear_ai_fifo(struct comedi_device * dev) | |||
693 | } | 693 | } |
694 | } | 694 | } |
695 | 695 | ||
696 | static void win_out2(struct comedi_device * dev, uint32_t data, int reg) | 696 | static void win_out2(struct comedi_device *dev, uint32_t data, int reg) |
697 | { | 697 | { |
698 | devpriv->stc_writew(dev, data >> 16, reg); | 698 | devpriv->stc_writew(dev, data >> 16, reg); |
699 | devpriv->stc_writew(dev, data & 0xffff, reg + 1); | 699 | devpriv->stc_writew(dev, data & 0xffff, reg + 1); |
700 | } | 700 | } |
701 | 701 | ||
702 | static uint32_t win_in2(struct comedi_device * dev, int reg) | 702 | static uint32_t win_in2(struct comedi_device *dev, int reg) |
703 | { | 703 | { |
704 | uint32_t bits; | 704 | uint32_t bits; |
705 | bits = devpriv->stc_readw(dev, reg) << 16; | 705 | bits = devpriv->stc_readw(dev, reg) << 16; |
@@ -708,7 +708,7 @@ static uint32_t win_in2(struct comedi_device * dev, int reg) | |||
708 | } | 708 | } |
709 | 709 | ||
710 | #define ao_win_out(data,addr) ni_ao_win_outw(dev,data,addr) | 710 | #define ao_win_out(data,addr) ni_ao_win_outw(dev,data,addr) |
711 | static inline void ni_ao_win_outw(struct comedi_device * dev, uint16_t data, int addr) | 711 | static inline void ni_ao_win_outw(struct comedi_device *dev, uint16_t data, int addr) |
712 | { | 712 | { |
713 | unsigned long flags; | 713 | unsigned long flags; |
714 | 714 | ||
@@ -718,7 +718,7 @@ static inline void ni_ao_win_outw(struct comedi_device * dev, uint16_t data, int | |||
718 | comedi_spin_unlock_irqrestore(&devpriv->window_lock, flags); | 718 | comedi_spin_unlock_irqrestore(&devpriv->window_lock, flags); |
719 | } | 719 | } |
720 | 720 | ||
721 | static inline void ni_ao_win_outl(struct comedi_device * dev, uint32_t data, int addr) | 721 | static inline void ni_ao_win_outl(struct comedi_device *dev, uint32_t data, int addr) |
722 | { | 722 | { |
723 | unsigned long flags; | 723 | unsigned long flags; |
724 | 724 | ||
@@ -728,7 +728,7 @@ static inline void ni_ao_win_outl(struct comedi_device * dev, uint32_t data, int | |||
728 | comedi_spin_unlock_irqrestore(&devpriv->window_lock, flags); | 728 | comedi_spin_unlock_irqrestore(&devpriv->window_lock, flags); |
729 | } | 729 | } |
730 | 730 | ||
731 | static inline unsigned short ni_ao_win_inw(struct comedi_device * dev, int addr) | 731 | static inline unsigned short ni_ao_win_inw(struct comedi_device *dev, int addr) |
732 | { | 732 | { |
733 | unsigned long flags; | 733 | unsigned long flags; |
734 | unsigned short data; | 734 | unsigned short data; |
@@ -750,7 +750,7 @@ static inline unsigned short ni_ao_win_inw(struct comedi_device * dev, int addr) | |||
750 | * | 750 | * |
751 | * value should only be 1 or 0. | 751 | * value should only be 1 or 0. |
752 | */ | 752 | */ |
753 | static inline void ni_set_bits(struct comedi_device * dev, int reg, unsigned bits, | 753 | static inline void ni_set_bits(struct comedi_device *dev, int reg, unsigned bits, |
754 | unsigned value) | 754 | unsigned value) |
755 | { | 755 | { |
756 | unsigned bit_values; | 756 | unsigned bit_values; |
@@ -823,7 +823,7 @@ static irqreturn_t ni_E_interrupt(int irq, void *d) | |||
823 | } | 823 | } |
824 | 824 | ||
825 | #ifdef PCIDMA | 825 | #ifdef PCIDMA |
826 | static void ni_sync_ai_dma(struct comedi_device * dev) | 826 | static void ni_sync_ai_dma(struct comedi_device *dev) |
827 | { | 827 | { |
828 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; | 828 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; |
829 | unsigned long flags; | 829 | unsigned long flags; |
@@ -846,7 +846,7 @@ static void mite_handle_b_linkc(struct mite_struct *mite, struct comedi_device * | |||
846 | comedi_spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags); | 846 | comedi_spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags); |
847 | } | 847 | } |
848 | 848 | ||
849 | static int ni_ao_wait_for_dma_load(struct comedi_device * dev) | 849 | static int ni_ao_wait_for_dma_load(struct comedi_device *dev) |
850 | { | 850 | { |
851 | static const int timeout = 10000; | 851 | static const int timeout = 10000; |
852 | int i; | 852 | int i; |
@@ -868,7 +868,7 @@ static int ni_ao_wait_for_dma_load(struct comedi_device * dev) | |||
868 | } | 868 | } |
869 | 869 | ||
870 | #endif /* PCIDMA */ | 870 | #endif /* PCIDMA */ |
871 | static void ni_handle_eos(struct comedi_device * dev, struct comedi_subdevice * s) | 871 | static void ni_handle_eos(struct comedi_device *dev, struct comedi_subdevice *s) |
872 | { | 872 | { |
873 | if (devpriv->aimode == AIMODE_SCAN) { | 873 | if (devpriv->aimode == AIMODE_SCAN) { |
874 | #ifdef PCIDMA | 874 | #ifdef PCIDMA |
@@ -892,7 +892,7 @@ static void ni_handle_eos(struct comedi_device * dev, struct comedi_subdevice * | |||
892 | } | 892 | } |
893 | } | 893 | } |
894 | 894 | ||
895 | static void shutdown_ai_command(struct comedi_device * dev) | 895 | static void shutdown_ai_command(struct comedi_device *dev) |
896 | { | 896 | { |
897 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; | 897 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; |
898 | 898 | ||
@@ -906,7 +906,7 @@ static void shutdown_ai_command(struct comedi_device * dev) | |||
906 | s->async->events |= COMEDI_CB_EOA; | 906 | s->async->events |= COMEDI_CB_EOA; |
907 | } | 907 | } |
908 | 908 | ||
909 | static void ni_event(struct comedi_device * dev, struct comedi_subdevice * s) | 909 | static void ni_event(struct comedi_device *dev, struct comedi_subdevice *s) |
910 | { | 910 | { |
911 | if (s->async-> | 911 | if (s->async-> |
912 | events & (COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW | COMEDI_CB_EOA)) | 912 | events & (COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW | COMEDI_CB_EOA)) |
@@ -932,7 +932,7 @@ static void ni_event(struct comedi_device * dev, struct comedi_subdevice * s) | |||
932 | comedi_event(dev, s); | 932 | comedi_event(dev, s); |
933 | } | 933 | } |
934 | 934 | ||
935 | static void handle_gpct_interrupt(struct comedi_device * dev, | 935 | static void handle_gpct_interrupt(struct comedi_device *dev, |
936 | unsigned short counter_index) | 936 | unsigned short counter_index) |
937 | { | 937 | { |
938 | #ifdef PCIDMA | 938 | #ifdef PCIDMA |
@@ -945,7 +945,7 @@ static void handle_gpct_interrupt(struct comedi_device * dev, | |||
945 | #endif | 945 | #endif |
946 | } | 946 | } |
947 | 947 | ||
948 | static void ack_a_interrupt(struct comedi_device * dev, unsigned short a_status) | 948 | static void ack_a_interrupt(struct comedi_device *dev, unsigned short a_status) |
949 | { | 949 | { |
950 | unsigned short ack = 0; | 950 | unsigned short ack = 0; |
951 | 951 | ||
@@ -966,7 +966,7 @@ static void ack_a_interrupt(struct comedi_device * dev, unsigned short a_status) | |||
966 | devpriv->stc_writew(dev, ack, Interrupt_A_Ack_Register); | 966 | devpriv->stc_writew(dev, ack, Interrupt_A_Ack_Register); |
967 | } | 967 | } |
968 | 968 | ||
969 | static void handle_a_interrupt(struct comedi_device * dev, unsigned short status, | 969 | static void handle_a_interrupt(struct comedi_device *dev, unsigned short status, |
970 | unsigned ai_mite_status) | 970 | unsigned ai_mite_status) |
971 | { | 971 | { |
972 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; | 972 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; |
@@ -1070,7 +1070,7 @@ static void handle_a_interrupt(struct comedi_device * dev, unsigned short status | |||
1070 | #endif | 1070 | #endif |
1071 | } | 1071 | } |
1072 | 1072 | ||
1073 | static void ack_b_interrupt(struct comedi_device * dev, unsigned short b_status) | 1073 | static void ack_b_interrupt(struct comedi_device *dev, unsigned short b_status) |
1074 | { | 1074 | { |
1075 | unsigned short ack = 0; | 1075 | unsigned short ack = 0; |
1076 | if (b_status & AO_BC_TC_St) { | 1076 | if (b_status & AO_BC_TC_St) { |
@@ -1098,7 +1098,7 @@ static void ack_b_interrupt(struct comedi_device * dev, unsigned short b_status) | |||
1098 | devpriv->stc_writew(dev, ack, Interrupt_B_Ack_Register); | 1098 | devpriv->stc_writew(dev, ack, Interrupt_B_Ack_Register); |
1099 | } | 1099 | } |
1100 | 1100 | ||
1101 | static void handle_b_interrupt(struct comedi_device * dev, unsigned short b_status, | 1101 | static void handle_b_interrupt(struct comedi_device *dev, unsigned short b_status, |
1102 | unsigned ao_mite_status) | 1102 | unsigned ao_mite_status) |
1103 | { | 1103 | { |
1104 | struct comedi_subdevice *s = dev->subdevices + NI_AO_SUBDEV; | 1104 | struct comedi_subdevice *s = dev->subdevices + NI_AO_SUBDEV; |
@@ -1204,7 +1204,7 @@ static void ni_mio_print_status_b(int status) | |||
1204 | 1204 | ||
1205 | #ifndef PCIDMA | 1205 | #ifndef PCIDMA |
1206 | 1206 | ||
1207 | static void ni_ao_fifo_load(struct comedi_device * dev, struct comedi_subdevice * s, int n) | 1207 | static void ni_ao_fifo_load(struct comedi_device *dev, struct comedi_subdevice *s, int n) |
1208 | { | 1208 | { |
1209 | struct comedi_async *async = s->async; | 1209 | struct comedi_async *async = s->async; |
1210 | struct comedi_cmd *cmd = &async->cmd; | 1210 | struct comedi_cmd *cmd = &async->cmd; |
@@ -1263,7 +1263,7 @@ static void ni_ao_fifo_load(struct comedi_device * dev, struct comedi_subdevice | |||
1263 | * RT code, as RT code might purposely be running close to the | 1263 | * RT code, as RT code might purposely be running close to the |
1264 | * metal. Needs to be fixed eventually. | 1264 | * metal. Needs to be fixed eventually. |
1265 | */ | 1265 | */ |
1266 | static int ni_ao_fifo_half_empty(struct comedi_device * dev, struct comedi_subdevice * s) | 1266 | static int ni_ao_fifo_half_empty(struct comedi_device *dev, struct comedi_subdevice *s) |
1267 | { | 1267 | { |
1268 | int n; | 1268 | int n; |
1269 | 1269 | ||
@@ -1284,7 +1284,7 @@ static int ni_ao_fifo_half_empty(struct comedi_device * dev, struct comedi_subde | |||
1284 | return 1; | 1284 | return 1; |
1285 | } | 1285 | } |
1286 | 1286 | ||
1287 | static int ni_ao_prep_fifo(struct comedi_device * dev, struct comedi_subdevice * s) | 1287 | static int ni_ao_prep_fifo(struct comedi_device *dev, struct comedi_subdevice *s) |
1288 | { | 1288 | { |
1289 | int n; | 1289 | int n; |
1290 | 1290 | ||
@@ -1307,7 +1307,7 @@ static int ni_ao_prep_fifo(struct comedi_device * dev, struct comedi_subdevice * | |||
1307 | return n; | 1307 | return n; |
1308 | } | 1308 | } |
1309 | 1309 | ||
1310 | static void ni_ai_fifo_read(struct comedi_device * dev, struct comedi_subdevice * s, int n) | 1310 | static void ni_ai_fifo_read(struct comedi_device *dev, struct comedi_subdevice *s, int n) |
1311 | { | 1311 | { |
1312 | struct comedi_async *async = s->async; | 1312 | struct comedi_async *async = s->async; |
1313 | int i; | 1313 | int i; |
@@ -1364,7 +1364,7 @@ static void ni_ai_fifo_read(struct comedi_device * dev, struct comedi_subdevice | |||
1364 | } | 1364 | } |
1365 | } | 1365 | } |
1366 | 1366 | ||
1367 | static void ni_handle_fifo_half_full(struct comedi_device * dev) | 1367 | static void ni_handle_fifo_half_full(struct comedi_device *dev) |
1368 | { | 1368 | { |
1369 | int n; | 1369 | int n; |
1370 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; | 1370 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; |
@@ -1376,7 +1376,7 @@ static void ni_handle_fifo_half_full(struct comedi_device * dev) | |||
1376 | #endif | 1376 | #endif |
1377 | 1377 | ||
1378 | #ifdef PCIDMA | 1378 | #ifdef PCIDMA |
1379 | static int ni_ai_drain_dma(struct comedi_device * dev) | 1379 | static int ni_ai_drain_dma(struct comedi_device *dev) |
1380 | { | 1380 | { |
1381 | int i; | 1381 | int i; |
1382 | static const int timeout = 10000; | 1382 | static const int timeout = 10000; |
@@ -1414,7 +1414,7 @@ static int ni_ai_drain_dma(struct comedi_device * dev) | |||
1414 | /* | 1414 | /* |
1415 | Empties the AI fifo | 1415 | Empties the AI fifo |
1416 | */ | 1416 | */ |
1417 | static void ni_handle_fifo_dregs(struct comedi_device * dev) | 1417 | static void ni_handle_fifo_dregs(struct comedi_device *dev) |
1418 | { | 1418 | { |
1419 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; | 1419 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; |
1420 | short data[2]; | 1420 | short data[2]; |
@@ -1476,7 +1476,7 @@ static void ni_handle_fifo_dregs(struct comedi_device * dev) | |||
1476 | } | 1476 | } |
1477 | } | 1477 | } |
1478 | 1478 | ||
1479 | static void get_last_sample_611x(struct comedi_device * dev) | 1479 | static void get_last_sample_611x(struct comedi_device *dev) |
1480 | { | 1480 | { |
1481 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; | 1481 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; |
1482 | short data; | 1482 | short data; |
@@ -1493,7 +1493,7 @@ static void get_last_sample_611x(struct comedi_device * dev) | |||
1493 | } | 1493 | } |
1494 | } | 1494 | } |
1495 | 1495 | ||
1496 | static void get_last_sample_6143(struct comedi_device * dev) | 1496 | static void get_last_sample_6143(struct comedi_device *dev) |
1497 | { | 1497 | { |
1498 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; | 1498 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; |
1499 | short data; | 1499 | short data; |
@@ -1513,7 +1513,7 @@ static void get_last_sample_6143(struct comedi_device * dev) | |||
1513 | } | 1513 | } |
1514 | } | 1514 | } |
1515 | 1515 | ||
1516 | static void ni_ai_munge(struct comedi_device * dev, struct comedi_subdevice * s, | 1516 | static void ni_ai_munge(struct comedi_device *dev, struct comedi_subdevice *s, |
1517 | void *data, unsigned int num_bytes, unsigned int chan_index) | 1517 | void *data, unsigned int num_bytes, unsigned int chan_index) |
1518 | { | 1518 | { |
1519 | struct comedi_async *async = s->async; | 1519 | struct comedi_async *async = s->async; |
@@ -1539,7 +1539,7 @@ static void ni_ai_munge(struct comedi_device * dev, struct comedi_subdevice * s, | |||
1539 | 1539 | ||
1540 | #ifdef PCIDMA | 1540 | #ifdef PCIDMA |
1541 | 1541 | ||
1542 | static int ni_ai_setup_MITE_dma(struct comedi_device * dev) | 1542 | static int ni_ai_setup_MITE_dma(struct comedi_device *dev) |
1543 | { | 1543 | { |
1544 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; | 1544 | struct comedi_subdevice *s = dev->subdevices + NI_AI_SUBDEV; |
1545 | int retval; | 1545 | int retval; |
@@ -1579,7 +1579,7 @@ static int ni_ai_setup_MITE_dma(struct comedi_device * dev) | |||
1579 | return 0; | 1579 | return 0; |
1580 | } | 1580 | } |
1581 | 1581 | ||
1582 | static int ni_ao_setup_MITE_dma(struct comedi_device * dev) | 1582 | static int ni_ao_setup_MITE_dma(struct comedi_device *dev) |
1583 | { | 1583 | { |
1584 | struct comedi_subdevice *s = dev->subdevices + NI_AO_SUBDEV; | 1584 | struct comedi_subdevice *s = dev->subdevices + NI_AO_SUBDEV; |
1585 | int retval; | 1585 | int retval; |
@@ -1617,7 +1617,7 @@ static int ni_ao_setup_MITE_dma(struct comedi_device * dev) | |||
1617 | this is pretty harsh for a cancel, but it works... | 1617 | this is pretty harsh for a cancel, but it works... |
1618 | */ | 1618 | */ |
1619 | 1619 | ||
1620 | static int ni_ai_reset(struct comedi_device * dev, struct comedi_subdevice * s) | 1620 | static int ni_ai_reset(struct comedi_device *dev, struct comedi_subdevice *s) |
1621 | { | 1621 | { |
1622 | ni_release_ai_mite_channel(dev); | 1622 | ni_release_ai_mite_channel(dev); |
1623 | /* ai configuration */ | 1623 | /* ai configuration */ |
@@ -1698,7 +1698,7 @@ static int ni_ai_reset(struct comedi_device * dev, struct comedi_subdevice * s) | |||
1698 | return 0; | 1698 | return 0; |
1699 | } | 1699 | } |
1700 | 1700 | ||
1701 | static int ni_ai_poll(struct comedi_device * dev, struct comedi_subdevice * s) | 1701 | static int ni_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s) |
1702 | { | 1702 | { |
1703 | unsigned long flags = 0; | 1703 | unsigned long flags = 0; |
1704 | int count; | 1704 | int count; |
@@ -1718,8 +1718,8 @@ static int ni_ai_poll(struct comedi_device * dev, struct comedi_subdevice * s) | |||
1718 | return count; | 1718 | return count; |
1719 | } | 1719 | } |
1720 | 1720 | ||
1721 | static int ni_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 1721 | static int ni_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
1722 | struct comedi_insn * insn, unsigned int * data) | 1722 | struct comedi_insn *insn, unsigned int *data) |
1723 | { | 1723 | { |
1724 | int i, n; | 1724 | int i, n; |
1725 | const unsigned int mask = (1 << boardtype.adbits) - 1; | 1725 | const unsigned int mask = (1 << boardtype.adbits) - 1; |
@@ -1814,7 +1814,7 @@ static int ni_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * | |||
1814 | return insn->n; | 1814 | return insn->n; |
1815 | } | 1815 | } |
1816 | 1816 | ||
1817 | void ni_prime_channelgain_list(struct comedi_device * dev) | 1817 | void ni_prime_channelgain_list(struct comedi_device *dev) |
1818 | { | 1818 | { |
1819 | int i; | 1819 | int i; |
1820 | devpriv->stc_writew(dev, AI_CONVERT_Pulse, AI_Command_1_Register); | 1820 | devpriv->stc_writew(dev, AI_CONVERT_Pulse, AI_Command_1_Register); |
@@ -1830,7 +1830,7 @@ void ni_prime_channelgain_list(struct comedi_device * dev) | |||
1830 | rt_printk("ni_mio_common: timeout loading channel/gain list\n"); | 1830 | rt_printk("ni_mio_common: timeout loading channel/gain list\n"); |
1831 | } | 1831 | } |
1832 | 1832 | ||
1833 | static void ni_m_series_load_channelgain_list(struct comedi_device * dev, | 1833 | static void ni_m_series_load_channelgain_list(struct comedi_device *dev, |
1834 | unsigned int n_chan, unsigned int *list) | 1834 | unsigned int n_chan, unsigned int *list) |
1835 | { | 1835 | { |
1836 | unsigned int chan, range, aref; | 1836 | unsigned int chan, range, aref; |
@@ -1935,7 +1935,7 @@ static void ni_m_series_load_channelgain_list(struct comedi_device * dev, | |||
1935 | * bits 0-2: channel | 1935 | * bits 0-2: channel |
1936 | * valid channels are 0-3 | 1936 | * valid channels are 0-3 |
1937 | */ | 1937 | */ |
1938 | static void ni_load_channelgain_list(struct comedi_device * dev, unsigned int n_chan, | 1938 | static void ni_load_channelgain_list(struct comedi_device *dev, unsigned int n_chan, |
1939 | unsigned int *list) | 1939 | unsigned int *list) |
1940 | { | 1940 | { |
1941 | unsigned int chan, range, aref; | 1941 | unsigned int chan, range, aref; |
@@ -2055,7 +2055,7 @@ static void ni_load_channelgain_list(struct comedi_device * dev, unsigned int n_ | |||
2055 | } | 2055 | } |
2056 | } | 2056 | } |
2057 | 2057 | ||
2058 | static int ni_ns_to_timer(const struct comedi_device * dev, unsigned nanosec, | 2058 | static int ni_ns_to_timer(const struct comedi_device *dev, unsigned nanosec, |
2059 | int round_mode) | 2059 | int round_mode) |
2060 | { | 2060 | { |
2061 | int divider; | 2061 | int divider; |
@@ -2074,12 +2074,12 @@ static int ni_ns_to_timer(const struct comedi_device * dev, unsigned nanosec, | |||
2074 | return divider - 1; | 2074 | return divider - 1; |
2075 | } | 2075 | } |
2076 | 2076 | ||
2077 | static unsigned ni_timer_to_ns(const struct comedi_device * dev, int timer) | 2077 | static unsigned ni_timer_to_ns(const struct comedi_device *dev, int timer) |
2078 | { | 2078 | { |
2079 | return devpriv->clock_ns * (timer + 1); | 2079 | return devpriv->clock_ns * (timer + 1); |
2080 | } | 2080 | } |
2081 | 2081 | ||
2082 | static unsigned ni_min_ai_scan_period_ns(struct comedi_device * dev, | 2082 | static unsigned ni_min_ai_scan_period_ns(struct comedi_device *dev, |
2083 | unsigned num_channels) | 2083 | unsigned num_channels) |
2084 | { | 2084 | { |
2085 | switch (boardtype.reg_type) { | 2085 | switch (boardtype.reg_type) { |
@@ -2095,8 +2095,8 @@ static unsigned ni_min_ai_scan_period_ns(struct comedi_device * dev, | |||
2095 | return boardtype.ai_speed * num_channels; | 2095 | return boardtype.ai_speed * num_channels; |
2096 | } | 2096 | } |
2097 | 2097 | ||
2098 | static int ni_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 2098 | static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
2099 | struct comedi_cmd * cmd) | 2099 | struct comedi_cmd *cmd) |
2100 | { | 2100 | { |
2101 | int err = 0; | 2101 | int err = 0; |
2102 | int tmp; | 2102 | int tmp; |
@@ -2308,7 +2308,7 @@ static int ni_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s | |||
2308 | return 0; | 2308 | return 0; |
2309 | } | 2309 | } |
2310 | 2310 | ||
2311 | static int ni_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 2311 | static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
2312 | { | 2312 | { |
2313 | const struct comedi_cmd *cmd = &s->async->cmd; | 2313 | const struct comedi_cmd *cmd = &s->async->cmd; |
2314 | int timer; | 2314 | int timer; |
@@ -2612,7 +2612,7 @@ static int ni_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
2612 | return 0; | 2612 | return 0; |
2613 | } | 2613 | } |
2614 | 2614 | ||
2615 | static int ni_ai_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, | 2615 | static int ni_ai_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, |
2616 | unsigned int trignum) | 2616 | unsigned int trignum) |
2617 | { | 2617 | { |
2618 | if (trignum != 0) | 2618 | if (trignum != 0) |
@@ -2625,11 +2625,11 @@ static int ni_ai_inttrig(struct comedi_device * dev, struct comedi_subdevice * s | |||
2625 | return 1; | 2625 | return 1; |
2626 | } | 2626 | } |
2627 | 2627 | ||
2628 | static int ni_ai_config_analog_trig(struct comedi_device * dev, struct comedi_subdevice * s, | 2628 | static int ni_ai_config_analog_trig(struct comedi_device *dev, struct comedi_subdevice *s, |
2629 | struct comedi_insn * insn, unsigned int * data); | 2629 | struct comedi_insn *insn, unsigned int *data); |
2630 | 2630 | ||
2631 | static int ni_ai_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 2631 | static int ni_ai_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
2632 | struct comedi_insn * insn, unsigned int * data) | 2632 | struct comedi_insn *insn, unsigned int *data) |
2633 | { | 2633 | { |
2634 | if (insn->n < 1) | 2634 | if (insn->n < 1) |
2635 | return -EINVAL; | 2635 | return -EINVAL; |
@@ -2679,8 +2679,8 @@ static int ni_ai_insn_config(struct comedi_device * dev, struct comedi_subdevice | |||
2679 | return -EINVAL; | 2679 | return -EINVAL; |
2680 | } | 2680 | } |
2681 | 2681 | ||
2682 | static int ni_ai_config_analog_trig(struct comedi_device * dev, struct comedi_subdevice * s, | 2682 | static int ni_ai_config_analog_trig(struct comedi_device *dev, struct comedi_subdevice *s, |
2683 | struct comedi_insn * insn, unsigned int * data) | 2683 | struct comedi_insn *insn, unsigned int *data) |
2684 | { | 2684 | { |
2685 | unsigned int a, b, modebits; | 2685 | unsigned int a, b, modebits; |
2686 | int err = 0; | 2686 | int err = 0; |
@@ -2777,7 +2777,7 @@ static int ni_ai_config_analog_trig(struct comedi_device * dev, struct comedi_su | |||
2777 | } | 2777 | } |
2778 | 2778 | ||
2779 | /* munge data from unsigned to 2's complement for analog output bipolar modes */ | 2779 | /* munge data from unsigned to 2's complement for analog output bipolar modes */ |
2780 | static void ni_ao_munge(struct comedi_device * dev, struct comedi_subdevice * s, | 2780 | static void ni_ao_munge(struct comedi_device *dev, struct comedi_subdevice *s, |
2781 | void *data, unsigned int num_bytes, unsigned int chan_index) | 2781 | void *data, unsigned int num_bytes, unsigned int chan_index) |
2782 | { | 2782 | { |
2783 | struct comedi_async *async = s->async; | 2783 | struct comedi_async *async = s->async; |
@@ -2800,8 +2800,8 @@ static void ni_ao_munge(struct comedi_device * dev, struct comedi_subdevice * s, | |||
2800 | } | 2800 | } |
2801 | } | 2801 | } |
2802 | 2802 | ||
2803 | static int ni_m_series_ao_config_chanlist(struct comedi_device * dev, | 2803 | static int ni_m_series_ao_config_chanlist(struct comedi_device *dev, |
2804 | struct comedi_subdevice * s, unsigned int chanspec[], unsigned int n_chans, | 2804 | struct comedi_subdevice *s, unsigned int chanspec[], unsigned int n_chans, |
2805 | int timed) | 2805 | int timed) |
2806 | { | 2806 | { |
2807 | unsigned int range; | 2807 | unsigned int range; |
@@ -2869,7 +2869,7 @@ static int ni_m_series_ao_config_chanlist(struct comedi_device * dev, | |||
2869 | return invert; | 2869 | return invert; |
2870 | } | 2870 | } |
2871 | 2871 | ||
2872 | static int ni_old_ao_config_chanlist(struct comedi_device * dev, struct comedi_subdevice * s, | 2872 | static int ni_old_ao_config_chanlist(struct comedi_device *dev, struct comedi_subdevice *s, |
2873 | unsigned int chanspec[], unsigned int n_chans) | 2873 | unsigned int chanspec[], unsigned int n_chans) |
2874 | { | 2874 | { |
2875 | unsigned int range; | 2875 | unsigned int range; |
@@ -2912,7 +2912,7 @@ static int ni_old_ao_config_chanlist(struct comedi_device * dev, struct comedi_s | |||
2912 | return invert; | 2912 | return invert; |
2913 | } | 2913 | } |
2914 | 2914 | ||
2915 | static int ni_ao_config_chanlist(struct comedi_device * dev, struct comedi_subdevice * s, | 2915 | static int ni_ao_config_chanlist(struct comedi_device *dev, struct comedi_subdevice *s, |
2916 | unsigned int chanspec[], unsigned int n_chans, int timed) | 2916 | unsigned int chanspec[], unsigned int n_chans, int timed) |
2917 | { | 2917 | { |
2918 | if (boardtype.reg_type & ni_reg_m_series_mask) | 2918 | if (boardtype.reg_type & ni_reg_m_series_mask) |
@@ -2921,16 +2921,16 @@ static int ni_ao_config_chanlist(struct comedi_device * dev, struct comedi_subde | |||
2921 | else | 2921 | else |
2922 | return ni_old_ao_config_chanlist(dev, s, chanspec, n_chans); | 2922 | return ni_old_ao_config_chanlist(dev, s, chanspec, n_chans); |
2923 | } | 2923 | } |
2924 | static int ni_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 2924 | static int ni_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
2925 | struct comedi_insn * insn, unsigned int * data) | 2925 | struct comedi_insn *insn, unsigned int *data) |
2926 | { | 2926 | { |
2927 | data[0] = devpriv->ao[CR_CHAN(insn->chanspec)]; | 2927 | data[0] = devpriv->ao[CR_CHAN(insn->chanspec)]; |
2928 | 2928 | ||
2929 | return 1; | 2929 | return 1; |
2930 | } | 2930 | } |
2931 | 2931 | ||
2932 | static int ni_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 2932 | static int ni_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
2933 | struct comedi_insn * insn, unsigned int * data) | 2933 | struct comedi_insn *insn, unsigned int *data) |
2934 | { | 2934 | { |
2935 | unsigned int chan = CR_CHAN(insn->chanspec); | 2935 | unsigned int chan = CR_CHAN(insn->chanspec); |
2936 | unsigned int invert; | 2936 | unsigned int invert; |
@@ -2948,8 +2948,8 @@ static int ni_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice | |||
2948 | return 1; | 2948 | return 1; |
2949 | } | 2949 | } |
2950 | 2950 | ||
2951 | static int ni_ao_insn_write_671x(struct comedi_device * dev, struct comedi_subdevice * s, | 2951 | static int ni_ao_insn_write_671x(struct comedi_device *dev, struct comedi_subdevice *s, |
2952 | struct comedi_insn * insn, unsigned int * data) | 2952 | struct comedi_insn *insn, unsigned int *data) |
2953 | { | 2953 | { |
2954 | unsigned int chan = CR_CHAN(insn->chanspec); | 2954 | unsigned int chan = CR_CHAN(insn->chanspec); |
2955 | unsigned int invert; | 2955 | unsigned int invert; |
@@ -2965,8 +2965,8 @@ static int ni_ao_insn_write_671x(struct comedi_device * dev, struct comedi_subde | |||
2965 | return 1; | 2965 | return 1; |
2966 | } | 2966 | } |
2967 | 2967 | ||
2968 | static int ni_ao_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 2968 | static int ni_ao_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
2969 | struct comedi_insn * insn, unsigned int * data) | 2969 | struct comedi_insn *insn, unsigned int *data) |
2970 | { | 2970 | { |
2971 | switch (data[0]) { | 2971 | switch (data[0]) { |
2972 | case INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE: | 2972 | case INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE: |
@@ -2991,7 +2991,7 @@ static int ni_ao_insn_config(struct comedi_device * dev, struct comedi_subdevice | |||
2991 | return -EINVAL; | 2991 | return -EINVAL; |
2992 | } | 2992 | } |
2993 | 2993 | ||
2994 | static int ni_ao_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, | 2994 | static int ni_ao_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, |
2995 | unsigned int trignum) | 2995 | unsigned int trignum) |
2996 | { | 2996 | { |
2997 | int ret; | 2997 | int ret; |
@@ -3062,7 +3062,7 @@ static int ni_ao_inttrig(struct comedi_device * dev, struct comedi_subdevice * s | |||
3062 | return 0; | 3062 | return 0; |
3063 | } | 3063 | } |
3064 | 3064 | ||
3065 | static int ni_ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 3065 | static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
3066 | { | 3066 | { |
3067 | const struct comedi_cmd *cmd = &s->async->cmd; | 3067 | const struct comedi_cmd *cmd = &s->async->cmd; |
3068 | int bits; | 3068 | int bits; |
@@ -3261,8 +3261,8 @@ static int ni_ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
3261 | return 0; | 3261 | return 0; |
3262 | } | 3262 | } |
3263 | 3263 | ||
3264 | static int ni_ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 3264 | static int ni_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
3265 | struct comedi_cmd * cmd) | 3265 | struct comedi_cmd *cmd) |
3266 | { | 3266 | { |
3267 | int err = 0; | 3267 | int err = 0; |
3268 | int tmp; | 3268 | int tmp; |
@@ -3384,7 +3384,7 @@ static int ni_ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s | |||
3384 | return 0; | 3384 | return 0; |
3385 | } | 3385 | } |
3386 | 3386 | ||
3387 | static int ni_ao_reset(struct comedi_device * dev, struct comedi_subdevice * s) | 3387 | static int ni_ao_reset(struct comedi_device *dev, struct comedi_subdevice *s) |
3388 | { | 3388 | { |
3389 | /* devpriv->ao0p=0x0000; */ | 3389 | /* devpriv->ao0p=0x0000; */ |
3390 | /* ni_writew(devpriv->ao0p,AO_Configuration); */ | 3390 | /* ni_writew(devpriv->ao0p,AO_Configuration); */ |
@@ -3436,8 +3436,8 @@ static int ni_ao_reset(struct comedi_device * dev, struct comedi_subdevice * s) | |||
3436 | 3436 | ||
3437 | /* digital io */ | 3437 | /* digital io */ |
3438 | 3438 | ||
3439 | static int ni_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 3439 | static int ni_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
3440 | struct comedi_insn * insn, unsigned int * data) | 3440 | struct comedi_insn *insn, unsigned int *data) |
3441 | { | 3441 | { |
3442 | #ifdef DEBUG_DIO | 3442 | #ifdef DEBUG_DIO |
3443 | rt_printk("ni_dio_insn_config() chan=%d io=%d\n", | 3443 | rt_printk("ni_dio_insn_config() chan=%d io=%d\n", |
@@ -3468,8 +3468,8 @@ static int ni_dio_insn_config(struct comedi_device * dev, struct comedi_subdevic | |||
3468 | return 1; | 3468 | return 1; |
3469 | } | 3469 | } |
3470 | 3470 | ||
3471 | static int ni_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 3471 | static int ni_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
3472 | struct comedi_insn * insn, unsigned int * data) | 3472 | struct comedi_insn *insn, unsigned int *data) |
3473 | { | 3473 | { |
3474 | #ifdef DEBUG_DIO | 3474 | #ifdef DEBUG_DIO |
3475 | rt_printk("ni_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0], data[1]); | 3475 | rt_printk("ni_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0], data[1]); |
@@ -3495,8 +3495,8 @@ static int ni_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice | |||
3495 | return 2; | 3495 | return 2; |
3496 | } | 3496 | } |
3497 | 3497 | ||
3498 | static int ni_m_series_dio_insn_config(struct comedi_device * dev, | 3498 | static int ni_m_series_dio_insn_config(struct comedi_device *dev, |
3499 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 3499 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
3500 | { | 3500 | { |
3501 | #ifdef DEBUG_DIO | 3501 | #ifdef DEBUG_DIO |
3502 | rt_printk("ni_m_series_dio_insn_config() chan=%d io=%d\n", | 3502 | rt_printk("ni_m_series_dio_insn_config() chan=%d io=%d\n", |
@@ -3525,8 +3525,8 @@ static int ni_m_series_dio_insn_config(struct comedi_device * dev, | |||
3525 | return 1; | 3525 | return 1; |
3526 | } | 3526 | } |
3527 | 3527 | ||
3528 | static int ni_m_series_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 3528 | static int ni_m_series_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
3529 | struct comedi_insn * insn, unsigned int * data) | 3529 | struct comedi_insn *insn, unsigned int *data) |
3530 | { | 3530 | { |
3531 | #ifdef DEBUG_DIO | 3531 | #ifdef DEBUG_DIO |
3532 | rt_printk("ni_m_series_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0], | 3532 | rt_printk("ni_m_series_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0], |
@@ -3544,8 +3544,8 @@ static int ni_m_series_dio_insn_bits(struct comedi_device * dev, struct comedi_s | |||
3544 | return 2; | 3544 | return 2; |
3545 | } | 3545 | } |
3546 | 3546 | ||
3547 | static int ni_cdio_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 3547 | static int ni_cdio_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
3548 | struct comedi_cmd * cmd) | 3548 | struct comedi_cmd *cmd) |
3549 | { | 3549 | { |
3550 | int err = 0; | 3550 | int err = 0; |
3551 | int tmp; | 3551 | int tmp; |
@@ -3653,7 +3653,7 @@ static int ni_cdio_cmdtest(struct comedi_device * dev, struct comedi_subdevice * | |||
3653 | return 0; | 3653 | return 0; |
3654 | } | 3654 | } |
3655 | 3655 | ||
3656 | static int ni_cdio_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 3656 | static int ni_cdio_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
3657 | { | 3657 | { |
3658 | const struct comedi_cmd *cmd = &s->async->cmd; | 3658 | const struct comedi_cmd *cmd = &s->async->cmd; |
3659 | unsigned cdo_mode_bits = CDO_FIFO_Mode_Bit | CDO_Halt_On_Error_Bit; | 3659 | unsigned cdo_mode_bits = CDO_FIFO_Mode_Bit | CDO_Halt_On_Error_Bit; |
@@ -3690,7 +3690,7 @@ static int ni_cdio_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
3690 | return 0; | 3690 | return 0; |
3691 | } | 3691 | } |
3692 | 3692 | ||
3693 | static int ni_cdo_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, | 3693 | static int ni_cdo_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, |
3694 | unsigned int trignum) | 3694 | unsigned int trignum) |
3695 | { | 3695 | { |
3696 | #ifdef PCIDMA | 3696 | #ifdef PCIDMA |
@@ -3738,7 +3738,7 @@ static int ni_cdo_inttrig(struct comedi_device * dev, struct comedi_subdevice * | |||
3738 | return retval; | 3738 | return retval; |
3739 | } | 3739 | } |
3740 | 3740 | ||
3741 | static int ni_cdio_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 3741 | static int ni_cdio_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
3742 | { | 3742 | { |
3743 | ni_writel(CDO_Disarm_Bit | CDO_Error_Interrupt_Enable_Clear_Bit | | 3743 | ni_writel(CDO_Disarm_Bit | CDO_Error_Interrupt_Enable_Clear_Bit | |
3744 | CDO_Empty_FIFO_Interrupt_Enable_Clear_Bit | | 3744 | CDO_Empty_FIFO_Interrupt_Enable_Clear_Bit | |
@@ -3753,7 +3753,7 @@ static int ni_cdio_cancel(struct comedi_device * dev, struct comedi_subdevice * | |||
3753 | return 0; | 3753 | return 0; |
3754 | } | 3754 | } |
3755 | 3755 | ||
3756 | static void handle_cdio_interrupt(struct comedi_device * dev) | 3756 | static void handle_cdio_interrupt(struct comedi_device *dev) |
3757 | { | 3757 | { |
3758 | unsigned cdio_status; | 3758 | unsigned cdio_status; |
3759 | struct comedi_subdevice *s = dev->subdevices + NI_DIO_SUBDEV; | 3759 | struct comedi_subdevice *s = dev->subdevices + NI_DIO_SUBDEV; |
@@ -3794,8 +3794,8 @@ static void handle_cdio_interrupt(struct comedi_device * dev) | |||
3794 | ni_event(dev, s); | 3794 | ni_event(dev, s); |
3795 | } | 3795 | } |
3796 | 3796 | ||
3797 | static int ni_serial_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 3797 | static int ni_serial_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
3798 | struct comedi_insn * insn, unsigned int * data) | 3798 | struct comedi_insn *insn, unsigned int *data) |
3799 | { | 3799 | { |
3800 | int err = insn->n; | 3800 | int err = insn->n; |
3801 | unsigned char byte_out, byte_in = 0; | 3801 | unsigned char byte_out, byte_in = 0; |
@@ -3888,7 +3888,7 @@ static int ni_serial_insn_config(struct comedi_device * dev, struct comedi_subde | |||
3888 | 3888 | ||
3889 | } | 3889 | } |
3890 | 3890 | ||
3891 | static int ni_serial_hw_readwrite8(struct comedi_device * dev, struct comedi_subdevice * s, | 3891 | static int ni_serial_hw_readwrite8(struct comedi_device *dev, struct comedi_subdevice *s, |
3892 | unsigned char data_out, unsigned char *data_in) | 3892 | unsigned char data_out, unsigned char *data_in) |
3893 | { | 3893 | { |
3894 | unsigned int status1; | 3894 | unsigned int status1; |
@@ -3944,7 +3944,7 @@ static int ni_serial_hw_readwrite8(struct comedi_device * dev, struct comedi_sub | |||
3944 | return err; | 3944 | return err; |
3945 | } | 3945 | } |
3946 | 3946 | ||
3947 | static int ni_serial_sw_readwrite8(struct comedi_device * dev, struct comedi_subdevice * s, | 3947 | static int ni_serial_sw_readwrite8(struct comedi_device *dev, struct comedi_subdevice *s, |
3948 | unsigned char data_out, unsigned char *data_in) | 3948 | unsigned char data_out, unsigned char *data_in) |
3949 | { | 3949 | { |
3950 | unsigned char mask, input = 0; | 3950 | unsigned char mask, input = 0; |
@@ -3997,7 +3997,7 @@ static int ni_serial_sw_readwrite8(struct comedi_device * dev, struct comedi_sub | |||
3997 | return 0; | 3997 | return 0; |
3998 | } | 3998 | } |
3999 | 3999 | ||
4000 | static void mio_common_detach(struct comedi_device * dev) | 4000 | static void mio_common_detach(struct comedi_device *dev) |
4001 | { | 4001 | { |
4002 | if (dev->private) { | 4002 | if (dev->private) { |
4003 | if (devpriv->counter_dev) { | 4003 | if (devpriv->counter_dev) { |
@@ -4008,7 +4008,7 @@ static void mio_common_detach(struct comedi_device * dev) | |||
4008 | subdev_8255_cleanup(dev, dev->subdevices + NI_8255_DIO_SUBDEV); | 4008 | subdev_8255_cleanup(dev, dev->subdevices + NI_8255_DIO_SUBDEV); |
4009 | } | 4009 | } |
4010 | 4010 | ||
4011 | static void init_ao_67xx(struct comedi_device * dev, struct comedi_subdevice * s) | 4011 | static void init_ao_67xx(struct comedi_device *dev, struct comedi_subdevice *s) |
4012 | { | 4012 | { |
4013 | int i; | 4013 | int i; |
4014 | 4014 | ||
@@ -4212,15 +4212,15 @@ static unsigned ni_gpct_read_register(struct ni_gpct *counter, | |||
4212 | return 0; | 4212 | return 0; |
4213 | } | 4213 | } |
4214 | 4214 | ||
4215 | static int ni_freq_out_insn_read(struct comedi_device * dev, | 4215 | static int ni_freq_out_insn_read(struct comedi_device *dev, |
4216 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 4216 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
4217 | { | 4217 | { |
4218 | data[0] = devpriv->clock_and_fout & FOUT_Divider_mask; | 4218 | data[0] = devpriv->clock_and_fout & FOUT_Divider_mask; |
4219 | return 1; | 4219 | return 1; |
4220 | } | 4220 | } |
4221 | 4221 | ||
4222 | static int ni_freq_out_insn_write(struct comedi_device * dev, | 4222 | static int ni_freq_out_insn_write(struct comedi_device *dev, |
4223 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 4223 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
4224 | { | 4224 | { |
4225 | devpriv->clock_and_fout &= ~FOUT_Enable; | 4225 | devpriv->clock_and_fout &= ~FOUT_Enable; |
4226 | devpriv->stc_writew(dev, devpriv->clock_and_fout, | 4226 | devpriv->stc_writew(dev, devpriv->clock_and_fout, |
@@ -4233,7 +4233,7 @@ static int ni_freq_out_insn_write(struct comedi_device * dev, | |||
4233 | return insn->n; | 4233 | return insn->n; |
4234 | } | 4234 | } |
4235 | 4235 | ||
4236 | static int ni_set_freq_out_clock(struct comedi_device * dev, unsigned int clock_source) | 4236 | static int ni_set_freq_out_clock(struct comedi_device *dev, unsigned int clock_source) |
4237 | { | 4237 | { |
4238 | switch (clock_source) { | 4238 | switch (clock_source) { |
4239 | case NI_FREQ_OUT_TIMEBASE_1_DIV_2_CLOCK_SRC: | 4239 | case NI_FREQ_OUT_TIMEBASE_1_DIV_2_CLOCK_SRC: |
@@ -4250,8 +4250,8 @@ static int ni_set_freq_out_clock(struct comedi_device * dev, unsigned int clock_ | |||
4250 | return 3; | 4250 | return 3; |
4251 | } | 4251 | } |
4252 | 4252 | ||
4253 | static void ni_get_freq_out_clock(struct comedi_device * dev, unsigned int * clock_source, | 4253 | static void ni_get_freq_out_clock(struct comedi_device *dev, unsigned int *clock_source, |
4254 | unsigned int * clock_period_ns) | 4254 | unsigned int *clock_period_ns) |
4255 | { | 4255 | { |
4256 | if (devpriv->clock_and_fout & FOUT_Timebase_Select) { | 4256 | if (devpriv->clock_and_fout & FOUT_Timebase_Select) { |
4257 | *clock_source = NI_FREQ_OUT_TIMEBASE_2_CLOCK_SRC; | 4257 | *clock_source = NI_FREQ_OUT_TIMEBASE_2_CLOCK_SRC; |
@@ -4262,8 +4262,8 @@ static void ni_get_freq_out_clock(struct comedi_device * dev, unsigned int * clo | |||
4262 | } | 4262 | } |
4263 | } | 4263 | } |
4264 | 4264 | ||
4265 | static int ni_freq_out_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 4265 | static int ni_freq_out_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
4266 | struct comedi_insn * insn, unsigned int * data) | 4266 | struct comedi_insn *insn, unsigned int *data) |
4267 | { | 4267 | { |
4268 | switch (data[0]) { | 4268 | switch (data[0]) { |
4269 | case INSN_CONFIG_SET_CLOCK_SRC: | 4269 | case INSN_CONFIG_SET_CLOCK_SRC: |
@@ -4278,7 +4278,7 @@ static int ni_freq_out_insn_config(struct comedi_device * dev, struct comedi_sub | |||
4278 | return -EINVAL; | 4278 | return -EINVAL; |
4279 | } | 4279 | } |
4280 | 4280 | ||
4281 | static int ni_alloc_private(struct comedi_device * dev) | 4281 | static int ni_alloc_private(struct comedi_device *dev) |
4282 | { | 4282 | { |
4283 | int ret; | 4283 | int ret; |
4284 | 4284 | ||
@@ -4293,7 +4293,7 @@ static int ni_alloc_private(struct comedi_device * dev) | |||
4293 | return 0; | 4293 | return 0; |
4294 | }; | 4294 | }; |
4295 | 4295 | ||
4296 | static int ni_E_init(struct comedi_device * dev, struct comedi_devconfig * it) | 4296 | static int ni_E_init(struct comedi_device *dev, struct comedi_devconfig *it) |
4297 | { | 4297 | { |
4298 | struct comedi_subdevice *s; | 4298 | struct comedi_subdevice *s; |
4299 | unsigned j; | 4299 | unsigned j; |
@@ -4627,8 +4627,8 @@ static int ni_8255_callback(int dir, int port, int data, unsigned long arg) | |||
4627 | presents the EEPROM as a subdevice | 4627 | presents the EEPROM as a subdevice |
4628 | */ | 4628 | */ |
4629 | 4629 | ||
4630 | static int ni_eeprom_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 4630 | static int ni_eeprom_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
4631 | struct comedi_insn * insn, unsigned int * data) | 4631 | struct comedi_insn *insn, unsigned int *data) |
4632 | { | 4632 | { |
4633 | data[0] = ni_read_eeprom(dev, CR_CHAN(insn->chanspec)); | 4633 | data[0] = ni_read_eeprom(dev, CR_CHAN(insn->chanspec)); |
4634 | 4634 | ||
@@ -4639,7 +4639,7 @@ static int ni_eeprom_insn_read(struct comedi_device * dev, struct comedi_subdevi | |||
4639 | reads bytes out of eeprom | 4639 | reads bytes out of eeprom |
4640 | */ | 4640 | */ |
4641 | 4641 | ||
4642 | static int ni_read_eeprom(struct comedi_device * dev, int addr) | 4642 | static int ni_read_eeprom(struct comedi_device *dev, int addr) |
4643 | { | 4643 | { |
4644 | int bit; | 4644 | int bit; |
4645 | int bitstring; | 4645 | int bitstring; |
@@ -4663,23 +4663,23 @@ static int ni_read_eeprom(struct comedi_device * dev, int addr) | |||
4663 | return bitstring; | 4663 | return bitstring; |
4664 | } | 4664 | } |
4665 | 4665 | ||
4666 | static int ni_m_series_eeprom_insn_read(struct comedi_device * dev, | 4666 | static int ni_m_series_eeprom_insn_read(struct comedi_device *dev, |
4667 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 4667 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
4668 | { | 4668 | { |
4669 | data[0] = devpriv->eeprom_buffer[CR_CHAN(insn->chanspec)]; | 4669 | data[0] = devpriv->eeprom_buffer[CR_CHAN(insn->chanspec)]; |
4670 | 4670 | ||
4671 | return 1; | 4671 | return 1; |
4672 | } | 4672 | } |
4673 | 4673 | ||
4674 | static int ni_get_pwm_config(struct comedi_device * dev, unsigned int * data) | 4674 | static int ni_get_pwm_config(struct comedi_device *dev, unsigned int *data) |
4675 | { | 4675 | { |
4676 | data[1] = devpriv->pwm_up_count * devpriv->clock_ns; | 4676 | data[1] = devpriv->pwm_up_count * devpriv->clock_ns; |
4677 | data[2] = devpriv->pwm_down_count * devpriv->clock_ns; | 4677 | data[2] = devpriv->pwm_down_count * devpriv->clock_ns; |
4678 | return 3; | 4678 | return 3; |
4679 | } | 4679 | } |
4680 | 4680 | ||
4681 | static int ni_m_series_pwm_config(struct comedi_device * dev, struct comedi_subdevice * s, | 4681 | static int ni_m_series_pwm_config(struct comedi_device *dev, struct comedi_subdevice *s, |
4682 | struct comedi_insn * insn, unsigned int * data) | 4682 | struct comedi_insn *insn, unsigned int *data) |
4683 | { | 4683 | { |
4684 | unsigned up_count, down_count; | 4684 | unsigned up_count, down_count; |
4685 | switch (data[0]) { | 4685 | switch (data[0]) { |
@@ -4743,8 +4743,8 @@ static int ni_m_series_pwm_config(struct comedi_device * dev, struct comedi_subd | |||
4743 | return 0; | 4743 | return 0; |
4744 | } | 4744 | } |
4745 | 4745 | ||
4746 | static int ni_6143_pwm_config(struct comedi_device * dev, struct comedi_subdevice * s, | 4746 | static int ni_6143_pwm_config(struct comedi_device *dev, struct comedi_subdevice *s, |
4747 | struct comedi_insn * insn, unsigned int * data) | 4747 | struct comedi_insn *insn, unsigned int *data) |
4748 | { | 4748 | { |
4749 | unsigned up_count, down_count; | 4749 | unsigned up_count, down_count; |
4750 | switch (data[0]) { | 4750 | switch (data[0]) { |
@@ -4806,20 +4806,20 @@ static int ni_6143_pwm_config(struct comedi_device * dev, struct comedi_subdevic | |||
4806 | return 0; | 4806 | return 0; |
4807 | } | 4807 | } |
4808 | 4808 | ||
4809 | static void ni_write_caldac(struct comedi_device * dev, int addr, int val); | 4809 | static void ni_write_caldac(struct comedi_device *dev, int addr, int val); |
4810 | /* | 4810 | /* |
4811 | calibration subdevice | 4811 | calibration subdevice |
4812 | */ | 4812 | */ |
4813 | static int ni_calib_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 4813 | static int ni_calib_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
4814 | struct comedi_insn * insn, unsigned int * data) | 4814 | struct comedi_insn *insn, unsigned int *data) |
4815 | { | 4815 | { |
4816 | ni_write_caldac(dev, CR_CHAN(insn->chanspec), data[0]); | 4816 | ni_write_caldac(dev, CR_CHAN(insn->chanspec), data[0]); |
4817 | 4817 | ||
4818 | return 1; | 4818 | return 1; |
4819 | } | 4819 | } |
4820 | 4820 | ||
4821 | static int ni_calib_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 4821 | static int ni_calib_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
4822 | struct comedi_insn * insn, unsigned int * data) | 4822 | struct comedi_insn *insn, unsigned int *data) |
4823 | { | 4823 | { |
4824 | data[0] = devpriv->caldacs[CR_CHAN(insn->chanspec)]; | 4824 | data[0] = devpriv->caldacs[CR_CHAN(insn->chanspec)]; |
4825 | 4825 | ||
@@ -4849,7 +4849,7 @@ static struct caldac_struct caldacs[] = { | |||
4849 | [ad8804_debug] = {16, 8, pack_ad8804}, | 4849 | [ad8804_debug] = {16, 8, pack_ad8804}, |
4850 | }; | 4850 | }; |
4851 | 4851 | ||
4852 | static void caldac_setup(struct comedi_device * dev, struct comedi_subdevice * s) | 4852 | static void caldac_setup(struct comedi_device *dev, struct comedi_subdevice *s) |
4853 | { | 4853 | { |
4854 | int i, j; | 4854 | int i, j; |
4855 | int n_dacs; | 4855 | int n_dacs; |
@@ -4902,7 +4902,7 @@ static void caldac_setup(struct comedi_device * dev, struct comedi_subdevice * s | |||
4902 | } | 4902 | } |
4903 | } | 4903 | } |
4904 | 4904 | ||
4905 | static void ni_write_caldac(struct comedi_device * dev, int addr, int val) | 4905 | static void ni_write_caldac(struct comedi_device *dev, int addr, int val) |
4906 | { | 4906 | { |
4907 | unsigned int loadbit = 0, bits = 0, bit, bitstring = 0; | 4907 | unsigned int loadbit = 0, bits = 0, bit, bitstring = 0; |
4908 | int i; | 4908 | int i; |
@@ -4989,7 +4989,7 @@ static int pack_ad8842(int addr, int val, int *bitstring) | |||
4989 | /* | 4989 | /* |
4990 | * Read the GPCTs current value. | 4990 | * Read the GPCTs current value. |
4991 | */ | 4991 | */ |
4992 | static int GPCT_G_Watch(struct comedi_device * dev, int chan) | 4992 | static int GPCT_G_Watch(struct comedi_device *dev, int chan) |
4993 | { | 4993 | { |
4994 | unsigned int hi1, hi2, lo; | 4994 | unsigned int hi1, hi2, lo; |
4995 | 4995 | ||
@@ -5012,7 +5012,7 @@ static int GPCT_G_Watch(struct comedi_device * dev, int chan) | |||
5012 | return (hi1 << 16) | lo; | 5012 | return (hi1 << 16) | lo; |
5013 | } | 5013 | } |
5014 | 5014 | ||
5015 | static void GPCT_Reset(struct comedi_device * dev, int chan) | 5015 | static void GPCT_Reset(struct comedi_device *dev, int chan) |
5016 | { | 5016 | { |
5017 | int temp_ack_reg = 0; | 5017 | int temp_ack_reg = 0; |
5018 | 5018 | ||
@@ -5074,28 +5074,28 @@ static void GPCT_Reset(struct comedi_device * dev, int chan) | |||
5074 | 5074 | ||
5075 | #endif | 5075 | #endif |
5076 | 5076 | ||
5077 | static int ni_gpct_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 5077 | static int ni_gpct_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
5078 | struct comedi_insn * insn, unsigned int * data) | 5078 | struct comedi_insn *insn, unsigned int *data) |
5079 | { | 5079 | { |
5080 | struct ni_gpct *counter = s->private; | 5080 | struct ni_gpct *counter = s->private; |
5081 | return ni_tio_insn_config(counter, insn, data); | 5081 | return ni_tio_insn_config(counter, insn, data); |
5082 | } | 5082 | } |
5083 | 5083 | ||
5084 | static int ni_gpct_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 5084 | static int ni_gpct_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
5085 | struct comedi_insn * insn, unsigned int * data) | 5085 | struct comedi_insn *insn, unsigned int *data) |
5086 | { | 5086 | { |
5087 | struct ni_gpct *counter = s->private; | 5087 | struct ni_gpct *counter = s->private; |
5088 | return ni_tio_rinsn(counter, insn, data); | 5088 | return ni_tio_rinsn(counter, insn, data); |
5089 | } | 5089 | } |
5090 | 5090 | ||
5091 | static int ni_gpct_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 5091 | static int ni_gpct_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
5092 | struct comedi_insn * insn, unsigned int * data) | 5092 | struct comedi_insn *insn, unsigned int *data) |
5093 | { | 5093 | { |
5094 | struct ni_gpct *counter = s->private; | 5094 | struct ni_gpct *counter = s->private; |
5095 | return ni_tio_winsn(counter, insn, data); | 5095 | return ni_tio_winsn(counter, insn, data); |
5096 | } | 5096 | } |
5097 | 5097 | ||
5098 | static int ni_gpct_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 5098 | static int ni_gpct_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
5099 | { | 5099 | { |
5100 | int retval; | 5100 | int retval; |
5101 | #ifdef PCIDMA | 5101 | #ifdef PCIDMA |
@@ -5118,8 +5118,8 @@ static int ni_gpct_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
5118 | return retval; | 5118 | return retval; |
5119 | } | 5119 | } |
5120 | 5120 | ||
5121 | static int ni_gpct_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 5121 | static int ni_gpct_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
5122 | struct comedi_cmd * cmd) | 5122 | struct comedi_cmd *cmd) |
5123 | { | 5123 | { |
5124 | #ifdef PCIDMA | 5124 | #ifdef PCIDMA |
5125 | struct ni_gpct *counter = s->private; | 5125 | struct ni_gpct *counter = s->private; |
@@ -5130,7 +5130,7 @@ static int ni_gpct_cmdtest(struct comedi_device * dev, struct comedi_subdevice * | |||
5130 | #endif | 5130 | #endif |
5131 | } | 5131 | } |
5132 | 5132 | ||
5133 | static int ni_gpct_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 5133 | static int ni_gpct_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
5134 | { | 5134 | { |
5135 | #ifdef PCIDMA | 5135 | #ifdef PCIDMA |
5136 | struct ni_gpct *counter = s->private; | 5136 | struct ni_gpct *counter = s->private; |
@@ -5151,7 +5151,7 @@ static int ni_gpct_cancel(struct comedi_device * dev, struct comedi_subdevice * | |||
5151 | * | 5151 | * |
5152 | */ | 5152 | */ |
5153 | 5153 | ||
5154 | static int ni_m_series_set_pfi_routing(struct comedi_device * dev, unsigned chan, | 5154 | static int ni_m_series_set_pfi_routing(struct comedi_device *dev, unsigned chan, |
5155 | unsigned source) | 5155 | unsigned source) |
5156 | { | 5156 | { |
5157 | unsigned pfi_reg_index; | 5157 | unsigned pfi_reg_index; |
@@ -5169,7 +5169,7 @@ static int ni_m_series_set_pfi_routing(struct comedi_device * dev, unsigned chan | |||
5169 | return 2; | 5169 | return 2; |
5170 | } | 5170 | } |
5171 | 5171 | ||
5172 | static int ni_old_set_pfi_routing(struct comedi_device * dev, unsigned chan, | 5172 | static int ni_old_set_pfi_routing(struct comedi_device *dev, unsigned chan, |
5173 | unsigned source) | 5173 | unsigned source) |
5174 | { | 5174 | { |
5175 | /* pre-m-series boards have fixed signals on pfi pins */ | 5175 | /* pre-m-series boards have fixed signals on pfi pins */ |
@@ -5178,7 +5178,7 @@ static int ni_old_set_pfi_routing(struct comedi_device * dev, unsigned chan, | |||
5178 | return 2; | 5178 | return 2; |
5179 | } | 5179 | } |
5180 | 5180 | ||
5181 | static int ni_set_pfi_routing(struct comedi_device * dev, unsigned chan, | 5181 | static int ni_set_pfi_routing(struct comedi_device *dev, unsigned chan, |
5182 | unsigned source) | 5182 | unsigned source) |
5183 | { | 5183 | { |
5184 | if (boardtype.reg_type & ni_reg_m_series_mask) | 5184 | if (boardtype.reg_type & ni_reg_m_series_mask) |
@@ -5187,14 +5187,14 @@ static int ni_set_pfi_routing(struct comedi_device * dev, unsigned chan, | |||
5187 | return ni_old_set_pfi_routing(dev, chan, source); | 5187 | return ni_old_set_pfi_routing(dev, chan, source); |
5188 | } | 5188 | } |
5189 | 5189 | ||
5190 | static unsigned ni_m_series_get_pfi_routing(struct comedi_device * dev, unsigned chan) | 5190 | static unsigned ni_m_series_get_pfi_routing(struct comedi_device *dev, unsigned chan) |
5191 | { | 5191 | { |
5192 | const unsigned array_offset = chan / 3; | 5192 | const unsigned array_offset = chan / 3; |
5193 | return MSeries_PFI_Output_Select_Source(chan, | 5193 | return MSeries_PFI_Output_Select_Source(chan, |
5194 | devpriv->pfi_output_select_reg[array_offset]); | 5194 | devpriv->pfi_output_select_reg[array_offset]); |
5195 | } | 5195 | } |
5196 | 5196 | ||
5197 | static unsigned ni_old_get_pfi_routing(struct comedi_device * dev, unsigned chan) | 5197 | static unsigned ni_old_get_pfi_routing(struct comedi_device *dev, unsigned chan) |
5198 | { | 5198 | { |
5199 | /* pre-m-series boards have fixed signals on pfi pins */ | 5199 | /* pre-m-series boards have fixed signals on pfi pins */ |
5200 | switch (chan) { | 5200 | switch (chan) { |
@@ -5235,7 +5235,7 @@ static unsigned ni_old_get_pfi_routing(struct comedi_device * dev, unsigned chan | |||
5235 | return 0; | 5235 | return 0; |
5236 | } | 5236 | } |
5237 | 5237 | ||
5238 | static unsigned ni_get_pfi_routing(struct comedi_device * dev, unsigned chan) | 5238 | static unsigned ni_get_pfi_routing(struct comedi_device *dev, unsigned chan) |
5239 | { | 5239 | { |
5240 | if (boardtype.reg_type & ni_reg_m_series_mask) | 5240 | if (boardtype.reg_type & ni_reg_m_series_mask) |
5241 | return ni_m_series_get_pfi_routing(dev, chan); | 5241 | return ni_m_series_get_pfi_routing(dev, chan); |
@@ -5243,7 +5243,7 @@ static unsigned ni_get_pfi_routing(struct comedi_device * dev, unsigned chan) | |||
5243 | return ni_old_get_pfi_routing(dev, chan); | 5243 | return ni_old_get_pfi_routing(dev, chan); |
5244 | } | 5244 | } |
5245 | 5245 | ||
5246 | static int ni_config_filter(struct comedi_device * dev, unsigned pfi_channel, | 5246 | static int ni_config_filter(struct comedi_device *dev, unsigned pfi_channel, |
5247 | enum ni_pfi_filter_select filter) | 5247 | enum ni_pfi_filter_select filter) |
5248 | { | 5248 | { |
5249 | unsigned bits; | 5249 | unsigned bits; |
@@ -5257,8 +5257,8 @@ static int ni_config_filter(struct comedi_device * dev, unsigned pfi_channel, | |||
5257 | return 0; | 5257 | return 0; |
5258 | } | 5258 | } |
5259 | 5259 | ||
5260 | static int ni_pfi_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 5260 | static int ni_pfi_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
5261 | struct comedi_insn * insn, unsigned int * data) | 5261 | struct comedi_insn *insn, unsigned int *data) |
5262 | { | 5262 | { |
5263 | if ((boardtype.reg_type & ni_reg_m_series_mask) == 0) { | 5263 | if ((boardtype.reg_type & ni_reg_m_series_mask) == 0) { |
5264 | return -ENOTSUPP; | 5264 | return -ENOTSUPP; |
@@ -5272,8 +5272,8 @@ static int ni_pfi_insn_bits(struct comedi_device * dev, struct comedi_subdevice | |||
5272 | return 2; | 5272 | return 2; |
5273 | } | 5273 | } |
5274 | 5274 | ||
5275 | static int ni_pfi_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 5275 | static int ni_pfi_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
5276 | struct comedi_insn * insn, unsigned int * data) | 5276 | struct comedi_insn *insn, unsigned int *data) |
5277 | { | 5277 | { |
5278 | unsigned int chan; | 5278 | unsigned int chan; |
5279 | 5279 | ||
@@ -5316,7 +5316,7 @@ static int ni_pfi_insn_config(struct comedi_device * dev, struct comedi_subdevic | |||
5316 | * NI RTSI Bus Functions | 5316 | * NI RTSI Bus Functions |
5317 | * | 5317 | * |
5318 | */ | 5318 | */ |
5319 | static void ni_rtsi_init(struct comedi_device * dev) | 5319 | static void ni_rtsi_init(struct comedi_device *dev) |
5320 | { | 5320 | { |
5321 | /* Initialises the RTSI bus signal switch to a default state */ | 5321 | /* Initialises the RTSI bus signal switch to a default state */ |
5322 | 5322 | ||
@@ -5351,8 +5351,8 @@ static void ni_rtsi_init(struct comedi_device * dev) | |||
5351 | */ | 5351 | */ |
5352 | } | 5352 | } |
5353 | 5353 | ||
5354 | static int ni_rtsi_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 5354 | static int ni_rtsi_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
5355 | struct comedi_insn * insn, unsigned int * data) | 5355 | struct comedi_insn *insn, unsigned int *data) |
5356 | { | 5356 | { |
5357 | if (insn->n != 2) | 5357 | if (insn->n != 2) |
5358 | return -EINVAL; | 5358 | return -EINVAL; |
@@ -5407,7 +5407,7 @@ static int ni_mseries_get_pll_parameters(unsigned reference_period_ns, | |||
5407 | return 0; | 5407 | return 0; |
5408 | } | 5408 | } |
5409 | 5409 | ||
5410 | static inline unsigned num_configurable_rtsi_channels(struct comedi_device * dev) | 5410 | static inline unsigned num_configurable_rtsi_channels(struct comedi_device *dev) |
5411 | { | 5411 | { |
5412 | if (boardtype.reg_type & ni_reg_m_series_mask) | 5412 | if (boardtype.reg_type & ni_reg_m_series_mask) |
5413 | return 8; | 5413 | return 8; |
@@ -5415,7 +5415,7 @@ static inline unsigned num_configurable_rtsi_channels(struct comedi_device * dev | |||
5415 | return 7; | 5415 | return 7; |
5416 | } | 5416 | } |
5417 | 5417 | ||
5418 | static int ni_mseries_set_pll_master_clock(struct comedi_device * dev, unsigned source, | 5418 | static int ni_mseries_set_pll_master_clock(struct comedi_device *dev, unsigned source, |
5419 | unsigned period_ns) | 5419 | unsigned period_ns) |
5420 | { | 5420 | { |
5421 | static const unsigned min_period_ns = 50; | 5421 | static const unsigned min_period_ns = 50; |
@@ -5512,7 +5512,7 @@ static int ni_mseries_set_pll_master_clock(struct comedi_device * dev, unsigned | |||
5512 | return 3; | 5512 | return 3; |
5513 | } | 5513 | } |
5514 | 5514 | ||
5515 | static int ni_set_master_clock(struct comedi_device * dev, unsigned source, | 5515 | static int ni_set_master_clock(struct comedi_device *dev, unsigned source, |
5516 | unsigned period_ns) | 5516 | unsigned period_ns) |
5517 | { | 5517 | { |
5518 | if (source == NI_MIO_INTERNAL_CLOCK) { | 5518 | if (source == NI_MIO_INTERNAL_CLOCK) { |
@@ -5556,7 +5556,7 @@ static int ni_set_master_clock(struct comedi_device * dev, unsigned source, | |||
5556 | return 3; | 5556 | return 3; |
5557 | } | 5557 | } |
5558 | 5558 | ||
5559 | static int ni_valid_rtsi_output_source(struct comedi_device * dev, unsigned chan, | 5559 | static int ni_valid_rtsi_output_source(struct comedi_device *dev, unsigned chan, |
5560 | unsigned source) | 5560 | unsigned source) |
5561 | { | 5561 | { |
5562 | if (chan >= num_configurable_rtsi_channels(dev)) { | 5562 | if (chan >= num_configurable_rtsi_channels(dev)) { |
@@ -5597,7 +5597,7 @@ static int ni_valid_rtsi_output_source(struct comedi_device * dev, unsigned chan | |||
5597 | } | 5597 | } |
5598 | } | 5598 | } |
5599 | 5599 | ||
5600 | static int ni_set_rtsi_routing(struct comedi_device * dev, unsigned chan, | 5600 | static int ni_set_rtsi_routing(struct comedi_device *dev, unsigned chan, |
5601 | unsigned source) | 5601 | unsigned source) |
5602 | { | 5602 | { |
5603 | if (ni_valid_rtsi_output_source(dev, chan, source) == 0) | 5603 | if (ni_valid_rtsi_output_source(dev, chan, source) == 0) |
@@ -5618,7 +5618,7 @@ static int ni_set_rtsi_routing(struct comedi_device * dev, unsigned chan, | |||
5618 | return 2; | 5618 | return 2; |
5619 | } | 5619 | } |
5620 | 5620 | ||
5621 | static unsigned ni_get_rtsi_routing(struct comedi_device * dev, unsigned chan) | 5621 | static unsigned ni_get_rtsi_routing(struct comedi_device *dev, unsigned chan) |
5622 | { | 5622 | { |
5623 | if (chan < 4) { | 5623 | if (chan < 4) { |
5624 | return RTSI_Trig_Output_Source(chan, | 5624 | return RTSI_Trig_Output_Source(chan, |
@@ -5634,8 +5634,8 @@ static unsigned ni_get_rtsi_routing(struct comedi_device * dev, unsigned chan) | |||
5634 | } | 5634 | } |
5635 | } | 5635 | } |
5636 | 5636 | ||
5637 | static int ni_rtsi_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 5637 | static int ni_rtsi_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
5638 | struct comedi_insn * insn, unsigned int * data) | 5638 | struct comedi_insn *insn, unsigned int *data) |
5639 | { | 5639 | { |
5640 | unsigned int chan = CR_CHAN(insn->chanspec); | 5640 | unsigned int chan = CR_CHAN(insn->chanspec); |
5641 | switch (data[0]) { | 5641 | switch (data[0]) { |
@@ -5706,7 +5706,7 @@ static int ni_rtsi_insn_config(struct comedi_device * dev, struct comedi_subdevi | |||
5706 | return 1; | 5706 | return 1; |
5707 | } | 5707 | } |
5708 | 5708 | ||
5709 | static int cs5529_wait_for_idle(struct comedi_device * dev) | 5709 | static int cs5529_wait_for_idle(struct comedi_device *dev) |
5710 | { | 5710 | { |
5711 | unsigned short status; | 5711 | unsigned short status; |
5712 | const int timeout = HZ; | 5712 | const int timeout = HZ; |
@@ -5730,7 +5730,7 @@ static int cs5529_wait_for_idle(struct comedi_device * dev) | |||
5730 | return 0; | 5730 | return 0; |
5731 | } | 5731 | } |
5732 | 5732 | ||
5733 | static void cs5529_command(struct comedi_device * dev, unsigned short value) | 5733 | static void cs5529_command(struct comedi_device *dev, unsigned short value) |
5734 | { | 5734 | { |
5735 | static const int timeout = 100; | 5735 | static const int timeout = 100; |
5736 | int i; | 5736 | int i; |
@@ -5752,7 +5752,7 @@ static void cs5529_command(struct comedi_device * dev, unsigned short value) | |||
5752 | } | 5752 | } |
5753 | 5753 | ||
5754 | /* write to cs5529 register */ | 5754 | /* write to cs5529 register */ |
5755 | static void cs5529_config_write(struct comedi_device * dev, unsigned int value, | 5755 | static void cs5529_config_write(struct comedi_device *dev, unsigned int value, |
5756 | unsigned int reg_select_bits) | 5756 | unsigned int reg_select_bits) |
5757 | { | 5757 | { |
5758 | ni_ao_win_outw(dev, ((value >> 16) & 0xff), | 5758 | ni_ao_win_outw(dev, ((value >> 16) & 0xff), |
@@ -5767,7 +5767,7 @@ static void cs5529_config_write(struct comedi_device * dev, unsigned int value, | |||
5767 | 5767 | ||
5768 | #ifdef NI_CS5529_DEBUG | 5768 | #ifdef NI_CS5529_DEBUG |
5769 | /* read from cs5529 register */ | 5769 | /* read from cs5529 register */ |
5770 | static unsigned int cs5529_config_read(struct comedi_device * dev, | 5770 | static unsigned int cs5529_config_read(struct comedi_device *dev, |
5771 | unsigned int reg_select_bits) | 5771 | unsigned int reg_select_bits) |
5772 | { | 5772 | { |
5773 | unsigned int value; | 5773 | unsigned int value; |
@@ -5783,7 +5783,7 @@ static unsigned int cs5529_config_read(struct comedi_device * dev, | |||
5783 | } | 5783 | } |
5784 | #endif | 5784 | #endif |
5785 | 5785 | ||
5786 | static int cs5529_do_conversion(struct comedi_device * dev, unsigned short *data) | 5786 | static int cs5529_do_conversion(struct comedi_device *dev, unsigned short *data) |
5787 | { | 5787 | { |
5788 | int retval; | 5788 | int retval; |
5789 | unsigned short status; | 5789 | unsigned short status; |
@@ -5813,8 +5813,8 @@ static int cs5529_do_conversion(struct comedi_device * dev, unsigned short *data | |||
5813 | return 0; | 5813 | return 0; |
5814 | } | 5814 | } |
5815 | 5815 | ||
5816 | static int cs5529_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 5816 | static int cs5529_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
5817 | struct comedi_insn * insn, unsigned int * data) | 5817 | struct comedi_insn *insn, unsigned int *data) |
5818 | { | 5818 | { |
5819 | int n, retval; | 5819 | int n, retval; |
5820 | unsigned short sample; | 5820 | unsigned short sample; |
@@ -5839,7 +5839,7 @@ static int cs5529_ai_insn_read(struct comedi_device * dev, struct comedi_subdevi | |||
5839 | return insn->n; | 5839 | return insn->n; |
5840 | } | 5840 | } |
5841 | 5841 | ||
5842 | static int init_cs5529(struct comedi_device * dev) | 5842 | static int init_cs5529(struct comedi_device *dev) |
5843 | { | 5843 | { |
5844 | unsigned int config_bits = | 5844 | unsigned int config_bits = |
5845 | CSCFG_PORT_MODE | CSCFG_WORD_RATE_2180_CYCLES; | 5845 | CSCFG_PORT_MODE | CSCFG_WORD_RATE_2180_CYCLES; |
diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c index eef01984ab2..a0301c5e290 100644 --- a/drivers/staging/comedi/drivers/ni_mio_cs.c +++ b/drivers/staging/comedi/drivers/ni_mio_cs.c | |||
@@ -196,7 +196,7 @@ struct ni_private { | |||
196 | * read/written directly in the I/O space of the board. The | 196 | * read/written directly in the I/O space of the board. The |
197 | * DAQCard devices map the low 8 STC registers to iobase+addr*2. */ | 197 | * DAQCard devices map the low 8 STC registers to iobase+addr*2. */ |
198 | 198 | ||
199 | static void mio_cs_win_out(struct comedi_device * dev, uint16_t data, int addr) | 199 | static void mio_cs_win_out(struct comedi_device *dev, uint16_t data, int addr) |
200 | { | 200 | { |
201 | unsigned long flags; | 201 | unsigned long flags; |
202 | 202 | ||
@@ -210,7 +210,7 @@ static void mio_cs_win_out(struct comedi_device * dev, uint16_t data, int addr) | |||
210 | comedi_spin_unlock_irqrestore(&devpriv->window_lock, flags); | 210 | comedi_spin_unlock_irqrestore(&devpriv->window_lock, flags); |
211 | } | 211 | } |
212 | 212 | ||
213 | static uint16_t mio_cs_win_in(struct comedi_device * dev, int addr) | 213 | static uint16_t mio_cs_win_in(struct comedi_device *dev, int addr) |
214 | { | 214 | { |
215 | unsigned long flags; | 215 | unsigned long flags; |
216 | uint16_t ret; | 216 | uint16_t ret; |
@@ -227,8 +227,8 @@ static uint16_t mio_cs_win_in(struct comedi_device * dev, int addr) | |||
227 | return ret; | 227 | return ret; |
228 | } | 228 | } |
229 | 229 | ||
230 | static int mio_cs_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 230 | static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
231 | static int mio_cs_detach(struct comedi_device * dev); | 231 | static int mio_cs_detach(struct comedi_device *dev); |
232 | static struct comedi_driver driver_ni_mio_cs = { | 232 | static struct comedi_driver driver_ni_mio_cs = { |
233 | driver_name:"ni_mio_cs", | 233 | driver_name:"ni_mio_cs", |
234 | module:THIS_MODULE, | 234 | module:THIS_MODULE, |
@@ -238,11 +238,11 @@ static struct comedi_driver driver_ni_mio_cs = { | |||
238 | 238 | ||
239 | #include "ni_mio_common.c" | 239 | #include "ni_mio_common.c" |
240 | 240 | ||
241 | static int ni_getboardtype(struct comedi_device * dev, struct pcmcia_device *link); | 241 | static int ni_getboardtype(struct comedi_device *dev, struct pcmcia_device *link); |
242 | 242 | ||
243 | /* clean up allocated resources */ | 243 | /* clean up allocated resources */ |
244 | /* called when driver is removed */ | 244 | /* called when driver is removed */ |
245 | static int mio_cs_detach(struct comedi_device * dev) | 245 | static int mio_cs_detach(struct comedi_device *dev) |
246 | { | 246 | { |
247 | mio_common_detach(dev); | 247 | mio_common_detach(dev); |
248 | 248 | ||
@@ -403,7 +403,7 @@ static void mio_cs_config(struct pcmcia_device *link) | |||
403 | link->dev_node = &dev_node; | 403 | link->dev_node = &dev_node; |
404 | } | 404 | } |
405 | 405 | ||
406 | static int mio_cs_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 406 | static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
407 | { | 407 | { |
408 | struct pcmcia_device *link; | 408 | struct pcmcia_device *link; |
409 | unsigned int irq; | 409 | unsigned int irq; |
@@ -468,7 +468,7 @@ static int mio_cs_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
468 | return 0; | 468 | return 0; |
469 | } | 469 | } |
470 | 470 | ||
471 | static int get_prodid(struct comedi_device * dev, struct pcmcia_device *link) | 471 | static int get_prodid(struct comedi_device *dev, struct pcmcia_device *link) |
472 | { | 472 | { |
473 | tuple_t tuple; | 473 | tuple_t tuple; |
474 | u_short buf[128]; | 474 | u_short buf[128]; |
@@ -487,7 +487,7 @@ static int get_prodid(struct comedi_device * dev, struct pcmcia_device *link) | |||
487 | return prodid; | 487 | return prodid; |
488 | } | 488 | } |
489 | 489 | ||
490 | static int ni_getboardtype(struct comedi_device * dev, struct pcmcia_device *link) | 490 | static int ni_getboardtype(struct comedi_device *dev, struct pcmcia_device *link) |
491 | { | 491 | { |
492 | int id; | 492 | int id; |
493 | int i; | 493 | int i; |
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c index 55c7ad43918..ffd619b0916 100644 --- a/drivers/staging/comedi/drivers/ni_pcidio.c +++ b/drivers/staging/comedi/drivers/ni_pcidio.c | |||
@@ -287,9 +287,9 @@ enum FPGA_Control_Bits { | |||
287 | #define IntEn (TransferReady|CountExpired|Waited|PrimaryTC|SecondaryTC) | 287 | #define IntEn (TransferReady|CountExpired|Waited|PrimaryTC|SecondaryTC) |
288 | #endif | 288 | #endif |
289 | 289 | ||
290 | static int nidio_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 290 | static int nidio_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
291 | static int nidio_detach(struct comedi_device * dev); | 291 | static int nidio_detach(struct comedi_device *dev); |
292 | static int ni_pcidio_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 292 | static int ni_pcidio_cancel(struct comedi_device *dev, struct comedi_subdevice *s); |
293 | 293 | ||
294 | static struct comedi_driver driver_pcidio = { | 294 | static struct comedi_driver driver_pcidio = { |
295 | driver_name:"ni_pcidio", | 295 | driver_name:"ni_pcidio", |
@@ -401,14 +401,14 @@ struct nidio96_private { | |||
401 | }; | 401 | }; |
402 | #define devpriv ((struct nidio96_private *)dev->private) | 402 | #define devpriv ((struct nidio96_private *)dev->private) |
403 | 403 | ||
404 | static int ni_pcidio_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 404 | static int ni_pcidio_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
405 | struct comedi_cmd * cmd); | 405 | struct comedi_cmd *cmd); |
406 | static int ni_pcidio_cmd(struct comedi_device * dev, struct comedi_subdevice * s); | 406 | static int ni_pcidio_cmd(struct comedi_device *dev, struct comedi_subdevice *s); |
407 | static int ni_pcidio_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, | 407 | static int ni_pcidio_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, |
408 | unsigned int trignum); | 408 | unsigned int trignum); |
409 | static int nidio_find_device(struct comedi_device * dev, int bus, int slot); | 409 | static int nidio_find_device(struct comedi_device *dev, int bus, int slot); |
410 | static int ni_pcidio_ns_to_timer(int *nanosec, int round_mode); | 410 | static int ni_pcidio_ns_to_timer(int *nanosec, int round_mode); |
411 | static int setup_mite_dma(struct comedi_device * dev, struct comedi_subdevice * s); | 411 | static int setup_mite_dma(struct comedi_device *dev, struct comedi_subdevice *s); |
412 | 412 | ||
413 | #ifdef DEBUG_FLAGS | 413 | #ifdef DEBUG_FLAGS |
414 | static void ni_pcidio_print_flags(unsigned int flags); | 414 | static void ni_pcidio_print_flags(unsigned int flags); |
@@ -418,7 +418,7 @@ static void ni_pcidio_print_status(unsigned int status); | |||
418 | #define ni_pcidio_print_status(x) | 418 | #define ni_pcidio_print_status(x) |
419 | #endif | 419 | #endif |
420 | 420 | ||
421 | static int ni_pcidio_request_di_mite_channel(struct comedi_device * dev) | 421 | static int ni_pcidio_request_di_mite_channel(struct comedi_device *dev) |
422 | { | 422 | { |
423 | unsigned long flags; | 423 | unsigned long flags; |
424 | 424 | ||
@@ -441,7 +441,7 @@ static int ni_pcidio_request_di_mite_channel(struct comedi_device * dev) | |||
441 | return 0; | 441 | return 0; |
442 | } | 442 | } |
443 | 443 | ||
444 | static void ni_pcidio_release_di_mite_channel(struct comedi_device * dev) | 444 | static void ni_pcidio_release_di_mite_channel(struct comedi_device *dev) |
445 | { | 445 | { |
446 | unsigned long flags; | 446 | unsigned long flags; |
447 | 447 | ||
@@ -469,7 +469,7 @@ static int nidio96_8255_cb(int dir, int port, int data, unsigned long iobase) | |||
469 | } | 469 | } |
470 | } | 470 | } |
471 | 471 | ||
472 | void ni_pcidio_event(struct comedi_device * dev, struct comedi_subdevice * s) | 472 | void ni_pcidio_event(struct comedi_device *dev, struct comedi_subdevice *s) |
473 | { | 473 | { |
474 | if (s->async-> | 474 | if (s->async-> |
475 | events & (COMEDI_CB_EOA | COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW)) | 475 | events & (COMEDI_CB_EOA | COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW)) |
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c index 752092b069d..3447d587553 100644 --- a/drivers/staging/comedi/drivers/ni_pcimio.c +++ b/drivers/staging/comedi/drivers/ni_pcimio.c | |||
@@ -1207,8 +1207,8 @@ static const struct ni_board_struct ni_boards[] = { | |||
1207 | 1207 | ||
1208 | #define n_pcimio_boards ((sizeof(ni_boards)/sizeof(ni_boards[0]))) | 1208 | #define n_pcimio_boards ((sizeof(ni_boards)/sizeof(ni_boards[0]))) |
1209 | 1209 | ||
1210 | static int pcimio_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 1210 | static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
1211 | static int pcimio_detach(struct comedi_device * dev); | 1211 | static int pcimio_detach(struct comedi_device *dev); |
1212 | static struct comedi_driver driver_pcimio = { | 1212 | static struct comedi_driver driver_pcimio = { |
1213 | driver_name: DRV_NAME, | 1213 | driver_name: DRV_NAME, |
1214 | module:THIS_MODULE, | 1214 | module:THIS_MODULE, |
@@ -1242,7 +1242,7 @@ struct ni_private { | |||
1242 | /* However, the 611x boards still aren't working, so I'm disabling | 1242 | /* However, the 611x boards still aren't working, so I'm disabling |
1243 | * non-windowed STC access temporarily */ | 1243 | * non-windowed STC access temporarily */ |
1244 | 1244 | ||
1245 | static void e_series_win_out(struct comedi_device * dev, uint16_t data, int reg) | 1245 | static void e_series_win_out(struct comedi_device *dev, uint16_t data, int reg) |
1246 | { | 1246 | { |
1247 | unsigned long flags; | 1247 | unsigned long flags; |
1248 | 1248 | ||
@@ -1252,7 +1252,7 @@ static void e_series_win_out(struct comedi_device * dev, uint16_t data, int reg) | |||
1252 | comedi_spin_unlock_irqrestore(&devpriv->window_lock, flags); | 1252 | comedi_spin_unlock_irqrestore(&devpriv->window_lock, flags); |
1253 | } | 1253 | } |
1254 | 1254 | ||
1255 | static uint16_t e_series_win_in(struct comedi_device * dev, int reg) | 1255 | static uint16_t e_series_win_in(struct comedi_device *dev, int reg) |
1256 | { | 1256 | { |
1257 | unsigned long flags; | 1257 | unsigned long flags; |
1258 | uint16_t ret; | 1258 | uint16_t ret; |
@@ -1265,7 +1265,7 @@ static uint16_t e_series_win_in(struct comedi_device * dev, int reg) | |||
1265 | return ret; | 1265 | return ret; |
1266 | } | 1266 | } |
1267 | 1267 | ||
1268 | static void m_series_stc_writew(struct comedi_device * dev, uint16_t data, int reg) | 1268 | static void m_series_stc_writew(struct comedi_device *dev, uint16_t data, int reg) |
1269 | { | 1269 | { |
1270 | unsigned offset; | 1270 | unsigned offset; |
1271 | switch (reg) { | 1271 | switch (reg) { |
@@ -1420,7 +1420,7 @@ static void m_series_stc_writew(struct comedi_device * dev, uint16_t data, int r | |||
1420 | ni_writew(data, offset); | 1420 | ni_writew(data, offset); |
1421 | } | 1421 | } |
1422 | 1422 | ||
1423 | static uint16_t m_series_stc_readw(struct comedi_device * dev, int reg) | 1423 | static uint16_t m_series_stc_readw(struct comedi_device *dev, int reg) |
1424 | { | 1424 | { |
1425 | unsigned offset; | 1425 | unsigned offset; |
1426 | switch (reg) { | 1426 | switch (reg) { |
@@ -1455,7 +1455,7 @@ static uint16_t m_series_stc_readw(struct comedi_device * dev, int reg) | |||
1455 | return ni_readw(offset); | 1455 | return ni_readw(offset); |
1456 | } | 1456 | } |
1457 | 1457 | ||
1458 | static void m_series_stc_writel(struct comedi_device * dev, uint32_t data, int reg) | 1458 | static void m_series_stc_writel(struct comedi_device *dev, uint32_t data, int reg) |
1459 | { | 1459 | { |
1460 | unsigned offset; | 1460 | unsigned offset; |
1461 | switch (reg) { | 1461 | switch (reg) { |
@@ -1496,7 +1496,7 @@ static void m_series_stc_writel(struct comedi_device * dev, uint32_t data, int r | |||
1496 | ni_writel(data, offset); | 1496 | ni_writel(data, offset); |
1497 | } | 1497 | } |
1498 | 1498 | ||
1499 | static uint32_t m_series_stc_readl(struct comedi_device * dev, int reg) | 1499 | static uint32_t m_series_stc_readl(struct comedi_device *dev, int reg) |
1500 | { | 1500 | { |
1501 | unsigned offset; | 1501 | unsigned offset; |
1502 | switch (reg) { | 1502 | switch (reg) { |
@@ -1529,19 +1529,19 @@ static uint32_t m_series_stc_readl(struct comedi_device * dev, int reg) | |||
1529 | 1529 | ||
1530 | #include "ni_mio_common.c" | 1530 | #include "ni_mio_common.c" |
1531 | 1531 | ||
1532 | static int pcimio_find_device(struct comedi_device * dev, int bus, int slot); | 1532 | static int pcimio_find_device(struct comedi_device *dev, int bus, int slot); |
1533 | static int pcimio_ai_change(struct comedi_device * dev, struct comedi_subdevice * s, | 1533 | static int pcimio_ai_change(struct comedi_device *dev, struct comedi_subdevice *s, |
1534 | unsigned long new_size); | 1534 | unsigned long new_size); |
1535 | static int pcimio_ao_change(struct comedi_device * dev, struct comedi_subdevice * s, | 1535 | static int pcimio_ao_change(struct comedi_device *dev, struct comedi_subdevice *s, |
1536 | unsigned long new_size); | 1536 | unsigned long new_size); |
1537 | static int pcimio_gpct0_change(struct comedi_device * dev, struct comedi_subdevice * s, | 1537 | static int pcimio_gpct0_change(struct comedi_device *dev, struct comedi_subdevice *s, |
1538 | unsigned long new_size); | 1538 | unsigned long new_size); |
1539 | static int pcimio_gpct1_change(struct comedi_device * dev, struct comedi_subdevice * s, | 1539 | static int pcimio_gpct1_change(struct comedi_device *dev, struct comedi_subdevice *s, |
1540 | unsigned long new_size); | 1540 | unsigned long new_size); |
1541 | static int pcimio_dio_change(struct comedi_device * dev, struct comedi_subdevice * s, | 1541 | static int pcimio_dio_change(struct comedi_device *dev, struct comedi_subdevice *s, |
1542 | unsigned long new_size); | 1542 | unsigned long new_size); |
1543 | 1543 | ||
1544 | static void m_series_init_eeprom_buffer(struct comedi_device * dev) | 1544 | static void m_series_init_eeprom_buffer(struct comedi_device *dev) |
1545 | { | 1545 | { |
1546 | static const int Start_Cal_EEPROM = 0x400; | 1546 | static const int Start_Cal_EEPROM = 0x400; |
1547 | static const unsigned window_size = 10; | 1547 | static const unsigned window_size = 10; |
@@ -1578,7 +1578,7 @@ static void m_series_init_eeprom_buffer(struct comedi_device * dev) | |||
1578 | writel(0x0, devpriv->mite->mite_io_addr + 0x30); | 1578 | writel(0x0, devpriv->mite->mite_io_addr + 0x30); |
1579 | } | 1579 | } |
1580 | 1580 | ||
1581 | static void init_6143(struct comedi_device * dev) | 1581 | static void init_6143(struct comedi_device *dev) |
1582 | { | 1582 | { |
1583 | /* Disable interrupts */ | 1583 | /* Disable interrupts */ |
1584 | devpriv->stc_writew(dev, 0, Interrupt_Control_Register); | 1584 | devpriv->stc_writew(dev, 0, Interrupt_Control_Register); |
@@ -1598,7 +1598,7 @@ static void init_6143(struct comedi_device * dev) | |||
1598 | } | 1598 | } |
1599 | 1599 | ||
1600 | /* cleans up allocated resources */ | 1600 | /* cleans up allocated resources */ |
1601 | static int pcimio_detach(struct comedi_device * dev) | 1601 | static int pcimio_detach(struct comedi_device *dev) |
1602 | { | 1602 | { |
1603 | mio_common_detach(dev); | 1603 | mio_common_detach(dev); |
1604 | if (dev->irq) { | 1604 | if (dev->irq) { |
@@ -1617,7 +1617,7 @@ static int pcimio_detach(struct comedi_device * dev) | |||
1617 | return 0; | 1617 | return 0; |
1618 | } | 1618 | } |
1619 | 1619 | ||
1620 | static int pcimio_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 1620 | static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
1621 | { | 1621 | { |
1622 | int ret; | 1622 | int ret; |
1623 | 1623 | ||
@@ -1700,7 +1700,7 @@ static int pcimio_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
1700 | return ret; | 1700 | return ret; |
1701 | } | 1701 | } |
1702 | 1702 | ||
1703 | static int pcimio_find_device(struct comedi_device * dev, int bus, int slot) | 1703 | static int pcimio_find_device(struct comedi_device *dev, int bus, int slot) |
1704 | { | 1704 | { |
1705 | struct mite_struct *mite; | 1705 | struct mite_struct *mite; |
1706 | int i; | 1706 | int i; |
@@ -1728,7 +1728,7 @@ static int pcimio_find_device(struct comedi_device * dev, int bus, int slot) | |||
1728 | return -EIO; | 1728 | return -EIO; |
1729 | } | 1729 | } |
1730 | 1730 | ||
1731 | static int pcimio_ai_change(struct comedi_device * dev, struct comedi_subdevice * s, | 1731 | static int pcimio_ai_change(struct comedi_device *dev, struct comedi_subdevice *s, |
1732 | unsigned long new_size) | 1732 | unsigned long new_size) |
1733 | { | 1733 | { |
1734 | int ret; | 1734 | int ret; |
@@ -1740,7 +1740,7 @@ static int pcimio_ai_change(struct comedi_device * dev, struct comedi_subdevice | |||
1740 | return 0; | 1740 | return 0; |
1741 | } | 1741 | } |
1742 | 1742 | ||
1743 | static int pcimio_ao_change(struct comedi_device * dev, struct comedi_subdevice * s, | 1743 | static int pcimio_ao_change(struct comedi_device *dev, struct comedi_subdevice *s, |
1744 | unsigned long new_size) | 1744 | unsigned long new_size) |
1745 | { | 1745 | { |
1746 | int ret; | 1746 | int ret; |
@@ -1752,7 +1752,7 @@ static int pcimio_ao_change(struct comedi_device * dev, struct comedi_subdevice | |||
1752 | return 0; | 1752 | return 0; |
1753 | } | 1753 | } |
1754 | 1754 | ||
1755 | static int pcimio_gpct0_change(struct comedi_device * dev, struct comedi_subdevice * s, | 1755 | static int pcimio_gpct0_change(struct comedi_device *dev, struct comedi_subdevice *s, |
1756 | unsigned long new_size) | 1756 | unsigned long new_size) |
1757 | { | 1757 | { |
1758 | int ret; | 1758 | int ret; |
@@ -1764,7 +1764,7 @@ static int pcimio_gpct0_change(struct comedi_device * dev, struct comedi_subdevi | |||
1764 | return 0; | 1764 | return 0; |
1765 | } | 1765 | } |
1766 | 1766 | ||
1767 | static int pcimio_gpct1_change(struct comedi_device * dev, struct comedi_subdevice * s, | 1767 | static int pcimio_gpct1_change(struct comedi_device *dev, struct comedi_subdevice *s, |
1768 | unsigned long new_size) | 1768 | unsigned long new_size) |
1769 | { | 1769 | { |
1770 | int ret; | 1770 | int ret; |
@@ -1776,7 +1776,7 @@ static int pcimio_gpct1_change(struct comedi_device * dev, struct comedi_subdevi | |||
1776 | return 0; | 1776 | return 0; |
1777 | } | 1777 | } |
1778 | 1778 | ||
1779 | static int pcimio_dio_change(struct comedi_device * dev, struct comedi_subdevice * s, | 1779 | static int pcimio_dio_change(struct comedi_device *dev, struct comedi_subdevice *s, |
1780 | unsigned long new_size) | 1780 | unsigned long new_size) |
1781 | { | 1781 | { |
1782 | int ret; | 1782 | int ret; |
diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c index 7457b4ffbe8..bdb232635ab 100644 --- a/drivers/staging/comedi/drivers/ni_tio.c +++ b/drivers/staging/comedi/drivers/ni_tio.c | |||
@@ -279,9 +279,9 @@ static void __exit ni_tio_cleanup_module(void) | |||
279 | module_exit(ni_tio_cleanup_module); | 279 | module_exit(ni_tio_cleanup_module); |
280 | 280 | ||
281 | struct ni_gpct_device *ni_gpct_device_construct(struct comedi_device * dev, | 281 | struct ni_gpct_device *ni_gpct_device_construct(struct comedi_device * dev, |
282 | void (*write_register) (struct ni_gpct * counter, unsigned bits, | 282 | void (*write_register) (struct ni_gpct *counter, unsigned bits, |
283 | enum ni_gpct_register reg), | 283 | enum ni_gpct_register reg), |
284 | unsigned (*read_register) (struct ni_gpct * counter, | 284 | unsigned (*read_register) (struct ni_gpct *counter, |
285 | enum ni_gpct_register reg), enum ni_gpct_variant variant, | 285 | enum ni_gpct_register reg), enum ni_gpct_variant variant, |
286 | unsigned num_counters) | 286 | unsigned num_counters) |
287 | { | 287 | { |
@@ -965,7 +965,7 @@ static uint64_t ni_tio_clock_period_ps(const struct ni_gpct *counter, | |||
965 | } | 965 | } |
966 | 966 | ||
967 | static void ni_tio_get_clock_src(struct ni_gpct *counter, | 967 | static void ni_tio_get_clock_src(struct ni_gpct *counter, |
968 | unsigned int * clock_source, unsigned int * period_ns) | 968 | unsigned int *clock_source, unsigned int *period_ns) |
969 | { | 969 | { |
970 | static const unsigned pico_per_nano = 1000; | 970 | static const unsigned pico_per_nano = 1000; |
971 | uint64_t temp64; | 971 | uint64_t temp64; |
@@ -1442,7 +1442,7 @@ static unsigned ni_m_series_second_gate_to_generic_gate_source(unsigned | |||
1442 | }; | 1442 | }; |
1443 | 1443 | ||
1444 | static int ni_tio_get_gate_src(struct ni_gpct *counter, unsigned gate_index, | 1444 | static int ni_tio_get_gate_src(struct ni_gpct *counter, unsigned gate_index, |
1445 | unsigned int * gate_source) | 1445 | unsigned int *gate_source) |
1446 | { | 1446 | { |
1447 | struct ni_gpct_device *counter_dev = counter->counter_dev; | 1447 | struct ni_gpct_device *counter_dev = counter->counter_dev; |
1448 | const unsigned mode_bits = ni_tio_get_soft_copy(counter, | 1448 | const unsigned mode_bits = ni_tio_get_soft_copy(counter, |
@@ -1534,7 +1534,7 @@ static int ni_tio_get_gate_src(struct ni_gpct *counter, unsigned gate_index, | |||
1534 | } | 1534 | } |
1535 | 1535 | ||
1536 | int ni_tio_insn_config(struct ni_gpct *counter, | 1536 | int ni_tio_insn_config(struct ni_gpct *counter, |
1537 | struct comedi_insn * insn, unsigned int * data) | 1537 | struct comedi_insn *insn, unsigned int *data) |
1538 | { | 1538 | { |
1539 | switch (data[0]) { | 1539 | switch (data[0]) { |
1540 | case INSN_CONFIG_SET_COUNTER_MODE: | 1540 | case INSN_CONFIG_SET_COUNTER_MODE: |
diff --git a/drivers/staging/comedi/drivers/ni_tio.h b/drivers/staging/comedi/drivers/ni_tio.h index f9e7b8343ae..3aacfe2f242 100644 --- a/drivers/staging/comedi/drivers/ni_tio.h +++ b/drivers/staging/comedi/drivers/ni_tio.h | |||
@@ -120,9 +120,9 @@ struct ni_gpct { | |||
120 | 120 | ||
121 | struct ni_gpct_device { | 121 | struct ni_gpct_device { |
122 | struct comedi_device *dev; | 122 | struct comedi_device *dev; |
123 | void (*write_register) (struct ni_gpct * counter, unsigned bits, | 123 | void (*write_register) (struct ni_gpct *counter, unsigned bits, |
124 | enum ni_gpct_register reg); | 124 | enum ni_gpct_register reg); |
125 | unsigned (*read_register) (struct ni_gpct * counter, | 125 | unsigned (*read_register) (struct ni_gpct *counter, |
126 | enum ni_gpct_register reg); | 126 | enum ni_gpct_register reg); |
127 | enum ni_gpct_variant variant; | 127 | enum ni_gpct_variant variant; |
128 | struct ni_gpct *counters; | 128 | struct ni_gpct *counters; |
@@ -132,24 +132,24 @@ struct ni_gpct_device { | |||
132 | }; | 132 | }; |
133 | 133 | ||
134 | extern struct ni_gpct_device *ni_gpct_device_construct(struct comedi_device * dev, | 134 | extern struct ni_gpct_device *ni_gpct_device_construct(struct comedi_device * dev, |
135 | void (*write_register) (struct ni_gpct * counter, unsigned bits, | 135 | void (*write_register) (struct ni_gpct *counter, unsigned bits, |
136 | enum ni_gpct_register reg), | 136 | enum ni_gpct_register reg), |
137 | unsigned (*read_register) (struct ni_gpct * counter, | 137 | unsigned (*read_register) (struct ni_gpct *counter, |
138 | enum ni_gpct_register reg), enum ni_gpct_variant variant, | 138 | enum ni_gpct_register reg), enum ni_gpct_variant variant, |
139 | unsigned num_counters); | 139 | unsigned num_counters); |
140 | extern void ni_gpct_device_destroy(struct ni_gpct_device *counter_dev); | 140 | extern void ni_gpct_device_destroy(struct ni_gpct_device *counter_dev); |
141 | extern void ni_tio_init_counter(struct ni_gpct *counter); | 141 | extern void ni_tio_init_counter(struct ni_gpct *counter); |
142 | extern int ni_tio_rinsn(struct ni_gpct *counter, | 142 | extern int ni_tio_rinsn(struct ni_gpct *counter, |
143 | struct comedi_insn * insn, unsigned int * data); | 143 | struct comedi_insn *insn, unsigned int *data); |
144 | extern int ni_tio_insn_config(struct ni_gpct *counter, | 144 | extern int ni_tio_insn_config(struct ni_gpct *counter, |
145 | struct comedi_insn * insn, unsigned int * data); | 145 | struct comedi_insn *insn, unsigned int *data); |
146 | extern int ni_tio_winsn(struct ni_gpct *counter, | 146 | extern int ni_tio_winsn(struct ni_gpct *counter, |
147 | struct comedi_insn * insn, unsigned int * data); | 147 | struct comedi_insn *insn, unsigned int *data); |
148 | extern int ni_tio_cmd(struct ni_gpct *counter, struct comedi_async *async); | 148 | extern int ni_tio_cmd(struct ni_gpct *counter, struct comedi_async *async); |
149 | extern int ni_tio_cmdtest(struct ni_gpct *counter, struct comedi_cmd * cmd); | 149 | extern int ni_tio_cmdtest(struct ni_gpct *counter, struct comedi_cmd * cmd); |
150 | extern int ni_tio_cancel(struct ni_gpct *counter); | 150 | extern int ni_tio_cancel(struct ni_gpct *counter); |
151 | extern void ni_tio_handle_interrupt(struct ni_gpct *counter, | 151 | extern void ni_tio_handle_interrupt(struct ni_gpct *counter, |
152 | struct comedi_subdevice * s); | 152 | struct comedi_subdevice *s); |
153 | extern void ni_tio_set_mite_channel(struct ni_gpct *counter, | 153 | extern void ni_tio_set_mite_channel(struct ni_gpct *counter, |
154 | struct mite_channel *mite_chan); | 154 | struct mite_channel *mite_chan); |
155 | extern void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, | 155 | extern void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, |
diff --git a/drivers/staging/comedi/drivers/ni_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c index a3c55979cf4..fcf4eb6cdf6 100644 --- a/drivers/staging/comedi/drivers/ni_tiocmd.c +++ b/drivers/staging/comedi/drivers/ni_tiocmd.c | |||
@@ -96,7 +96,7 @@ static void ni_tio_configure_dma(struct ni_gpct *counter, short enable, | |||
96 | } | 96 | } |
97 | } | 97 | } |
98 | 98 | ||
99 | static int ni_tio_input_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, | 99 | static int ni_tio_input_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, |
100 | unsigned int trignum) | 100 | unsigned int trignum) |
101 | { | 101 | { |
102 | unsigned long flags; | 102 | unsigned long flags; |
diff --git a/drivers/staging/comedi/drivers/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c index 7b99471a436..73b56b36d7c 100644 --- a/drivers/staging/comedi/drivers/pcl711.c +++ b/drivers/staging/comedi/drivers/pcl711.c | |||
@@ -156,8 +156,8 @@ static const struct pcl711_board boardtypes[] = { | |||
156 | #define n_boardtypes (sizeof(boardtypes)/sizeof(struct pcl711_board)) | 156 | #define n_boardtypes (sizeof(boardtypes)/sizeof(struct pcl711_board)) |
157 | #define this_board ((const struct pcl711_board *)dev->board_ptr) | 157 | #define this_board ((const struct pcl711_board *)dev->board_ptr) |
158 | 158 | ||
159 | static int pcl711_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 159 | static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
160 | static int pcl711_detach(struct comedi_device * dev); | 160 | static int pcl711_detach(struct comedi_device *dev); |
161 | static struct comedi_driver driver_pcl711 = { | 161 | static struct comedi_driver driver_pcl711 = { |
162 | driver_name:"pcl711", | 162 | driver_name:"pcl711", |
163 | module:THIS_MODULE, | 163 | module:THIS_MODULE, |
@@ -217,7 +217,7 @@ static irqreturn_t pcl711_interrupt(int irq, void *d) | |||
217 | return IRQ_HANDLED; | 217 | return IRQ_HANDLED; |
218 | } | 218 | } |
219 | 219 | ||
220 | static void pcl711_set_changain(struct comedi_device * dev, int chan) | 220 | static void pcl711_set_changain(struct comedi_device *dev, int chan) |
221 | { | 221 | { |
222 | int chan_register; | 222 | int chan_register; |
223 | 223 | ||
@@ -244,8 +244,8 @@ static void pcl711_set_changain(struct comedi_device * dev, int chan) | |||
244 | } | 244 | } |
245 | } | 245 | } |
246 | 246 | ||
247 | static int pcl711_ai_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 247 | static int pcl711_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
248 | struct comedi_insn * insn, unsigned int * data) | 248 | struct comedi_insn *insn, unsigned int *data) |
249 | { | 249 | { |
250 | int i, n; | 250 | int i, n; |
251 | int hi, lo; | 251 | int hi, lo; |
@@ -283,8 +283,8 @@ static int pcl711_ai_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
283 | return n; | 283 | return n; |
284 | } | 284 | } |
285 | 285 | ||
286 | static int pcl711_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 286 | static int pcl711_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
287 | struct comedi_cmd * cmd) | 287 | struct comedi_cmd *cmd) |
288 | { | 288 | { |
289 | int tmp; | 289 | int tmp; |
290 | int err = 0; | 290 | int err = 0; |
@@ -385,7 +385,7 @@ static int pcl711_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice | |||
385 | return 0; | 385 | return 0; |
386 | } | 386 | } |
387 | 387 | ||
388 | static int pcl711_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 388 | static int pcl711_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
389 | { | 389 | { |
390 | int timer1, timer2; | 390 | int timer1, timer2; |
391 | struct comedi_cmd *cmd = &s->async->cmd; | 391 | struct comedi_cmd *cmd = &s->async->cmd; |
@@ -431,8 +431,8 @@ static int pcl711_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s | |||
431 | /* | 431 | /* |
432 | analog output | 432 | analog output |
433 | */ | 433 | */ |
434 | static int pcl711_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 434 | static int pcl711_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
435 | struct comedi_insn * insn, unsigned int * data) | 435 | struct comedi_insn *insn, unsigned int *data) |
436 | { | 436 | { |
437 | int n; | 437 | int n; |
438 | int chan = CR_CHAN(insn->chanspec); | 438 | int chan = CR_CHAN(insn->chanspec); |
@@ -449,8 +449,8 @@ static int pcl711_ao_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
449 | return n; | 449 | return n; |
450 | } | 450 | } |
451 | 451 | ||
452 | static int pcl711_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 452 | static int pcl711_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
453 | struct comedi_insn * insn, unsigned int * data) | 453 | struct comedi_insn *insn, unsigned int *data) |
454 | { | 454 | { |
455 | int n; | 455 | int n; |
456 | int chan = CR_CHAN(insn->chanspec); | 456 | int chan = CR_CHAN(insn->chanspec); |
@@ -464,8 +464,8 @@ static int pcl711_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi | |||
464 | } | 464 | } |
465 | 465 | ||
466 | /* Digital port read - Untested on 8112 */ | 466 | /* Digital port read - Untested on 8112 */ |
467 | static int pcl711_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 467 | static int pcl711_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
468 | struct comedi_insn * insn, unsigned int * data) | 468 | struct comedi_insn *insn, unsigned int *data) |
469 | { | 469 | { |
470 | if (insn->n != 2) | 470 | if (insn->n != 2) |
471 | return -EINVAL; | 471 | return -EINVAL; |
@@ -477,8 +477,8 @@ static int pcl711_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi | |||
477 | } | 477 | } |
478 | 478 | ||
479 | /* Digital port write - Untested on 8112 */ | 479 | /* Digital port write - Untested on 8112 */ |
480 | static int pcl711_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 480 | static int pcl711_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
481 | struct comedi_insn * insn, unsigned int * data) | 481 | struct comedi_insn *insn, unsigned int *data) |
482 | { | 482 | { |
483 | if (insn->n != 2) | 483 | if (insn->n != 2) |
484 | return -EINVAL; | 484 | return -EINVAL; |
@@ -498,7 +498,7 @@ static int pcl711_do_insn_bits(struct comedi_device * dev, struct comedi_subdevi | |||
498 | } | 498 | } |
499 | 499 | ||
500 | /* Free any resources that we have claimed */ | 500 | /* Free any resources that we have claimed */ |
501 | static int pcl711_detach(struct comedi_device * dev) | 501 | static int pcl711_detach(struct comedi_device *dev) |
502 | { | 502 | { |
503 | printk("comedi%d: pcl711: remove\n", dev->minor); | 503 | printk("comedi%d: pcl711: remove\n", dev->minor); |
504 | 504 | ||
@@ -512,7 +512,7 @@ static int pcl711_detach(struct comedi_device * dev) | |||
512 | } | 512 | } |
513 | 513 | ||
514 | /* Initialization */ | 514 | /* Initialization */ |
515 | static int pcl711_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 515 | static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
516 | { | 516 | { |
517 | int ret; | 517 | int ret; |
518 | unsigned long iobase; | 518 | unsigned long iobase; |
diff --git a/drivers/staging/comedi/drivers/pcl724.c b/drivers/staging/comedi/drivers/pcl724.c index 1f7763b2b65..75ab137ce36 100644 --- a/drivers/staging/comedi/drivers/pcl724.c +++ b/drivers/staging/comedi/drivers/pcl724.c | |||
@@ -56,8 +56,8 @@ See the source for configuration details. | |||
56 | 56 | ||
57 | /* #define PCL724_IRQ 1 no IRQ support now */ | 57 | /* #define PCL724_IRQ 1 no IRQ support now */ |
58 | 58 | ||
59 | static int pcl724_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 59 | static int pcl724_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
60 | static int pcl724_detach(struct comedi_device * dev); | 60 | static int pcl724_detach(struct comedi_device *dev); |
61 | 61 | ||
62 | struct pcl724_board { | 62 | struct pcl724_board { |
63 | 63 | ||
@@ -124,7 +124,7 @@ static int subdev_8255mapped_cb(int dir, int port, int data, | |||
124 | } | 124 | } |
125 | } | 125 | } |
126 | 126 | ||
127 | static int pcl724_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 127 | static int pcl724_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
128 | { | 128 | { |
129 | unsigned long iobase; | 129 | unsigned long iobase; |
130 | unsigned int iorange; | 130 | unsigned int iorange; |
@@ -200,7 +200,7 @@ static int pcl724_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
200 | return 0; | 200 | return 0; |
201 | } | 201 | } |
202 | 202 | ||
203 | static int pcl724_detach(struct comedi_device * dev) | 203 | static int pcl724_detach(struct comedi_device *dev) |
204 | { | 204 | { |
205 | int i; | 205 | int i; |
206 | 206 | ||
diff --git a/drivers/staging/comedi/drivers/pcl725.c b/drivers/staging/comedi/drivers/pcl725.c index 0766ba02bd0..0941dc157a8 100644 --- a/drivers/staging/comedi/drivers/pcl725.c +++ b/drivers/staging/comedi/drivers/pcl725.c | |||
@@ -20,8 +20,8 @@ Devices: [Advantech] PCL-725 (pcl725) | |||
20 | #define PCL725_DO 0 | 20 | #define PCL725_DO 0 |
21 | #define PCL725_DI 1 | 21 | #define PCL725_DI 1 |
22 | 22 | ||
23 | static int pcl725_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 23 | static int pcl725_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
24 | static int pcl725_detach(struct comedi_device * dev); | 24 | static int pcl725_detach(struct comedi_device *dev); |
25 | static struct comedi_driver driver_pcl725 = { | 25 | static struct comedi_driver driver_pcl725 = { |
26 | driver_name:"pcl725", | 26 | driver_name:"pcl725", |
27 | module:THIS_MODULE, | 27 | module:THIS_MODULE, |
@@ -31,8 +31,8 @@ static struct comedi_driver driver_pcl725 = { | |||
31 | 31 | ||
32 | COMEDI_INITCLEANUP(driver_pcl725); | 32 | COMEDI_INITCLEANUP(driver_pcl725); |
33 | 33 | ||
34 | static int pcl725_do_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 34 | static int pcl725_do_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
35 | struct comedi_insn * insn, unsigned int * data) | 35 | struct comedi_insn *insn, unsigned int *data) |
36 | { | 36 | { |
37 | if (insn->n != 2) | 37 | if (insn->n != 2) |
38 | return -EINVAL; | 38 | return -EINVAL; |
@@ -48,8 +48,8 @@ static int pcl725_do_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
48 | return 2; | 48 | return 2; |
49 | } | 49 | } |
50 | 50 | ||
51 | static int pcl725_di_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 51 | static int pcl725_di_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
52 | struct comedi_insn * insn, unsigned int * data) | 52 | struct comedi_insn *insn, unsigned int *data) |
53 | { | 53 | { |
54 | if (insn->n != 2) | 54 | if (insn->n != 2) |
55 | return -EINVAL; | 55 | return -EINVAL; |
@@ -59,7 +59,7 @@ static int pcl725_di_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
59 | return 2; | 59 | return 2; |
60 | } | 60 | } |
61 | 61 | ||
62 | static int pcl725_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 62 | static int pcl725_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
63 | { | 63 | { |
64 | struct comedi_subdevice *s; | 64 | struct comedi_subdevice *s; |
65 | unsigned long iobase; | 65 | unsigned long iobase; |
@@ -100,7 +100,7 @@ static int pcl725_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
100 | return 0; | 100 | return 0; |
101 | } | 101 | } |
102 | 102 | ||
103 | static int pcl725_detach(struct comedi_device * dev) | 103 | static int pcl725_detach(struct comedi_device *dev) |
104 | { | 104 | { |
105 | printk("comedi%d: pcl725: remove\n", dev->minor); | 105 | printk("comedi%d: pcl725: remove\n", dev->minor); |
106 | 106 | ||
diff --git a/drivers/staging/comedi/drivers/pcl726.c b/drivers/staging/comedi/drivers/pcl726.c index c92ffca0b9a..7c9112b0fdc 100644 --- a/drivers/staging/comedi/drivers/pcl726.c +++ b/drivers/staging/comedi/drivers/pcl726.c | |||
@@ -111,8 +111,8 @@ static const struct comedi_lrange *const rangelist_728[] = { | |||
111 | &range_4_20mA, &range_0_20mA | 111 | &range_4_20mA, &range_0_20mA |
112 | }; | 112 | }; |
113 | 113 | ||
114 | static int pcl726_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 114 | static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
115 | static int pcl726_detach(struct comedi_device * dev); | 115 | static int pcl726_detach(struct comedi_device *dev); |
116 | 116 | ||
117 | struct pcl726_board { | 117 | struct pcl726_board { |
118 | 118 | ||
@@ -172,8 +172,8 @@ struct pcl726_private { | |||
172 | 172 | ||
173 | #define devpriv ((struct pcl726_private *)dev->private) | 173 | #define devpriv ((struct pcl726_private *)dev->private) |
174 | 174 | ||
175 | static int pcl726_ao_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 175 | static int pcl726_ao_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
176 | struct comedi_insn * insn, unsigned int * data) | 176 | struct comedi_insn *insn, unsigned int *data) |
177 | { | 177 | { |
178 | int hi, lo; | 178 | int hi, lo; |
179 | int n; | 179 | int n; |
@@ -197,8 +197,8 @@ static int pcl726_ao_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
197 | return n; | 197 | return n; |
198 | } | 198 | } |
199 | 199 | ||
200 | static int pcl726_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 200 | static int pcl726_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
201 | struct comedi_insn * insn, unsigned int * data) | 201 | struct comedi_insn *insn, unsigned int *data) |
202 | { | 202 | { |
203 | int chan = CR_CHAN(insn->chanspec); | 203 | int chan = CR_CHAN(insn->chanspec); |
204 | int n; | 204 | int n; |
@@ -209,8 +209,8 @@ static int pcl726_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi | |||
209 | return n; | 209 | return n; |
210 | } | 210 | } |
211 | 211 | ||
212 | static int pcl726_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 212 | static int pcl726_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
213 | struct comedi_insn * insn, unsigned int * data) | 213 | struct comedi_insn *insn, unsigned int *data) |
214 | { | 214 | { |
215 | if (insn->n != 2) | 215 | if (insn->n != 2) |
216 | return -EINVAL; | 216 | return -EINVAL; |
@@ -221,8 +221,8 @@ static int pcl726_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi | |||
221 | return 2; | 221 | return 2; |
222 | } | 222 | } |
223 | 223 | ||
224 | static int pcl726_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 224 | static int pcl726_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
225 | struct comedi_insn * insn, unsigned int * data) | 225 | struct comedi_insn *insn, unsigned int *data) |
226 | { | 226 | { |
227 | if (insn->n != 2) | 227 | if (insn->n != 2) |
228 | return -EINVAL; | 228 | return -EINVAL; |
@@ -241,7 +241,7 @@ static int pcl726_do_insn_bits(struct comedi_device * dev, struct comedi_subdevi | |||
241 | return 2; | 241 | return 2; |
242 | } | 242 | } |
243 | 243 | ||
244 | static int pcl726_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 244 | static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
245 | { | 245 | { |
246 | struct comedi_subdevice *s; | 246 | struct comedi_subdevice *s; |
247 | unsigned long iobase; | 247 | unsigned long iobase; |
@@ -360,7 +360,7 @@ static int pcl726_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
360 | return 0; | 360 | return 0; |
361 | } | 361 | } |
362 | 362 | ||
363 | static int pcl726_detach(struct comedi_device * dev) | 363 | static int pcl726_detach(struct comedi_device *dev) |
364 | { | 364 | { |
365 | /* printk("comedi%d: pcl726: remove\n",dev->minor); */ | 365 | /* printk("comedi%d: pcl726: remove\n",dev->minor); */ |
366 | 366 | ||
diff --git a/drivers/staging/comedi/drivers/pcl730.c b/drivers/staging/comedi/drivers/pcl730.c index c411a16f71d..ca18cf08358 100644 --- a/drivers/staging/comedi/drivers/pcl730.c +++ b/drivers/staging/comedi/drivers/pcl730.c | |||
@@ -26,8 +26,8 @@ The ACL-7130 card have an 8254 timer/counter not supported by this driver. | |||
26 | #define PCL730_DIO_LO 2 /* TTL Digital I/O low byte (D0-D7) */ | 26 | #define PCL730_DIO_LO 2 /* TTL Digital I/O low byte (D0-D7) */ |
27 | #define PCL730_DIO_HI 3 /* TTL Digital I/O high byte (D8-D15) */ | 27 | #define PCL730_DIO_HI 3 /* TTL Digital I/O high byte (D8-D15) */ |
28 | 28 | ||
29 | static int pcl730_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 29 | static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
30 | static int pcl730_detach(struct comedi_device * dev); | 30 | static int pcl730_detach(struct comedi_device *dev); |
31 | 31 | ||
32 | struct pcl730_board { | 32 | struct pcl730_board { |
33 | 33 | ||
@@ -57,8 +57,8 @@ static struct comedi_driver driver_pcl730 = { | |||
57 | 57 | ||
58 | COMEDI_INITCLEANUP(driver_pcl730); | 58 | COMEDI_INITCLEANUP(driver_pcl730); |
59 | 59 | ||
60 | static int pcl730_do_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 60 | static int pcl730_do_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
61 | struct comedi_insn * insn, unsigned int * data) | 61 | struct comedi_insn *insn, unsigned int *data) |
62 | { | 62 | { |
63 | if (insn->n != 2) | 63 | if (insn->n != 2) |
64 | return -EINVAL; | 64 | return -EINVAL; |
@@ -79,8 +79,8 @@ static int pcl730_do_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
79 | return 2; | 79 | return 2; |
80 | } | 80 | } |
81 | 81 | ||
82 | static int pcl730_di_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 82 | static int pcl730_di_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
83 | struct comedi_insn * insn, unsigned int * data) | 83 | struct comedi_insn *insn, unsigned int *data) |
84 | { | 84 | { |
85 | if (insn->n != 2) | 85 | if (insn->n != 2) |
86 | return -EINVAL; | 86 | return -EINVAL; |
@@ -91,7 +91,7 @@ static int pcl730_di_insn(struct comedi_device * dev, struct comedi_subdevice * | |||
91 | return 2; | 91 | return 2; |
92 | } | 92 | } |
93 | 93 | ||
94 | static int pcl730_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 94 | static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
95 | { | 95 | { |
96 | struct comedi_subdevice *s; | 96 | struct comedi_subdevice *s; |
97 | unsigned long iobase; | 97 | unsigned long iobase; |
@@ -157,7 +157,7 @@ static int pcl730_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
157 | return 0; | 157 | return 0; |
158 | } | 158 | } |
159 | 159 | ||
160 | static int pcl730_detach(struct comedi_device * dev) | 160 | static int pcl730_detach(struct comedi_device *dev) |
161 | { | 161 | { |
162 | printk("comedi%d: pcl730: remove\n", dev->minor); | 162 | printk("comedi%d: pcl730: remove\n", dev->minor); |
163 | 163 | ||
diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c index dc1a1e4a303..1f6f3e8b418 100644 --- a/drivers/staging/comedi/drivers/pcl812.c +++ b/drivers/staging/comedi/drivers/pcl812.c | |||
@@ -292,8 +292,8 @@ static const struct comedi_lrange range_a821pgh_ai = { 4, { | |||
292 | } | 292 | } |
293 | }; | 293 | }; |
294 | 294 | ||
295 | static int pcl812_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 295 | static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
296 | static int pcl812_detach(struct comedi_device * dev); | 296 | static int pcl812_detach(struct comedi_device *dev); |
297 | 297 | ||
298 | struct pcl812_board { | 298 | struct pcl812_board { |
299 | 299 | ||
@@ -429,16 +429,16 @@ struct pcl812_private { | |||
429 | /* | 429 | /* |
430 | ============================================================================== | 430 | ============================================================================== |
431 | */ | 431 | */ |
432 | static void start_pacer(struct comedi_device * dev, int mode, unsigned int divisor1, | 432 | static void start_pacer(struct comedi_device *dev, int mode, unsigned int divisor1, |
433 | unsigned int divisor2); | 433 | unsigned int divisor2); |
434 | static void setup_range_channel(struct comedi_device * dev, struct comedi_subdevice * s, | 434 | static void setup_range_channel(struct comedi_device *dev, struct comedi_subdevice *s, |
435 | unsigned int rangechan, char wait); | 435 | unsigned int rangechan, char wait); |
436 | static int pcl812_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 436 | static int pcl812_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s); |
437 | /* | 437 | /* |
438 | ============================================================================== | 438 | ============================================================================== |
439 | */ | 439 | */ |
440 | static int pcl812_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 440 | static int pcl812_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
441 | struct comedi_insn * insn, unsigned int * data) | 441 | struct comedi_insn *insn, unsigned int *data) |
442 | { | 442 | { |
443 | int n; | 443 | int n; |
444 | int timeout, hi; | 444 | int timeout, hi; |
@@ -471,8 +471,8 @@ static int pcl812_ai_insn_read(struct comedi_device * dev, struct comedi_subdevi | |||
471 | /* | 471 | /* |
472 | ============================================================================== | 472 | ============================================================================== |
473 | */ | 473 | */ |
474 | static int acl8216_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 474 | static int acl8216_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
475 | struct comedi_insn * insn, unsigned int * data) | 475 | struct comedi_insn *insn, unsigned int *data) |
476 | { | 476 | { |
477 | int n; | 477 | int n; |
478 | int timeout; | 478 | int timeout; |
@@ -507,8 +507,8 @@ static int acl8216_ai_insn_read(struct comedi_device * dev, struct comedi_subdev | |||
507 | /* | 507 | /* |
508 | ============================================================================== | 508 | ============================================================================== |
509 | */ | 509 | */ |
510 | static int pcl812_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 510 | static int pcl812_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
511 | struct comedi_insn * insn, unsigned int * data) | 511 | struct comedi_insn *insn, unsigned int *data) |
512 | { | 512 | { |
513 | int chan = CR_CHAN(insn->chanspec); | 513 | int chan = CR_CHAN(insn->chanspec); |
514 | int i; | 514 | int i; |
@@ -527,8 +527,8 @@ static int pcl812_ao_insn_write(struct comedi_device * dev, struct comedi_subdev | |||
527 | /* | 527 | /* |
528 | ============================================================================== | 528 | ============================================================================== |
529 | */ | 529 | */ |
530 | static int pcl812_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 530 | static int pcl812_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
531 | struct comedi_insn * insn, unsigned int * data) | 531 | struct comedi_insn *insn, unsigned int *data) |
532 | { | 532 | { |
533 | int chan = CR_CHAN(insn->chanspec); | 533 | int chan = CR_CHAN(insn->chanspec); |
534 | int i; | 534 | int i; |
@@ -543,8 +543,8 @@ static int pcl812_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi | |||
543 | /* | 543 | /* |
544 | ============================================================================== | 544 | ============================================================================== |
545 | */ | 545 | */ |
546 | static int pcl812_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 546 | static int pcl812_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
547 | struct comedi_insn * insn, unsigned int * data) | 547 | struct comedi_insn *insn, unsigned int *data) |
548 | { | 548 | { |
549 | if (insn->n != 2) | 549 | if (insn->n != 2) |
550 | return -EINVAL; | 550 | return -EINVAL; |
@@ -558,8 +558,8 @@ static int pcl812_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi | |||
558 | /* | 558 | /* |
559 | ============================================================================== | 559 | ============================================================================== |
560 | */ | 560 | */ |
561 | static int pcl812_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 561 | static int pcl812_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
562 | struct comedi_insn * insn, unsigned int * data) | 562 | struct comedi_insn *insn, unsigned int *data) |
563 | { | 563 | { |
564 | if (insn->n != 2) | 564 | if (insn->n != 2) |
565 | return -EINVAL; | 565 | return -EINVAL; |
@@ -579,7 +579,7 @@ static int pcl812_do_insn_bits(struct comedi_device * dev, struct comedi_subdevi | |||
579 | /* | 579 | /* |
580 | ============================================================================== | 580 | ============================================================================== |
581 | */ | 581 | */ |
582 | static void pcl812_cmdtest_out(int e, struct comedi_cmd * cmd) | 582 | static void pcl812_cmdtest_out(int e, struct comedi_cmd *cmd) |
583 | { | 583 | { |
584 | rt_printk("pcl812 e=%d startsrc=%x scansrc=%x convsrc=%x\n", e, | 584 | rt_printk("pcl812 e=%d startsrc=%x scansrc=%x convsrc=%x\n", e, |
585 | cmd->start_src, cmd->scan_begin_src, cmd->convert_src); | 585 | cmd->start_src, cmd->scan_begin_src, cmd->convert_src); |
@@ -595,8 +595,8 @@ static void pcl812_cmdtest_out(int e, struct comedi_cmd * cmd) | |||
595 | /* | 595 | /* |
596 | ============================================================================== | 596 | ============================================================================== |
597 | */ | 597 | */ |
598 | static int pcl812_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 598 | static int pcl812_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
599 | struct comedi_cmd * cmd) | 599 | struct comedi_cmd *cmd) |
600 | { | 600 | { |
601 | int err = 0; | 601 | int err = 0; |
602 | int tmp, divisor1, divisor2; | 602 | int tmp, divisor1, divisor2; |
@@ -774,7 +774,7 @@ static int pcl812_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice | |||
774 | /* | 774 | /* |
775 | ============================================================================== | 775 | ============================================================================== |
776 | */ | 776 | */ |
777 | static int pcl812_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 777 | static int pcl812_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
778 | { | 778 | { |
779 | unsigned int divisor1 = 0, divisor2 = 0, i, dma_flags, bytes; | 779 | unsigned int divisor1 = 0, divisor2 = 0, i, dma_flags, bytes; |
780 | struct comedi_cmd *cmd = &s->async->cmd; | 780 | struct comedi_cmd *cmd = &s->async->cmd; |
@@ -984,8 +984,8 @@ static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d) | |||
984 | /* | 984 | /* |
985 | ============================================================================== | 985 | ============================================================================== |
986 | */ | 986 | */ |
987 | static void transfer_from_dma_buf(struct comedi_device * dev, struct comedi_subdevice * s, | 987 | static void transfer_from_dma_buf(struct comedi_device *dev, struct comedi_subdevice *s, |
988 | short * ptr, unsigned int bufptr, unsigned int len) | 988 | short *ptr, unsigned int bufptr, unsigned int len) |
989 | { | 989 | { |
990 | unsigned int i; | 990 | unsigned int i; |
991 | 991 | ||
@@ -1079,7 +1079,7 @@ static irqreturn_t interrupt_pcl812(int irq, void *d) | |||
1079 | /* | 1079 | /* |
1080 | ============================================================================== | 1080 | ============================================================================== |
1081 | */ | 1081 | */ |
1082 | static int pcl812_ai_poll(struct comedi_device * dev, struct comedi_subdevice * s) | 1082 | static int pcl812_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s) |
1083 | { | 1083 | { |
1084 | unsigned long flags; | 1084 | unsigned long flags; |
1085 | unsigned int top1, top2, i; | 1085 | unsigned int top1, top2, i; |
@@ -1123,7 +1123,7 @@ static int pcl812_ai_poll(struct comedi_device * dev, struct comedi_subdevice * | |||
1123 | /* | 1123 | /* |
1124 | ============================================================================== | 1124 | ============================================================================== |
1125 | */ | 1125 | */ |
1126 | static void setup_range_channel(struct comedi_device * dev, struct comedi_subdevice * s, | 1126 | static void setup_range_channel(struct comedi_device *dev, struct comedi_subdevice *s, |
1127 | unsigned int rangechan, char wait) | 1127 | unsigned int rangechan, char wait) |
1128 | { | 1128 | { |
1129 | unsigned char chan_reg = CR_CHAN(rangechan); /* normal board */ | 1129 | unsigned char chan_reg = CR_CHAN(rangechan); /* normal board */ |
@@ -1159,7 +1159,7 @@ static void setup_range_channel(struct comedi_device * dev, struct comedi_subdev | |||
1159 | /* | 1159 | /* |
1160 | ============================================================================== | 1160 | ============================================================================== |
1161 | */ | 1161 | */ |
1162 | static void start_pacer(struct comedi_device * dev, int mode, unsigned int divisor1, | 1162 | static void start_pacer(struct comedi_device *dev, int mode, unsigned int divisor1, |
1163 | unsigned int divisor2) | 1163 | unsigned int divisor2) |
1164 | { | 1164 | { |
1165 | #ifdef PCL812_EXTDEBUG | 1165 | #ifdef PCL812_EXTDEBUG |
@@ -1184,7 +1184,7 @@ static void start_pacer(struct comedi_device * dev, int mode, unsigned int divis | |||
1184 | /* | 1184 | /* |
1185 | ============================================================================== | 1185 | ============================================================================== |
1186 | */ | 1186 | */ |
1187 | static void free_resources(struct comedi_device * dev) | 1187 | static void free_resources(struct comedi_device *dev) |
1188 | { | 1188 | { |
1189 | 1189 | ||
1190 | if (dev->private) { | 1190 | if (dev->private) { |
@@ -1204,7 +1204,7 @@ static void free_resources(struct comedi_device * dev) | |||
1204 | /* | 1204 | /* |
1205 | ============================================================================== | 1205 | ============================================================================== |
1206 | */ | 1206 | */ |
1207 | static int pcl812_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 1207 | static int pcl812_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
1208 | { | 1208 | { |
1209 | #ifdef PCL812_EXTDEBUG | 1209 | #ifdef PCL812_EXTDEBUG |
1210 | rt_printk("pcl812 EDBG: BGN: pcl812_ai_cancel(...)\n"); | 1210 | rt_printk("pcl812 EDBG: BGN: pcl812_ai_cancel(...)\n"); |
@@ -1224,7 +1224,7 @@ static int pcl812_ai_cancel(struct comedi_device * dev, struct comedi_subdevice | |||
1224 | /* | 1224 | /* |
1225 | ============================================================================== | 1225 | ============================================================================== |
1226 | */ | 1226 | */ |
1227 | static void pcl812_reset(struct comedi_device * dev) | 1227 | static void pcl812_reset(struct comedi_device *dev) |
1228 | { | 1228 | { |
1229 | #ifdef PCL812_EXTDEBUG | 1229 | #ifdef PCL812_EXTDEBUG |
1230 | rt_printk("pcl812 EDBG: BGN: pcl812_reset(...)\n"); | 1230 | rt_printk("pcl812 EDBG: BGN: pcl812_reset(...)\n"); |
@@ -1266,7 +1266,7 @@ static void pcl812_reset(struct comedi_device * dev) | |||
1266 | /* | 1266 | /* |
1267 | ============================================================================== | 1267 | ============================================================================== |
1268 | */ | 1268 | */ |
1269 | static int pcl812_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 1269 | static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
1270 | { | 1270 | { |
1271 | int ret, subdev; | 1271 | int ret, subdev; |
1272 | unsigned long iobase; | 1272 | unsigned long iobase; |
@@ -1594,7 +1594,7 @@ static int pcl812_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
1594 | /* | 1594 | /* |
1595 | ============================================================================== | 1595 | ============================================================================== |
1596 | */ | 1596 | */ |
1597 | static int pcl812_detach(struct comedi_device * dev) | 1597 | static int pcl812_detach(struct comedi_device *dev) |
1598 | { | 1598 | { |
1599 | 1599 | ||
1600 | #ifdef PCL812_EXTDEBUG | 1600 | #ifdef PCL812_EXTDEBUG |
diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c index 2241fa9f5b6..f44bd43f5d3 100644 --- a/drivers/staging/comedi/drivers/pcl816.c +++ b/drivers/staging/comedi/drivers/pcl816.c | |||
@@ -148,8 +148,8 @@ static const struct pcl816_board boardtypes[] = { | |||
148 | #define devpriv ((struct pcl816_private *)dev->private) | 148 | #define devpriv ((struct pcl816_private *)dev->private) |
149 | #define this_board ((const struct pcl816_board *)dev->board_ptr) | 149 | #define this_board ((const struct pcl816_board *)dev->board_ptr) |
150 | 150 | ||
151 | static int pcl816_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 151 | static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
152 | static int pcl816_detach(struct comedi_device * dev); | 152 | static int pcl816_detach(struct comedi_device *dev); |
153 | 153 | ||
154 | #ifdef unused | 154 | #ifdef unused |
155 | static int RTC_lock = 0; /* RTC lock */ | 155 | static int RTC_lock = 0; /* RTC lock */ |
@@ -213,25 +213,25 @@ struct pcl816_private { | |||
213 | /* | 213 | /* |
214 | ============================================================================== | 214 | ============================================================================== |
215 | */ | 215 | */ |
216 | static int check_and_setup_channel_list(struct comedi_device * dev, | 216 | static int check_and_setup_channel_list(struct comedi_device *dev, |
217 | struct comedi_subdevice * s, unsigned int *chanlist, int chanlen); | 217 | struct comedi_subdevice *s, unsigned int *chanlist, int chanlen); |
218 | static int pcl816_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 218 | static int pcl816_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s); |
219 | static void start_pacer(struct comedi_device * dev, int mode, unsigned int divisor1, | 219 | static void start_pacer(struct comedi_device *dev, int mode, unsigned int divisor1, |
220 | unsigned int divisor2); | 220 | unsigned int divisor2); |
221 | #ifdef unused | 221 | #ifdef unused |
222 | static int set_rtc_irq_bit(unsigned char bit); | 222 | static int set_rtc_irq_bit(unsigned char bit); |
223 | #endif | 223 | #endif |
224 | 224 | ||
225 | static int pcl816_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 225 | static int pcl816_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
226 | struct comedi_cmd * cmd); | 226 | struct comedi_cmd *cmd); |
227 | static int pcl816_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s); | 227 | static int pcl816_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s); |
228 | 228 | ||
229 | /* | 229 | /* |
230 | ============================================================================== | 230 | ============================================================================== |
231 | ANALOG INPUT MODE0, 816 cards, slow version | 231 | ANALOG INPUT MODE0, 816 cards, slow version |
232 | */ | 232 | */ |
233 | static int pcl816_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 233 | static int pcl816_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
234 | struct comedi_insn * insn, unsigned int * data) | 234 | struct comedi_insn *insn, unsigned int *data) |
235 | { | 235 | { |
236 | int n; | 236 | int n; |
237 | int timeout; | 237 | int timeout; |
@@ -334,8 +334,8 @@ static irqreturn_t interrupt_pcl816_ai_mode13_int(int irq, void *d) | |||
334 | ============================================================================== | 334 | ============================================================================== |
335 | analog input dma mode 1 & 3, 816 cards | 335 | analog input dma mode 1 & 3, 816 cards |
336 | */ | 336 | */ |
337 | static void transfer_from_dma_buf(struct comedi_device * dev, struct comedi_subdevice * s, | 337 | static void transfer_from_dma_buf(struct comedi_device *dev, struct comedi_subdevice *s, |
338 | short * ptr, unsigned int bufptr, unsigned int len) | 338 | short *ptr, unsigned int bufptr, unsigned int len) |
339 | { | 339 | { |
340 | int i; | 340 | int i; |
341 | 341 | ||
@@ -447,7 +447,7 @@ static irqreturn_t interrupt_pcl816(int irq, void *d) | |||
447 | ============================================================================== | 447 | ============================================================================== |
448 | COMMAND MODE | 448 | COMMAND MODE |
449 | */ | 449 | */ |
450 | static void pcl816_cmdtest_out(int e, struct comedi_cmd * cmd) | 450 | static void pcl816_cmdtest_out(int e, struct comedi_cmd *cmd) |
451 | { | 451 | { |
452 | rt_printk("pcl816 e=%d startsrc=%x scansrc=%x convsrc=%x\n", e, | 452 | rt_printk("pcl816 e=%d startsrc=%x scansrc=%x convsrc=%x\n", e, |
453 | cmd->start_src, cmd->scan_begin_src, cmd->convert_src); | 453 | cmd->start_src, cmd->scan_begin_src, cmd->convert_src); |
@@ -462,8 +462,8 @@ static void pcl816_cmdtest_out(int e, struct comedi_cmd * cmd) | |||
462 | /* | 462 | /* |
463 | ============================================================================== | 463 | ============================================================================== |
464 | */ | 464 | */ |
465 | static int pcl816_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 465 | static int pcl816_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
466 | struct comedi_cmd * cmd) | 466 | struct comedi_cmd *cmd) |
467 | { | 467 | { |
468 | int err = 0; | 468 | int err = 0; |
469 | int tmp, divisor1, divisor2; | 469 | int tmp, divisor1, divisor2; |
@@ -597,7 +597,7 @@ static int pcl816_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice | |||
597 | return 0; | 597 | return 0; |
598 | } | 598 | } |
599 | 599 | ||
600 | static int pcl816_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 600 | static int pcl816_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
601 | { | 601 | { |
602 | unsigned int divisor1 = 0, divisor2 = 0, dma_flags, bytes, dmairq; | 602 | unsigned int divisor1 = 0, divisor2 = 0, dma_flags, bytes, dmairq; |
603 | struct comedi_cmd *cmd = &s->async->cmd; | 603 | struct comedi_cmd *cmd = &s->async->cmd; |
@@ -702,7 +702,7 @@ static int pcl816_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s | |||
702 | return 0; | 702 | return 0; |
703 | } | 703 | } |
704 | 704 | ||
705 | static int pcl816_ai_poll(struct comedi_device * dev, struct comedi_subdevice * s) | 705 | static int pcl816_ai_poll(struct comedi_device *dev, struct comedi_subdevice *s) |
706 | { | 706 | { |
707 | unsigned long flags; | 707 | unsigned long flags; |
708 | unsigned int top1, top2, i; | 708 | unsigned int top1, top2, i; |
@@ -745,7 +745,7 @@ static int pcl816_ai_poll(struct comedi_device * dev, struct comedi_subdevice * | |||
745 | ============================================================================== | 745 | ============================================================================== |
746 | cancel any mode 1-4 AI | 746 | cancel any mode 1-4 AI |
747 | */ | 747 | */ |
748 | static int pcl816_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 748 | static int pcl816_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
749 | { | 749 | { |
750 | /* DEBUG(rt_printk("pcl816_ai_cancel()\n");) */ | 750 | /* DEBUG(rt_printk("pcl816_ai_cancel()\n");) */ |
751 | 751 | ||
@@ -813,7 +813,7 @@ static int pcl816_check(unsigned long iobase) | |||
813 | ============================================================================== | 813 | ============================================================================== |
814 | reset whole PCL-816 cards | 814 | reset whole PCL-816 cards |
815 | */ | 815 | */ |
816 | static void pcl816_reset(struct comedi_device * dev) | 816 | static void pcl816_reset(struct comedi_device *dev) |
817 | { | 817 | { |
818 | /* outb (0, dev->iobase + PCL818_DA_LO); DAC=0V */ | 818 | /* outb (0, dev->iobase + PCL818_DA_LO); DAC=0V */ |
819 | /* outb (0, dev->iobase + PCL818_DA_HI); */ | 819 | /* outb (0, dev->iobase + PCL818_DA_HI); */ |
@@ -835,7 +835,7 @@ static void pcl816_reset(struct comedi_device * dev) | |||
835 | Start/stop pacer onboard pacer | 835 | Start/stop pacer onboard pacer |
836 | */ | 836 | */ |
837 | static void | 837 | static void |
838 | start_pacer(struct comedi_device * dev, int mode, unsigned int divisor1, | 838 | start_pacer(struct comedi_device *dev, int mode, unsigned int divisor1, |
839 | unsigned int divisor2) | 839 | unsigned int divisor2) |
840 | { | 840 | { |
841 | outb(0x32, dev->iobase + PCL816_CTRCTL); | 841 | outb(0x32, dev->iobase + PCL816_CTRCTL); |
@@ -865,7 +865,7 @@ start_pacer(struct comedi_device * dev, int mode, unsigned int divisor1, | |||
865 | If it's ok, then program scan/gain logic | 865 | If it's ok, then program scan/gain logic |
866 | */ | 866 | */ |
867 | static int | 867 | static int |
868 | check_and_setup_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, | 868 | check_and_setup_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, |
869 | unsigned int *chanlist, int chanlen) | 869 | unsigned int *chanlist, int chanlen) |
870 | { | 870 | { |
871 | unsigned int chansegment[16]; | 871 | unsigned int chansegment[16]; |
@@ -979,7 +979,7 @@ static int set_rtc_irq_bit(unsigned char bit) | |||
979 | ============================================================================== | 979 | ============================================================================== |
980 | Free any resources that we have claimed | 980 | Free any resources that we have claimed |
981 | */ | 981 | */ |
982 | static void free_resources(struct comedi_device * dev) | 982 | static void free_resources(struct comedi_device *dev) |
983 | { | 983 | { |
984 | /* rt_printk("free_resource()\n"); */ | 984 | /* rt_printk("free_resource()\n"); */ |
985 | if (dev->private) { | 985 | if (dev->private) { |
@@ -1015,7 +1015,7 @@ static void free_resources(struct comedi_device * dev) | |||
1015 | Initialization | 1015 | Initialization |
1016 | 1016 | ||
1017 | */ | 1017 | */ |
1018 | static int pcl816_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 1018 | static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
1019 | { | 1019 | { |
1020 | int ret; | 1020 | int ret; |
1021 | unsigned long iobase; | 1021 | unsigned long iobase; |
@@ -1238,7 +1238,7 @@ case COMEDI_SUBD_DO: | |||
1238 | ============================================================================== | 1238 | ============================================================================== |
1239 | Removes device | 1239 | Removes device |
1240 | */ | 1240 | */ |
1241 | static int pcl816_detach(struct comedi_device * dev) | 1241 | static int pcl816_detach(struct comedi_device *dev) |
1242 | { | 1242 | { |
1243 | DEBUG(rt_printk("comedi%d: pcl816: remove\n", dev->minor); | 1243 | DEBUG(rt_printk("comedi%d: pcl816: remove\n", dev->minor); |
1244 | ) | 1244 | ) |
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c index 495f802c39a..f1deeb247e1 100644 --- a/drivers/staging/comedi/drivers/pcl818.c +++ b/drivers/staging/comedi/drivers/pcl818.c | |||
@@ -244,8 +244,8 @@ static const struct comedi_lrange range718_bipolar0_5 = { 1, {BIP_RANGE(0.5),} } | |||
244 | static const struct comedi_lrange range718_unipolar2 = { 1, {UNI_RANGE(2),} }; | 244 | static const struct comedi_lrange range718_unipolar2 = { 1, {UNI_RANGE(2),} }; |
245 | static const struct comedi_lrange range718_unipolar1 = { 1, {BIP_RANGE(1),} }; | 245 | static const struct comedi_lrange range718_unipolar1 = { 1, {BIP_RANGE(1),} }; |
246 | 246 | ||
247 | static int pcl818_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 247 | static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
248 | static int pcl818_detach(struct comedi_device * dev); | 248 | static int pcl818_detach(struct comedi_device *dev); |
249 | 249 | ||
250 | #ifdef unused | 250 | #ifdef unused |
251 | static int RTC_lock = 0; /* RTC lock */ | 251 | static int RTC_lock = 0; /* RTC lock */ |
@@ -372,13 +372,13 @@ static const unsigned int muxonechan[] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0 | |||
372 | /* | 372 | /* |
373 | ============================================================================== | 373 | ============================================================================== |
374 | */ | 374 | */ |
375 | static void setup_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, | 375 | static void setup_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, |
376 | unsigned int *chanlist, unsigned int n_chan, unsigned int seglen); | 376 | unsigned int *chanlist, unsigned int n_chan, unsigned int seglen); |
377 | static int check_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, | 377 | static int check_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, |
378 | unsigned int *chanlist, unsigned int n_chan); | 378 | unsigned int *chanlist, unsigned int n_chan); |
379 | 379 | ||
380 | static int pcl818_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s); | 380 | static int pcl818_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s); |
381 | static void start_pacer(struct comedi_device * dev, int mode, unsigned int divisor1, | 381 | static void start_pacer(struct comedi_device *dev, int mode, unsigned int divisor1, |
382 | unsigned int divisor2); | 382 | unsigned int divisor2); |
383 | 383 | ||
384 | #ifdef unused | 384 | #ifdef unused |
@@ -391,8 +391,8 @@ static int rtc_setfreq_irq(int freq); | |||
391 | ============================================================================== | 391 | ============================================================================== |
392 | ANALOG INPUT MODE0, 818 cards, slow version | 392 | ANALOG INPUT MODE0, 818 cards, slow version |
393 | */ | 393 | */ |
394 | static int pcl818_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 394 | static int pcl818_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
395 | struct comedi_insn * insn, unsigned int * data) | 395 | struct comedi_insn *insn, unsigned int *data) |
396 | { | 396 | { |
397 | int n; | 397 | int n; |
398 | int timeout; | 398 | int timeout; |
@@ -438,8 +438,8 @@ static int pcl818_ai_insn_read(struct comedi_device * dev, struct comedi_subdevi | |||
438 | ANALOG OUTPUT MODE0, 818 cards | 438 | ANALOG OUTPUT MODE0, 818 cards |
439 | only one sample per call is supported | 439 | only one sample per call is supported |
440 | */ | 440 | */ |
441 | static int pcl818_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 441 | static int pcl818_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
442 | struct comedi_insn * insn, unsigned int * data) | 442 | struct comedi_insn *insn, unsigned int *data) |
443 | { | 443 | { |
444 | int n; | 444 | int n; |
445 | int chan = CR_CHAN(insn->chanspec); | 445 | int chan = CR_CHAN(insn->chanspec); |
@@ -451,8 +451,8 @@ static int pcl818_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi | |||
451 | return n; | 451 | return n; |
452 | } | 452 | } |
453 | 453 | ||
454 | static int pcl818_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 454 | static int pcl818_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
455 | struct comedi_insn * insn, unsigned int * data) | 455 | struct comedi_insn *insn, unsigned int *data) |
456 | { | 456 | { |
457 | int n; | 457 | int n; |
458 | int chan = CR_CHAN(insn->chanspec); | 458 | int chan = CR_CHAN(insn->chanspec); |
@@ -474,8 +474,8 @@ static int pcl818_ao_insn_write(struct comedi_device * dev, struct comedi_subdev | |||
474 | 474 | ||
475 | only one sample per call is supported | 475 | only one sample per call is supported |
476 | */ | 476 | */ |
477 | static int pcl818_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 477 | static int pcl818_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
478 | struct comedi_insn * insn, unsigned int * data) | 478 | struct comedi_insn *insn, unsigned int *data) |
479 | { | 479 | { |
480 | if (insn->n != 2) | 480 | if (insn->n != 2) |
481 | return -EINVAL; | 481 | return -EINVAL; |
@@ -492,8 +492,8 @@ static int pcl818_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi | |||
492 | 492 | ||
493 | only one sample per call is supported | 493 | only one sample per call is supported |
494 | */ | 494 | */ |
495 | static int pcl818_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 495 | static int pcl818_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
496 | struct comedi_insn * insn, unsigned int * data) | 496 | struct comedi_insn *insn, unsigned int *data) |
497 | { | 497 | { |
498 | if (insn->n != 2) | 498 | if (insn->n != 2) |
499 | return -EINVAL; | 499 | return -EINVAL; |
@@ -876,8 +876,8 @@ static irqreturn_t interrupt_pcl818(int irq, void *d) | |||
876 | ============================================================================== | 876 | ============================================================================== |
877 | ANALOG INPUT MODE 1 or 3 DMA , 818 cards | 877 | ANALOG INPUT MODE 1 or 3 DMA , 818 cards |
878 | */ | 878 | */ |
879 | static void pcl818_ai_mode13dma_int(int mode, struct comedi_device * dev, | 879 | static void pcl818_ai_mode13dma_int(int mode, struct comedi_device *dev, |
880 | struct comedi_subdevice * s) | 880 | struct comedi_subdevice *s) |
881 | { | 881 | { |
882 | unsigned int flags; | 882 | unsigned int flags; |
883 | unsigned int bytes; | 883 | unsigned int bytes; |
@@ -917,8 +917,8 @@ static void pcl818_ai_mode13dma_int(int mode, struct comedi_device * dev, | |||
917 | ============================================================================== | 917 | ============================================================================== |
918 | ANALOG INPUT MODE 1 or 3 DMA rtc, 818 cards | 918 | ANALOG INPUT MODE 1 or 3 DMA rtc, 818 cards |
919 | */ | 919 | */ |
920 | static void pcl818_ai_mode13dma_rtc(int mode, struct comedi_device * dev, | 920 | static void pcl818_ai_mode13dma_rtc(int mode, struct comedi_device *dev, |
921 | struct comedi_subdevice * s) | 921 | struct comedi_subdevice *s) |
922 | { | 922 | { |
923 | unsigned int flags; | 923 | unsigned int flags; |
924 | short *pole; | 924 | short *pole; |
@@ -958,8 +958,8 @@ static void pcl818_ai_mode13dma_rtc(int mode, struct comedi_device * dev, | |||
958 | ============================================================================== | 958 | ============================================================================== |
959 | ANALOG INPUT MODE 1 or 3, 818 cards | 959 | ANALOG INPUT MODE 1 or 3, 818 cards |
960 | */ | 960 | */ |
961 | static int pcl818_ai_cmd_mode(int mode, struct comedi_device * dev, | 961 | static int pcl818_ai_cmd_mode(int mode, struct comedi_device *dev, |
962 | struct comedi_subdevice * s) | 962 | struct comedi_subdevice *s) |
963 | { | 963 | { |
964 | struct comedi_cmd *cmd = &s->async->cmd; | 964 | struct comedi_cmd *cmd = &s->async->cmd; |
965 | int divisor1, divisor2; | 965 | int divisor1, divisor2; |
@@ -1075,8 +1075,8 @@ static int pcl818_ai_cmd_mode(int mode, struct comedi_device * dev, | |||
1075 | ANALOG OUTPUT MODE 1 or 3, 818 cards | 1075 | ANALOG OUTPUT MODE 1 or 3, 818 cards |
1076 | */ | 1076 | */ |
1077 | #ifdef PCL818_MODE13_AO | 1077 | #ifdef PCL818_MODE13_AO |
1078 | static int pcl818_ao_mode13(int mode, struct comedi_device * dev, struct comedi_subdevice * s, | 1078 | static int pcl818_ao_mode13(int mode, struct comedi_device *dev, struct comedi_subdevice *s, |
1079 | comedi_trig * it) | 1079 | comedi_trig *it) |
1080 | { | 1080 | { |
1081 | int divisor1, divisor2; | 1081 | int divisor1, divisor2; |
1082 | 1082 | ||
@@ -1128,8 +1128,8 @@ static int pcl818_ao_mode13(int mode, struct comedi_device * dev, struct comedi_ | |||
1128 | ============================================================================== | 1128 | ============================================================================== |
1129 | ANALOG OUTPUT MODE 1, 818 cards | 1129 | ANALOG OUTPUT MODE 1, 818 cards |
1130 | */ | 1130 | */ |
1131 | static int pcl818_ao_mode1(struct comedi_device * dev, struct comedi_subdevice * s, | 1131 | static int pcl818_ao_mode1(struct comedi_device *dev, struct comedi_subdevice *s, |
1132 | comedi_trig * it) | 1132 | comedi_trig *it) |
1133 | { | 1133 | { |
1134 | return pcl818_ao_mode13(1, dev, s, it); | 1134 | return pcl818_ao_mode13(1, dev, s, it); |
1135 | } | 1135 | } |
@@ -1138,8 +1138,8 @@ static int pcl818_ao_mode1(struct comedi_device * dev, struct comedi_subdevice * | |||
1138 | ============================================================================== | 1138 | ============================================================================== |
1139 | ANALOG OUTPUT MODE 3, 818 cards | 1139 | ANALOG OUTPUT MODE 3, 818 cards |
1140 | */ | 1140 | */ |
1141 | static int pcl818_ao_mode3(struct comedi_device * dev, struct comedi_subdevice * s, | 1141 | static int pcl818_ao_mode3(struct comedi_device *dev, struct comedi_subdevice *s, |
1142 | comedi_trig * it) | 1142 | comedi_trig *it) |
1143 | { | 1143 | { |
1144 | return pcl818_ao_mode13(3, dev, s, it); | 1144 | return pcl818_ao_mode13(3, dev, s, it); |
1145 | } | 1145 | } |
@@ -1150,7 +1150,7 @@ static int pcl818_ao_mode3(struct comedi_device * dev, struct comedi_subdevice * | |||
1150 | ============================================================================== | 1150 | ============================================================================== |
1151 | Start/stop pacer onboard pacer | 1151 | Start/stop pacer onboard pacer |
1152 | */ | 1152 | */ |
1153 | static void start_pacer(struct comedi_device * dev, int mode, unsigned int divisor1, | 1153 | static void start_pacer(struct comedi_device *dev, int mode, unsigned int divisor1, |
1154 | unsigned int divisor2) | 1154 | unsigned int divisor2) |
1155 | { | 1155 | { |
1156 | outb(0xb4, dev->iobase + PCL818_CTRCTL); | 1156 | outb(0xb4, dev->iobase + PCL818_CTRCTL); |
@@ -1170,7 +1170,7 @@ static void start_pacer(struct comedi_device * dev, int mode, unsigned int divis | |||
1170 | Check if channel list from user is builded correctly | 1170 | Check if channel list from user is builded correctly |
1171 | If it's ok, then program scan/gain logic | 1171 | If it's ok, then program scan/gain logic |
1172 | */ | 1172 | */ |
1173 | static int check_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, | 1173 | static int check_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, |
1174 | unsigned int *chanlist, unsigned int n_chan) | 1174 | unsigned int *chanlist, unsigned int n_chan) |
1175 | { | 1175 | { |
1176 | unsigned int chansegment[16]; | 1176 | unsigned int chansegment[16]; |
@@ -1230,7 +1230,7 @@ static int check_channel_list(struct comedi_device * dev, struct comedi_subdevic | |||
1230 | return seglen; | 1230 | return seglen; |
1231 | } | 1231 | } |
1232 | 1232 | ||
1233 | static void setup_channel_list(struct comedi_device * dev, struct comedi_subdevice * s, | 1233 | static void setup_channel_list(struct comedi_device *dev, struct comedi_subdevice *s, |
1234 | unsigned int *chanlist, unsigned int n_chan, unsigned int seglen) | 1234 | unsigned int *chanlist, unsigned int n_chan, unsigned int seglen) |
1235 | { | 1235 | { |
1236 | int i; | 1236 | int i; |
@@ -1267,8 +1267,8 @@ static int check_single_ended(unsigned int port) | |||
1267 | /* | 1267 | /* |
1268 | ============================================================================== | 1268 | ============================================================================== |
1269 | */ | 1269 | */ |
1270 | static int ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 1270 | static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
1271 | struct comedi_cmd * cmd) | 1271 | struct comedi_cmd *cmd) |
1272 | { | 1272 | { |
1273 | int err = 0; | 1273 | int err = 0; |
1274 | int tmp, divisor1, divisor2; | 1274 | int tmp, divisor1, divisor2; |
@@ -1412,7 +1412,7 @@ static int ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | |||
1412 | /* | 1412 | /* |
1413 | ============================================================================== | 1413 | ============================================================================== |
1414 | */ | 1414 | */ |
1415 | static int ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 1415 | static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
1416 | { | 1416 | { |
1417 | struct comedi_cmd *cmd = &s->async->cmd; | 1417 | struct comedi_cmd *cmd = &s->async->cmd; |
1418 | int retval; | 1418 | int retval; |
@@ -1451,7 +1451,7 @@ static int ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
1451 | ============================================================================== | 1451 | ============================================================================== |
1452 | cancel any mode 1-4 AI | 1452 | cancel any mode 1-4 AI |
1453 | */ | 1453 | */ |
1454 | static int pcl818_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 1454 | static int pcl818_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
1455 | { | 1455 | { |
1456 | if (devpriv->irq_blocked > 0) { | 1456 | if (devpriv->irq_blocked > 0) { |
1457 | rt_printk("pcl818_ai_cancel()\n"); | 1457 | rt_printk("pcl818_ai_cancel()\n"); |
@@ -1535,7 +1535,7 @@ static int pcl818_check(unsigned long iobase) | |||
1535 | ============================================================================== | 1535 | ============================================================================== |
1536 | reset whole PCL-818 cards | 1536 | reset whole PCL-818 cards |
1537 | */ | 1537 | */ |
1538 | static void pcl818_reset(struct comedi_device * dev) | 1538 | static void pcl818_reset(struct comedi_device *dev) |
1539 | { | 1539 | { |
1540 | if (devpriv->usefifo) { /* FIFO shutdown */ | 1540 | if (devpriv->usefifo) { /* FIFO shutdown */ |
1541 | outb(0, dev->iobase + PCL818_FI_INTCLR); | 1541 | outb(0, dev->iobase + PCL818_FI_INTCLR); |
@@ -1656,7 +1656,7 @@ static int rtc_setfreq_irq(int freq) | |||
1656 | ============================================================================== | 1656 | ============================================================================== |
1657 | Free any resources that we have claimed | 1657 | Free any resources that we have claimed |
1658 | */ | 1658 | */ |
1659 | static void free_resources(struct comedi_device * dev) | 1659 | static void free_resources(struct comedi_device *dev) |
1660 | { | 1660 | { |
1661 | /* rt_printk("free_resource()\n"); */ | 1661 | /* rt_printk("free_resource()\n"); */ |
1662 | if (dev->private) { | 1662 | if (dev->private) { |
@@ -1694,7 +1694,7 @@ static void free_resources(struct comedi_device * dev) | |||
1694 | Initialization | 1694 | Initialization |
1695 | 1695 | ||
1696 | */ | 1696 | */ |
1697 | static int pcl818_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 1697 | static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
1698 | { | 1698 | { |
1699 | int ret; | 1699 | int ret; |
1700 | unsigned long iobase; | 1700 | unsigned long iobase; |
@@ -1996,7 +1996,7 @@ static int pcl818_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
1996 | ============================================================================== | 1996 | ============================================================================== |
1997 | Removes device | 1997 | Removes device |
1998 | */ | 1998 | */ |
1999 | static int pcl818_detach(struct comedi_device * dev) | 1999 | static int pcl818_detach(struct comedi_device *dev) |
2000 | { | 2000 | { |
2001 | /* rt_printk("comedi%d: pcl818: remove\n", dev->minor); */ | 2001 | /* rt_printk("comedi%d: pcl818: remove\n", dev->minor); */ |
2002 | free_resources(dev); | 2002 | free_resources(dev); |
diff --git a/drivers/staging/comedi/drivers/pcm3724.c b/drivers/staging/comedi/drivers/pcm3724.c index 747882d7846..5178b43b107 100644 --- a/drivers/staging/comedi/drivers/pcm3724.c +++ b/drivers/staging/comedi/drivers/pcm3724.c | |||
@@ -62,8 +62,8 @@ Copy/pasted/hacked from pcm724.c | |||
62 | #define CR_A_MODE(a) ((a)<<5) | 62 | #define CR_A_MODE(a) ((a)<<5) |
63 | #define CR_CW 0x80 | 63 | #define CR_CW 0x80 |
64 | 64 | ||
65 | static int pcm3724_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 65 | static int pcm3724_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
66 | static int pcm3724_detach(struct comedi_device * dev); | 66 | static int pcm3724_detach(struct comedi_device *dev); |
67 | 67 | ||
68 | struct pcm3724_board { | 68 | struct pcm3724_board { |
69 | const char *name; /* driver name */ | 69 | const char *name; /* driver name */ |
@@ -116,7 +116,7 @@ static int subdev_8255_cb(int dir, int port, int data, unsigned long arg) | |||
116 | } | 116 | } |
117 | } | 117 | } |
118 | 118 | ||
119 | static int compute_buffer(int config, int devno, struct comedi_subdevice * s) | 119 | static int compute_buffer(int config, int devno, struct comedi_subdevice *s) |
120 | { | 120 | { |
121 | /* 1 in io_bits indicates output */ | 121 | /* 1 in io_bits indicates output */ |
122 | if (s->io_bits & 0x0000ff) { | 122 | if (s->io_bits & 0x0000ff) { |
@@ -143,7 +143,7 @@ static int compute_buffer(int config, int devno, struct comedi_subdevice * s) | |||
143 | return config; | 143 | return config; |
144 | } | 144 | } |
145 | 145 | ||
146 | static void do_3724_config(struct comedi_device * dev, struct comedi_subdevice * s, | 146 | static void do_3724_config(struct comedi_device *dev, struct comedi_subdevice *s, |
147 | int chanspec) | 147 | int chanspec) |
148 | { | 148 | { |
149 | int config; | 149 | int config; |
@@ -177,7 +177,7 @@ static void do_3724_config(struct comedi_device * dev, struct comedi_subdevice * | |||
177 | outb(config, port_8255_cfg); | 177 | outb(config, port_8255_cfg); |
178 | } | 178 | } |
179 | 179 | ||
180 | static void enable_chan(struct comedi_device * dev, struct comedi_subdevice * s, int chanspec) | 180 | static void enable_chan(struct comedi_device *dev, struct comedi_subdevice *s, int chanspec) |
181 | { | 181 | { |
182 | unsigned int mask; | 182 | unsigned int mask; |
183 | int gatecfg; | 183 | int gatecfg; |
@@ -215,8 +215,8 @@ static void enable_chan(struct comedi_device * dev, struct comedi_subdevice * s, | |||
215 | } | 215 | } |
216 | 216 | ||
217 | /* overriding the 8255 insn config */ | 217 | /* overriding the 8255 insn config */ |
218 | static int subdev_3724_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 218 | static int subdev_3724_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
219 | struct comedi_insn * insn, unsigned int * data) | 219 | struct comedi_insn *insn, unsigned int *data) |
220 | { | 220 | { |
221 | unsigned int mask; | 221 | unsigned int mask; |
222 | unsigned int bits; | 222 | unsigned int bits; |
@@ -252,7 +252,7 @@ static int subdev_3724_insn_config(struct comedi_device * dev, struct comedi_sub | |||
252 | return 1; | 252 | return 1; |
253 | } | 253 | } |
254 | 254 | ||
255 | static int pcm3724_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 255 | static int pcm3724_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
256 | { | 256 | { |
257 | unsigned long iobase; | 257 | unsigned long iobase; |
258 | unsigned int iorange; | 258 | unsigned int iorange; |
@@ -290,7 +290,7 @@ static int pcm3724_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
290 | return 0; | 290 | return 0; |
291 | } | 291 | } |
292 | 292 | ||
293 | static int pcm3724_detach(struct comedi_device * dev) | 293 | static int pcm3724_detach(struct comedi_device *dev) |
294 | { | 294 | { |
295 | int i; | 295 | int i; |
296 | 296 | ||
diff --git a/drivers/staging/comedi/drivers/pcm3730.c b/drivers/staging/comedi/drivers/pcm3730.c index 41983d03dab..1a65af1c6e4 100644 --- a/drivers/staging/comedi/drivers/pcm3730.c +++ b/drivers/staging/comedi/drivers/pcm3730.c | |||
@@ -28,8 +28,8 @@ Configuration options: | |||
28 | #define PCM3730_DIB 2 | 28 | #define PCM3730_DIB 2 |
29 | #define PCM3730_DIC 3 | 29 | #define PCM3730_DIC 3 |
30 | 30 | ||
31 | static int pcm3730_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 31 | static int pcm3730_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
32 | static int pcm3730_detach(struct comedi_device * dev); | 32 | static int pcm3730_detach(struct comedi_device *dev); |
33 | static struct comedi_driver driver_pcm3730 = { | 33 | static struct comedi_driver driver_pcm3730 = { |
34 | driver_name:"pcm3730", | 34 | driver_name:"pcm3730", |
35 | module:THIS_MODULE, | 35 | module:THIS_MODULE, |
@@ -39,8 +39,8 @@ static struct comedi_driver driver_pcm3730 = { | |||
39 | 39 | ||
40 | COMEDI_INITCLEANUP(driver_pcm3730); | 40 | COMEDI_INITCLEANUP(driver_pcm3730); |
41 | 41 | ||
42 | static int pcm3730_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 42 | static int pcm3730_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
43 | struct comedi_insn * insn, unsigned int * data) | 43 | struct comedi_insn *insn, unsigned int *data) |
44 | { | 44 | { |
45 | if (insn->n != 2) | 45 | if (insn->n != 2) |
46 | return -EINVAL; | 46 | return -EINVAL; |
@@ -54,8 +54,8 @@ static int pcm3730_do_insn_bits(struct comedi_device * dev, struct comedi_subdev | |||
54 | return 2; | 54 | return 2; |
55 | } | 55 | } |
56 | 56 | ||
57 | static int pcm3730_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 57 | static int pcm3730_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
58 | struct comedi_insn * insn, unsigned int * data) | 58 | struct comedi_insn *insn, unsigned int *data) |
59 | { | 59 | { |
60 | if (insn->n != 2) | 60 | if (insn->n != 2) |
61 | return -EINVAL; | 61 | return -EINVAL; |
@@ -63,7 +63,7 @@ static int pcm3730_di_insn_bits(struct comedi_device * dev, struct comedi_subdev | |||
63 | return 2; | 63 | return 2; |
64 | } | 64 | } |
65 | 65 | ||
66 | static int pcm3730_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 66 | static int pcm3730_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
67 | { | 67 | { |
68 | struct comedi_subdevice *s; | 68 | struct comedi_subdevice *s; |
69 | unsigned long iobase; | 69 | unsigned long iobase; |
@@ -141,7 +141,7 @@ static int pcm3730_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
141 | return 0; | 141 | return 0; |
142 | } | 142 | } |
143 | 143 | ||
144 | static int pcm3730_detach(struct comedi_device * dev) | 144 | static int pcm3730_detach(struct comedi_device *dev) |
145 | { | 145 | { |
146 | printk("comedi%d: pcm3730: remove\n", dev->minor); | 146 | printk("comedi%d: pcm3730: remove\n", dev->minor); |
147 | 147 | ||
diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c index fc2a73d97c2..15986691ff3 100644 --- a/drivers/staging/comedi/drivers/pcmad.c +++ b/drivers/staging/comedi/drivers/pcmad.c | |||
@@ -76,8 +76,8 @@ struct pcmad_priv_struct { | |||
76 | }; | 76 | }; |
77 | #define devpriv ((struct pcmad_priv_struct *)dev->private) | 77 | #define devpriv ((struct pcmad_priv_struct *)dev->private) |
78 | 78 | ||
79 | static int pcmad_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 79 | static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
80 | static int pcmad_detach(struct comedi_device * dev); | 80 | static int pcmad_detach(struct comedi_device *dev); |
81 | static struct comedi_driver driver_pcmad = { | 81 | static struct comedi_driver driver_pcmad = { |
82 | driver_name:"pcmad", | 82 | driver_name:"pcmad", |
83 | module:THIS_MODULE, | 83 | module:THIS_MODULE, |
@@ -92,8 +92,8 @@ COMEDI_INITCLEANUP(driver_pcmad); | |||
92 | 92 | ||
93 | #define TIMEOUT 100 | 93 | #define TIMEOUT 100 |
94 | 94 | ||
95 | static int pcmad_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 95 | static int pcmad_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
96 | struct comedi_insn * insn, unsigned int * data) | 96 | struct comedi_insn *insn, unsigned int *data) |
97 | { | 97 | { |
98 | int i; | 98 | int i; |
99 | int chan; | 99 | int chan; |
@@ -126,7 +126,7 @@ static int pcmad_ai_insn_read(struct comedi_device * dev, struct comedi_subdevic | |||
126 | * 2 0=single ended 1=differential | 126 | * 2 0=single ended 1=differential |
127 | * 3 0=straight binary 1=two's comp | 127 | * 3 0=straight binary 1=two's comp |
128 | */ | 128 | */ |
129 | static int pcmad_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 129 | static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
130 | { | 130 | { |
131 | int ret; | 131 | int ret; |
132 | struct comedi_subdevice *s; | 132 | struct comedi_subdevice *s; |
@@ -159,7 +159,7 @@ static int pcmad_attach(struct comedi_device * dev, struct comedi_devconfig * it | |||
159 | return 0; | 159 | return 0; |
160 | } | 160 | } |
161 | 161 | ||
162 | static int pcmad_detach(struct comedi_device * dev) | 162 | static int pcmad_detach(struct comedi_device *dev) |
163 | { | 163 | { |
164 | printk("comedi%d: pcmad: remove\n", dev->minor); | 164 | printk("comedi%d: pcmad: remove\n", dev->minor); |
165 | 165 | ||
diff --git a/drivers/staging/comedi/drivers/pcmda12.c b/drivers/staging/comedi/drivers/pcmda12.c index 2a1ff465602..8e4feef2711 100644 --- a/drivers/staging/comedi/drivers/pcmda12.c +++ b/drivers/staging/comedi/drivers/pcmda12.c | |||
@@ -107,10 +107,10 @@ struct pcmda12_private { | |||
107 | * the board, and also about the kernel module that contains | 107 | * the board, and also about the kernel module that contains |
108 | * the device code. | 108 | * the device code. |
109 | */ | 109 | */ |
110 | static int pcmda12_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 110 | static int pcmda12_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
111 | static int pcmda12_detach(struct comedi_device * dev); | 111 | static int pcmda12_detach(struct comedi_device *dev); |
112 | 112 | ||
113 | static void zero_chans(struct comedi_device * dev); | 113 | static void zero_chans(struct comedi_device *dev); |
114 | 114 | ||
115 | static struct comedi_driver driver = { | 115 | static struct comedi_driver driver = { |
116 | driver_name:"pcmda12", | 116 | driver_name:"pcmda12", |
@@ -140,10 +140,10 @@ static struct comedi_driver driver = { | |||
140 | num_names:sizeof(pcmda12_boards) / sizeof(struct pcmda12_board), | 140 | num_names:sizeof(pcmda12_boards) / sizeof(struct pcmda12_board), |
141 | }; | 141 | }; |
142 | 142 | ||
143 | static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 143 | static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
144 | struct comedi_insn * insn, unsigned int * data); | 144 | struct comedi_insn *insn, unsigned int *data); |
145 | static int ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 145 | static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
146 | struct comedi_insn * insn, unsigned int * data); | 146 | struct comedi_insn *insn, unsigned int *data); |
147 | 147 | ||
148 | /* | 148 | /* |
149 | * Attach is called by the Comedi core to configure the driver | 149 | * Attach is called by the Comedi core to configure the driver |
@@ -151,7 +151,7 @@ static int ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | |||
151 | * in the driver structure, dev->board_ptr contains that | 151 | * in the driver structure, dev->board_ptr contains that |
152 | * address. | 152 | * address. |
153 | */ | 153 | */ |
154 | static int pcmda12_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 154 | static int pcmda12_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
155 | { | 155 | { |
156 | struct comedi_subdevice *s; | 156 | struct comedi_subdevice *s; |
157 | unsigned long iobase; | 157 | unsigned long iobase; |
@@ -220,7 +220,7 @@ static int pcmda12_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
220 | * allocated by _attach(). dev->private and dev->subdevices are | 220 | * allocated by _attach(). dev->private and dev->subdevices are |
221 | * deallocated automatically by the core. | 221 | * deallocated automatically by the core. |
222 | */ | 222 | */ |
223 | static int pcmda12_detach(struct comedi_device * dev) | 223 | static int pcmda12_detach(struct comedi_device *dev) |
224 | { | 224 | { |
225 | printk("comedi%d: %s: remove\n", dev->minor, driver.driver_name); | 225 | printk("comedi%d: %s: remove\n", dev->minor, driver.driver_name); |
226 | if (dev->iobase) | 226 | if (dev->iobase) |
@@ -228,7 +228,7 @@ static int pcmda12_detach(struct comedi_device * dev) | |||
228 | return 0; | 228 | return 0; |
229 | } | 229 | } |
230 | 230 | ||
231 | static void zero_chans(struct comedi_device * dev) | 231 | static void zero_chans(struct comedi_device *dev) |
232 | { /* sets up an | 232 | { /* sets up an |
233 | ASIC chip to defaults */ | 233 | ASIC chip to defaults */ |
234 | int i; | 234 | int i; |
@@ -241,8 +241,8 @@ static void zero_chans(struct comedi_device * dev) | |||
241 | inb(LSB_PORT(0)); /* update chans. */ | 241 | inb(LSB_PORT(0)); /* update chans. */ |
242 | } | 242 | } |
243 | 243 | ||
244 | static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 244 | static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
245 | struct comedi_insn * insn, unsigned int * data) | 245 | struct comedi_insn *insn, unsigned int *data) |
246 | { | 246 | { |
247 | int i; | 247 | int i; |
248 | int chan = CR_CHAN(insn->chanspec); | 248 | int chan = CR_CHAN(insn->chanspec); |
@@ -283,8 +283,8 @@ static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | |||
283 | DAC outputs, which makes all AO channels update simultaneously. | 283 | DAC outputs, which makes all AO channels update simultaneously. |
284 | This is useful for some control applications, I would imagine. | 284 | This is useful for some control applications, I would imagine. |
285 | */ | 285 | */ |
286 | static int ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 286 | static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
287 | struct comedi_insn * insn, unsigned int * data) | 287 | struct comedi_insn *insn, unsigned int *data) |
288 | { | 288 | { |
289 | int i; | 289 | int i; |
290 | int chan = CR_CHAN(insn->chanspec); | 290 | int chan = CR_CHAN(insn->chanspec); |
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c index 8c332c2f421..9afd51ff907 100644 --- a/drivers/staging/comedi/drivers/pcmmio.c +++ b/drivers/staging/comedi/drivers/pcmmio.c | |||
@@ -264,8 +264,8 @@ struct pcmmio_private { | |||
264 | * the board, and also about the kernel module that contains | 264 | * the board, and also about the kernel module that contains |
265 | * the device code. | 265 | * the device code. |
266 | */ | 266 | */ |
267 | static int pcmmio_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 267 | static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
268 | static int pcmmio_detach(struct comedi_device * dev); | 268 | static int pcmmio_detach(struct comedi_device *dev); |
269 | 269 | ||
270 | static struct comedi_driver driver = { | 270 | static struct comedi_driver driver = { |
271 | driver_name:"pcmmio", | 271 | driver_name:"pcmmio", |
@@ -321,7 +321,7 @@ static void unlock_port(struct comedi_device * dev, int asic, int port); | |||
321 | * in the driver structure, dev->board_ptr contains that | 321 | * in the driver structure, dev->board_ptr contains that |
322 | * address. | 322 | * address. |
323 | */ | 323 | */ |
324 | static int pcmmio_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 324 | static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
325 | { | 325 | { |
326 | struct comedi_subdevice *s; | 326 | struct comedi_subdevice *s; |
327 | int sdev_no, chans_left, n_dio_subdevs, n_subdevs, port, asic, | 327 | int sdev_no, chans_left, n_dio_subdevs, n_subdevs, port, asic, |
@@ -526,7 +526,7 @@ static int pcmmio_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
526 | * allocated by _attach(). dev->private and dev->subdevices are | 526 | * allocated by _attach(). dev->private and dev->subdevices are |
527 | * deallocated automatically by the core. | 527 | * deallocated automatically by the core. |
528 | */ | 528 | */ |
529 | static int pcmmio_detach(struct comedi_device * dev) | 529 | static int pcmmio_detach(struct comedi_device *dev) |
530 | { | 530 | { |
531 | int i; | 531 | int i; |
532 | 532 | ||
@@ -550,8 +550,8 @@ static int pcmmio_detach(struct comedi_device * dev) | |||
550 | * useful to applications if you implement the insn_bits interface. | 550 | * useful to applications if you implement the insn_bits interface. |
551 | * This allows packed reading/writing of the DIO channels. The | 551 | * This allows packed reading/writing of the DIO channels. The |
552 | * comedi core can convert between insn_bits and insn_read/write */ | 552 | * comedi core can convert between insn_bits and insn_read/write */ |
553 | static int pcmmio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 553 | static int pcmmio_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
554 | struct comedi_insn * insn, unsigned int * data) | 554 | struct comedi_insn *insn, unsigned int *data) |
555 | { | 555 | { |
556 | int byte_no; | 556 | int byte_no; |
557 | if (insn->n != 2) | 557 | if (insn->n != 2) |
@@ -624,8 +624,8 @@ static int pcmmio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdev | |||
624 | * configured by a special insn_config instruction. chanspec | 624 | * configured by a special insn_config instruction. chanspec |
625 | * contains the channel to be changed, and data[0] contains the | 625 | * contains the channel to be changed, and data[0] contains the |
626 | * value COMEDI_INPUT or COMEDI_OUTPUT. */ | 626 | * value COMEDI_INPUT or COMEDI_OUTPUT. */ |
627 | static int pcmmio_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 627 | static int pcmmio_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
628 | struct comedi_insn * insn, unsigned int * data) | 628 | struct comedi_insn *insn, unsigned int *data) |
629 | { | 629 | { |
630 | int chan = CR_CHAN(insn->chanspec), byte_no = chan / 8, bit_no = | 630 | int chan = CR_CHAN(insn->chanspec), byte_no = chan / 8, bit_no = |
631 | chan % 8; | 631 | chan % 8; |
@@ -685,7 +685,7 @@ static int pcmmio_dio_insn_config(struct comedi_device * dev, struct comedi_subd | |||
685 | return insn->n; | 685 | return insn->n; |
686 | } | 686 | } |
687 | 687 | ||
688 | static void init_asics(struct comedi_device * dev) | 688 | static void init_asics(struct comedi_device *dev) |
689 | { /* sets up an | 689 | { /* sets up an |
690 | ASIC chip to defaults */ | 690 | ASIC chip to defaults */ |
691 | int asic; | 691 | int asic; |
@@ -722,7 +722,7 @@ static void init_asics(struct comedi_device * dev) | |||
722 | } | 722 | } |
723 | } | 723 | } |
724 | 724 | ||
725 | static void switch_page(struct comedi_device * dev, int asic, int page) | 725 | static void switch_page(struct comedi_device *dev, int asic, int page) |
726 | { | 726 | { |
727 | if (asic < 0 || asic >= thisboard->dio_num_asics) | 727 | if (asic < 0 || asic >= thisboard->dio_num_asics) |
728 | return; /* paranoia */ | 728 | return; /* paranoia */ |
@@ -738,7 +738,7 @@ static void switch_page(struct comedi_device * dev, int asic, int page) | |||
738 | } | 738 | } |
739 | 739 | ||
740 | #ifdef notused | 740 | #ifdef notused |
741 | static void lock_port(struct comedi_device * dev, int asic, int port) | 741 | static void lock_port(struct comedi_device *dev, int asic, int port) |
742 | { | 742 | { |
743 | if (asic < 0 || asic >= thisboard->dio_num_asics) | 743 | if (asic < 0 || asic >= thisboard->dio_num_asics) |
744 | return; /* paranoia */ | 744 | return; /* paranoia */ |
@@ -752,7 +752,7 @@ static void lock_port(struct comedi_device * dev, int asic, int port) | |||
752 | return; | 752 | return; |
753 | } | 753 | } |
754 | 754 | ||
755 | static void unlock_port(struct comedi_device * dev, int asic, int port) | 755 | static void unlock_port(struct comedi_device *dev, int asic, int port) |
756 | { | 756 | { |
757 | if (asic < 0 || asic >= thisboard->dio_num_asics) | 757 | if (asic < 0 || asic >= thisboard->dio_num_asics) |
758 | return; /* paranoia */ | 758 | return; /* paranoia */ |
@@ -917,7 +917,7 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d) | |||
917 | return IRQ_HANDLED; | 917 | return IRQ_HANDLED; |
918 | } | 918 | } |
919 | 919 | ||
920 | static void pcmmio_stop_intr(struct comedi_device * dev, struct comedi_subdevice * s) | 920 | static void pcmmio_stop_intr(struct comedi_device *dev, struct comedi_subdevice *s) |
921 | { | 921 | { |
922 | int nports, firstport, asic, port; | 922 | int nports, firstport, asic, port; |
923 | 923 | ||
@@ -936,7 +936,7 @@ static void pcmmio_stop_intr(struct comedi_device * dev, struct comedi_subdevice | |||
936 | } | 936 | } |
937 | } | 937 | } |
938 | 938 | ||
939 | static int pcmmio_start_intr(struct comedi_device * dev, struct comedi_subdevice * s) | 939 | static int pcmmio_start_intr(struct comedi_device *dev, struct comedi_subdevice *s) |
940 | { | 940 | { |
941 | if (!subpriv->dio.intr.continuous && subpriv->dio.intr.stop_count == 0) { | 941 | if (!subpriv->dio.intr.continuous && subpriv->dio.intr.stop_count == 0) { |
942 | /* An empty acquisition! */ | 942 | /* An empty acquisition! */ |
@@ -995,7 +995,7 @@ static int pcmmio_start_intr(struct comedi_device * dev, struct comedi_subdevice | |||
995 | return 0; | 995 | return 0; |
996 | } | 996 | } |
997 | 997 | ||
998 | static int pcmmio_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 998 | static int pcmmio_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
999 | { | 999 | { |
1000 | unsigned long flags; | 1000 | unsigned long flags; |
1001 | 1001 | ||
@@ -1011,7 +1011,7 @@ static int pcmmio_cancel(struct comedi_device * dev, struct comedi_subdevice * s | |||
1011 | * Internal trigger function to start acquisition for an 'INTERRUPT' subdevice. | 1011 | * Internal trigger function to start acquisition for an 'INTERRUPT' subdevice. |
1012 | */ | 1012 | */ |
1013 | static int | 1013 | static int |
1014 | pcmmio_inttrig_start_intr(struct comedi_device * dev, struct comedi_subdevice * s, | 1014 | pcmmio_inttrig_start_intr(struct comedi_device *dev, struct comedi_subdevice *s, |
1015 | unsigned int trignum) | 1015 | unsigned int trignum) |
1016 | { | 1016 | { |
1017 | unsigned long flags; | 1017 | unsigned long flags; |
@@ -1037,7 +1037,7 @@ pcmmio_inttrig_start_intr(struct comedi_device * dev, struct comedi_subdevice * | |||
1037 | /* | 1037 | /* |
1038 | * 'do_cmd' function for an 'INTERRUPT' subdevice. | 1038 | * 'do_cmd' function for an 'INTERRUPT' subdevice. |
1039 | */ | 1039 | */ |
1040 | static int pcmmio_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 1040 | static int pcmmio_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
1041 | { | 1041 | { |
1042 | struct comedi_cmd *cmd = &s->async->cmd; | 1042 | struct comedi_cmd *cmd = &s->async->cmd; |
1043 | unsigned long flags; | 1043 | unsigned long flags; |
@@ -1082,7 +1082,7 @@ static int pcmmio_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
1082 | * 'do_cmdtest' function for an 'INTERRUPT' subdevice. | 1082 | * 'do_cmdtest' function for an 'INTERRUPT' subdevice. |
1083 | */ | 1083 | */ |
1084 | static int | 1084 | static int |
1085 | pcmmio_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, struct comedi_cmd * cmd) | 1085 | pcmmio_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd) |
1086 | { | 1086 | { |
1087 | int err = 0; | 1087 | int err = 0; |
1088 | unsigned int tmp; | 1088 | unsigned int tmp; |
@@ -1194,8 +1194,8 @@ static int adc_wait_ready(unsigned long iobase) | |||
1194 | } | 1194 | } |
1195 | 1195 | ||
1196 | /* All this is for AI and AO */ | 1196 | /* All this is for AI and AO */ |
1197 | static int ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 1197 | static int ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
1198 | struct comedi_insn * insn, unsigned int * data) | 1198 | struct comedi_insn *insn, unsigned int *data) |
1199 | { | 1199 | { |
1200 | int n; | 1200 | int n; |
1201 | unsigned long iobase = subpriv->iobase; | 1201 | unsigned long iobase = subpriv->iobase; |
@@ -1258,8 +1258,8 @@ static int ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | |||
1258 | return n; | 1258 | return n; |
1259 | } | 1259 | } |
1260 | 1260 | ||
1261 | static int ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 1261 | static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
1262 | struct comedi_insn * insn, unsigned int * data) | 1262 | struct comedi_insn *insn, unsigned int *data) |
1263 | { | 1263 | { |
1264 | int n; | 1264 | int n; |
1265 | for (n = 0; n < insn->n; n++) { | 1265 | for (n = 0; n < insn->n; n++) { |
@@ -1288,8 +1288,8 @@ static int wait_dac_ready(unsigned long iobase) | |||
1288 | return 1; | 1288 | return 1; |
1289 | } | 1289 | } |
1290 | 1290 | ||
1291 | static int ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 1291 | static int ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
1292 | struct comedi_insn * insn, unsigned int * data) | 1292 | struct comedi_insn *insn, unsigned int *data) |
1293 | { | 1293 | { |
1294 | int n; | 1294 | int n; |
1295 | unsigned iobase = subpriv->iobase, iooffset = 0; | 1295 | unsigned iobase = subpriv->iobase, iooffset = 0; |
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c index de9c13554ca..04fff9dfe87 100644 --- a/drivers/staging/comedi/drivers/pcmuio.c +++ b/drivers/staging/comedi/drivers/pcmuio.c | |||
@@ -222,8 +222,8 @@ struct pcmuio_private { | |||
222 | * the board, and also about the kernel module that contains | 222 | * the board, and also about the kernel module that contains |
223 | * the device code. | 223 | * the device code. |
224 | */ | 224 | */ |
225 | static int pcmuio_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 225 | static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
226 | static int pcmuio_detach(struct comedi_device * dev); | 226 | static int pcmuio_detach(struct comedi_device *dev); |
227 | 227 | ||
228 | static struct comedi_driver driver = { | 228 | static struct comedi_driver driver = { |
229 | driver_name:"pcmuio", | 229 | driver_name:"pcmuio", |
@@ -279,7 +279,7 @@ static void unlock_port(struct comedi_device * dev, int asic, int port); | |||
279 | * in the driver structure, dev->board_ptr contains that | 279 | * in the driver structure, dev->board_ptr contains that |
280 | * address. | 280 | * address. |
281 | */ | 281 | */ |
282 | static int pcmuio_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 282 | static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
283 | { | 283 | { |
284 | struct comedi_subdevice *s; | 284 | struct comedi_subdevice *s; |
285 | int sdev_no, chans_left, n_subdevs, port, asic, thisasic_chanct = 0; | 285 | int sdev_no, chans_left, n_subdevs, port, asic, thisasic_chanct = 0; |
@@ -450,7 +450,7 @@ static int pcmuio_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
450 | * allocated by _attach(). dev->private and dev->subdevices are | 450 | * allocated by _attach(). dev->private and dev->subdevices are |
451 | * deallocated automatically by the core. | 451 | * deallocated automatically by the core. |
452 | */ | 452 | */ |
453 | static int pcmuio_detach(struct comedi_device * dev) | 453 | static int pcmuio_detach(struct comedi_device *dev) |
454 | { | 454 | { |
455 | int i; | 455 | int i; |
456 | 456 | ||
@@ -474,8 +474,8 @@ static int pcmuio_detach(struct comedi_device * dev) | |||
474 | * useful to applications if you implement the insn_bits interface. | 474 | * useful to applications if you implement the insn_bits interface. |
475 | * This allows packed reading/writing of the DIO channels. The | 475 | * This allows packed reading/writing of the DIO channels. The |
476 | * comedi core can convert between insn_bits and insn_read/write */ | 476 | * comedi core can convert between insn_bits and insn_read/write */ |
477 | static int pcmuio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 477 | static int pcmuio_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
478 | struct comedi_insn * insn, unsigned int * data) | 478 | struct comedi_insn *insn, unsigned int *data) |
479 | { | 479 | { |
480 | int byte_no; | 480 | int byte_no; |
481 | if (insn->n != 2) | 481 | if (insn->n != 2) |
@@ -548,8 +548,8 @@ static int pcmuio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdev | |||
548 | * configured by a special insn_config instruction. chanspec | 548 | * configured by a special insn_config instruction. chanspec |
549 | * contains the channel to be changed, and data[0] contains the | 549 | * contains the channel to be changed, and data[0] contains the |
550 | * value COMEDI_INPUT or COMEDI_OUTPUT. */ | 550 | * value COMEDI_INPUT or COMEDI_OUTPUT. */ |
551 | static int pcmuio_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 551 | static int pcmuio_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
552 | struct comedi_insn * insn, unsigned int * data) | 552 | struct comedi_insn *insn, unsigned int *data) |
553 | { | 553 | { |
554 | int chan = CR_CHAN(insn->chanspec), byte_no = chan / 8, bit_no = | 554 | int chan = CR_CHAN(insn->chanspec), byte_no = chan / 8, bit_no = |
555 | chan % 8; | 555 | chan % 8; |
@@ -609,7 +609,7 @@ static int pcmuio_dio_insn_config(struct comedi_device * dev, struct comedi_subd | |||
609 | return insn->n; | 609 | return insn->n; |
610 | } | 610 | } |
611 | 611 | ||
612 | static void init_asics(struct comedi_device * dev) | 612 | static void init_asics(struct comedi_device *dev) |
613 | { /* sets up an | 613 | { /* sets up an |
614 | ASIC chip to defaults */ | 614 | ASIC chip to defaults */ |
615 | int asic; | 615 | int asic; |
@@ -646,7 +646,7 @@ static void init_asics(struct comedi_device * dev) | |||
646 | } | 646 | } |
647 | } | 647 | } |
648 | 648 | ||
649 | static void switch_page(struct comedi_device * dev, int asic, int page) | 649 | static void switch_page(struct comedi_device *dev, int asic, int page) |
650 | { | 650 | { |
651 | if (asic < 0 || asic >= thisboard->num_asics) | 651 | if (asic < 0 || asic >= thisboard->num_asics) |
652 | return; /* paranoia */ | 652 | return; /* paranoia */ |
@@ -662,7 +662,7 @@ static void switch_page(struct comedi_device * dev, int asic, int page) | |||
662 | } | 662 | } |
663 | 663 | ||
664 | #ifdef notused | 664 | #ifdef notused |
665 | static void lock_port(struct comedi_device * dev, int asic, int port) | 665 | static void lock_port(struct comedi_device *dev, int asic, int port) |
666 | { | 666 | { |
667 | if (asic < 0 || asic >= thisboard->num_asics) | 667 | if (asic < 0 || asic >= thisboard->num_asics) |
668 | return; /* paranoia */ | 668 | return; /* paranoia */ |
@@ -675,7 +675,7 @@ static void lock_port(struct comedi_device * dev, int asic, int port) | |||
675 | dev->iobase + ASIC_IOSIZE * asic + REG_PAGELOCK); | 675 | dev->iobase + ASIC_IOSIZE * asic + REG_PAGELOCK); |
676 | } | 676 | } |
677 | 677 | ||
678 | static void unlock_port(struct comedi_device * dev, int asic, int port) | 678 | static void unlock_port(struct comedi_device *dev, int asic, int port) |
679 | { | 679 | { |
680 | if (asic < 0 || asic >= thisboard->num_asics) | 680 | if (asic < 0 || asic >= thisboard->num_asics) |
681 | return; /* paranoia */ | 681 | return; /* paranoia */ |
@@ -837,7 +837,7 @@ static irqreturn_t interrupt_pcmuio(int irq, void *d) | |||
837 | return IRQ_HANDLED; | 837 | return IRQ_HANDLED; |
838 | } | 838 | } |
839 | 839 | ||
840 | static void pcmuio_stop_intr(struct comedi_device * dev, struct comedi_subdevice * s) | 840 | static void pcmuio_stop_intr(struct comedi_device *dev, struct comedi_subdevice *s) |
841 | { | 841 | { |
842 | int nports, firstport, asic, port; | 842 | int nports, firstport, asic, port; |
843 | 843 | ||
@@ -856,7 +856,7 @@ static void pcmuio_stop_intr(struct comedi_device * dev, struct comedi_subdevice | |||
856 | } | 856 | } |
857 | } | 857 | } |
858 | 858 | ||
859 | static int pcmuio_start_intr(struct comedi_device * dev, struct comedi_subdevice * s) | 859 | static int pcmuio_start_intr(struct comedi_device *dev, struct comedi_subdevice *s) |
860 | { | 860 | { |
861 | if (!subpriv->intr.continuous && subpriv->intr.stop_count == 0) { | 861 | if (!subpriv->intr.continuous && subpriv->intr.stop_count == 0) { |
862 | /* An empty acquisition! */ | 862 | /* An empty acquisition! */ |
@@ -905,7 +905,7 @@ static int pcmuio_start_intr(struct comedi_device * dev, struct comedi_subdevice | |||
905 | return 0; | 905 | return 0; |
906 | } | 906 | } |
907 | 907 | ||
908 | static int pcmuio_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 908 | static int pcmuio_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
909 | { | 909 | { |
910 | unsigned long flags; | 910 | unsigned long flags; |
911 | 911 | ||
@@ -921,7 +921,7 @@ static int pcmuio_cancel(struct comedi_device * dev, struct comedi_subdevice * s | |||
921 | * Internal trigger function to start acquisition for an 'INTERRUPT' subdevice. | 921 | * Internal trigger function to start acquisition for an 'INTERRUPT' subdevice. |
922 | */ | 922 | */ |
923 | static int | 923 | static int |
924 | pcmuio_inttrig_start_intr(struct comedi_device * dev, struct comedi_subdevice * s, | 924 | pcmuio_inttrig_start_intr(struct comedi_device *dev, struct comedi_subdevice *s, |
925 | unsigned int trignum) | 925 | unsigned int trignum) |
926 | { | 926 | { |
927 | unsigned long flags; | 927 | unsigned long flags; |
@@ -947,7 +947,7 @@ pcmuio_inttrig_start_intr(struct comedi_device * dev, struct comedi_subdevice * | |||
947 | /* | 947 | /* |
948 | * 'do_cmd' function for an 'INTERRUPT' subdevice. | 948 | * 'do_cmd' function for an 'INTERRUPT' subdevice. |
949 | */ | 949 | */ |
950 | static int pcmuio_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 950 | static int pcmuio_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
951 | { | 951 | { |
952 | struct comedi_cmd *cmd = &s->async->cmd; | 952 | struct comedi_cmd *cmd = &s->async->cmd; |
953 | unsigned long flags; | 953 | unsigned long flags; |
@@ -992,7 +992,7 @@ static int pcmuio_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
992 | * 'do_cmdtest' function for an 'INTERRUPT' subdevice. | 992 | * 'do_cmdtest' function for an 'INTERRUPT' subdevice. |
993 | */ | 993 | */ |
994 | static int | 994 | static int |
995 | pcmuio_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, struct comedi_cmd * cmd) | 995 | pcmuio_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd) |
996 | { | 996 | { |
997 | int err = 0; | 997 | int err = 0; |
998 | unsigned int tmp; | 998 | unsigned int tmp; |
diff --git a/drivers/staging/comedi/drivers/poc.c b/drivers/staging/comedi/drivers/poc.c index ca439ba5c01..f8f5a7366aa 100644 --- a/drivers/staging/comedi/drivers/poc.c +++ b/drivers/staging/comedi/drivers/poc.c | |||
@@ -41,17 +41,17 @@ Configuration options: | |||
41 | 41 | ||
42 | #include <linux/ioport.h> | 42 | #include <linux/ioport.h> |
43 | 43 | ||
44 | static int poc_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 44 | static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
45 | static int poc_detach(struct comedi_device * dev); | 45 | static int poc_detach(struct comedi_device *dev); |
46 | static int readback_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 46 | static int readback_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
47 | struct comedi_insn * insn, unsigned int * data); | 47 | struct comedi_insn *insn, unsigned int *data); |
48 | 48 | ||
49 | static int dac02_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 49 | static int dac02_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
50 | struct comedi_insn * insn, unsigned int * data); | 50 | struct comedi_insn *insn, unsigned int *data); |
51 | static int pcl733_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 51 | static int pcl733_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
52 | struct comedi_insn * insn, unsigned int * data); | 52 | struct comedi_insn *insn, unsigned int *data); |
53 | static int pcl734_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 53 | static int pcl734_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
54 | struct comedi_insn * insn, unsigned int * data); | 54 | struct comedi_insn *insn, unsigned int *data); |
55 | 55 | ||
56 | struct boarddef_struct { | 56 | struct boarddef_struct { |
57 | const char *name; | 57 | const char *name; |
@@ -113,7 +113,7 @@ static struct comedi_driver driver_poc = { | |||
113 | offset:sizeof(boards[0]), | 113 | offset:sizeof(boards[0]), |
114 | }; | 114 | }; |
115 | 115 | ||
116 | static int poc_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 116 | static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
117 | { | 117 | { |
118 | struct comedi_subdevice *s; | 118 | struct comedi_subdevice *s; |
119 | unsigned long iobase; | 119 | unsigned long iobase; |
@@ -159,7 +159,7 @@ static int poc_attach(struct comedi_device * dev, struct comedi_devconfig * it) | |||
159 | return 0; | 159 | return 0; |
160 | } | 160 | } |
161 | 161 | ||
162 | static int poc_detach(struct comedi_device * dev) | 162 | static int poc_detach(struct comedi_device *dev) |
163 | { | 163 | { |
164 | /* only free stuff if it has been allocated by _attach */ | 164 | /* only free stuff if it has been allocated by _attach */ |
165 | if (dev->iobase) | 165 | if (dev->iobase) |
@@ -170,8 +170,8 @@ static int poc_detach(struct comedi_device * dev) | |||
170 | return 0; | 170 | return 0; |
171 | } | 171 | } |
172 | 172 | ||
173 | static int readback_insn(struct comedi_device * dev, struct comedi_subdevice * s, | 173 | static int readback_insn(struct comedi_device *dev, struct comedi_subdevice *s, |
174 | struct comedi_insn * insn, unsigned int * data) | 174 | struct comedi_insn *insn, unsigned int *data) |
175 | { | 175 | { |
176 | int chan; | 176 | int chan; |
177 | 177 | ||
@@ -185,8 +185,8 @@ static int readback_insn(struct comedi_device * dev, struct comedi_subdevice * s | |||
185 | #define DAC02_LSB(a) (2 * a) | 185 | #define DAC02_LSB(a) (2 * a) |
186 | #define DAC02_MSB(a) (2 * a + 1) | 186 | #define DAC02_MSB(a) (2 * a + 1) |
187 | 187 | ||
188 | static int dac02_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 188 | static int dac02_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
189 | struct comedi_insn * insn, unsigned int * data) | 189 | struct comedi_insn *insn, unsigned int *data) |
190 | { | 190 | { |
191 | int temp; | 191 | int temp; |
192 | int chan; | 192 | int chan; |
@@ -208,8 +208,8 @@ static int dac02_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * | |||
208 | return 1; | 208 | return 1; |
209 | } | 209 | } |
210 | 210 | ||
211 | static int pcl733_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 211 | static int pcl733_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
212 | struct comedi_insn * insn, unsigned int * data) | 212 | struct comedi_insn *insn, unsigned int *data) |
213 | { | 213 | { |
214 | if (insn->n != 2) | 214 | if (insn->n != 2) |
215 | return -EINVAL; | 215 | return -EINVAL; |
@@ -222,8 +222,8 @@ static int pcl733_insn_bits(struct comedi_device * dev, struct comedi_subdevice | |||
222 | return 2; | 222 | return 2; |
223 | } | 223 | } |
224 | 224 | ||
225 | static int pcl734_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 225 | static int pcl734_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
226 | struct comedi_insn * insn, unsigned int * data) | 226 | struct comedi_insn *insn, unsigned int *data) |
227 | { | 227 | { |
228 | if (insn->n != 2) | 228 | if (insn->n != 2) |
229 | return -EINVAL; | 229 | return -EINVAL; |
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index d05f33bac4a..0066218dba4 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c | |||
@@ -197,8 +197,8 @@ static const struct comedi_lrange range_daqp_ao = { 1, {BIP_RANGE(5)} }; | |||
197 | 197 | ||
198 | /* comedi interface code */ | 198 | /* comedi interface code */ |
199 | 199 | ||
200 | static int daqp_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 200 | static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
201 | static int daqp_detach(struct comedi_device * dev); | 201 | static int daqp_detach(struct comedi_device *dev); |
202 | static struct comedi_driver driver_daqp = { | 202 | static struct comedi_driver driver_daqp = { |
203 | driver_name:"quatech_daqp_cs", | 203 | driver_name:"quatech_daqp_cs", |
204 | module:THIS_MODULE, | 204 | module:THIS_MODULE, |
@@ -208,7 +208,7 @@ static struct comedi_driver driver_daqp = { | |||
208 | 208 | ||
209 | #ifdef DAQP_DEBUG | 209 | #ifdef DAQP_DEBUG |
210 | 210 | ||
211 | static void daqp_dump(struct comedi_device * dev) | 211 | static void daqp_dump(struct comedi_device *dev) |
212 | { | 212 | { |
213 | printk("DAQP: status %02x; aux status %02x\n", | 213 | printk("DAQP: status %02x; aux status %02x\n", |
214 | inb(dev->iobase + DAQP_STATUS), inb(dev->iobase + DAQP_AUX)); | 214 | inb(dev->iobase + DAQP_STATUS), inb(dev->iobase + DAQP_AUX)); |
@@ -234,7 +234,7 @@ static void hex_dump(char *str, void *ptr, int len) | |||
234 | 234 | ||
235 | /* Cancel a running acquisition */ | 235 | /* Cancel a running acquisition */ |
236 | 236 | ||
237 | static int daqp_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s) | 237 | static int daqp_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s) |
238 | { | 238 | { |
239 | struct local_info_t *local = (struct local_info_t *) s->private; | 239 | struct local_info_t *local = (struct local_info_t *) s->private; |
240 | 240 | ||
@@ -361,8 +361,8 @@ static void daqp_interrupt(int irq, void *dev_id) | |||
361 | 361 | ||
362 | /* One-shot analog data acquisition routine */ | 362 | /* One-shot analog data acquisition routine */ |
363 | 363 | ||
364 | static int daqp_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 364 | static int daqp_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
365 | struct comedi_insn * insn, unsigned int * data) | 365 | struct comedi_insn *insn, unsigned int *data) |
366 | { | 366 | { |
367 | struct local_info_t *local = (struct local_info_t *) s->private; | 367 | struct local_info_t *local = (struct local_info_t *) s->private; |
368 | int i; | 368 | int i; |
@@ -467,8 +467,8 @@ static int daqp_ns_to_timer(unsigned int *ns, int round) | |||
467 | * the command passes. | 467 | * the command passes. |
468 | */ | 468 | */ |
469 | 469 | ||
470 | static int daqp_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 470 | static int daqp_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
471 | struct comedi_cmd * cmd) | 471 | struct comedi_cmd *cmd) |
472 | { | 472 | { |
473 | int err = 0; | 473 | int err = 0; |
474 | int tmp; | 474 | int tmp; |
@@ -593,7 +593,7 @@ static int daqp_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * | |||
593 | return 0; | 593 | return 0; |
594 | } | 594 | } |
595 | 595 | ||
596 | static int daqp_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | 596 | static int daqp_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) |
597 | { | 597 | { |
598 | struct local_info_t *local = (struct local_info_t *) s->private; | 598 | struct local_info_t *local = (struct local_info_t *) s->private; |
599 | struct comedi_cmd *cmd = &s->async->cmd; | 599 | struct comedi_cmd *cmd = &s->async->cmd; |
@@ -793,8 +793,8 @@ static int daqp_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) | |||
793 | 793 | ||
794 | /* Single-shot analog output routine */ | 794 | /* Single-shot analog output routine */ |
795 | 795 | ||
796 | static int daqp_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 796 | static int daqp_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
797 | struct comedi_insn * insn, unsigned int * data) | 797 | struct comedi_insn *insn, unsigned int *data) |
798 | { | 798 | { |
799 | struct local_info_t *local = (struct local_info_t *) s->private; | 799 | struct local_info_t *local = (struct local_info_t *) s->private; |
800 | int d; | 800 | int d; |
@@ -820,8 +820,8 @@ static int daqp_ao_insn_write(struct comedi_device * dev, struct comedi_subdevic | |||
820 | 820 | ||
821 | /* Digital input routine */ | 821 | /* Digital input routine */ |
822 | 822 | ||
823 | static int daqp_di_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 823 | static int daqp_di_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
824 | struct comedi_insn * insn, unsigned int * data) | 824 | struct comedi_insn *insn, unsigned int *data) |
825 | { | 825 | { |
826 | struct local_info_t *local = (struct local_info_t *) s->private; | 826 | struct local_info_t *local = (struct local_info_t *) s->private; |
827 | 827 | ||
@@ -836,8 +836,8 @@ static int daqp_di_insn_read(struct comedi_device * dev, struct comedi_subdevice | |||
836 | 836 | ||
837 | /* Digital output routine */ | 837 | /* Digital output routine */ |
838 | 838 | ||
839 | static int daqp_do_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 839 | static int daqp_do_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
840 | struct comedi_insn * insn, unsigned int * data) | 840 | struct comedi_insn *insn, unsigned int *data) |
841 | { | 841 | { |
842 | struct local_info_t *local = (struct local_info_t *) s->private; | 842 | struct local_info_t *local = (struct local_info_t *) s->private; |
843 | 843 | ||
@@ -856,7 +856,7 @@ static int daqp_do_insn_write(struct comedi_device * dev, struct comedi_subdevic | |||
856 | * when it is inserted. | 856 | * when it is inserted. |
857 | */ | 857 | */ |
858 | 858 | ||
859 | static int daqp_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 859 | static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
860 | { | 860 | { |
861 | int ret; | 861 | int ret; |
862 | struct local_info_t *local = dev_table[it->options[0]]; | 862 | struct local_info_t *local = dev_table[it->options[0]]; |
@@ -962,7 +962,7 @@ static int daqp_attach(struct comedi_device * dev, struct comedi_devconfig * it) | |||
962 | * card is removed, daqp_cs_detach() is called by the pcmcia subsystem. | 962 | * card is removed, daqp_cs_detach() is called by the pcmcia subsystem. |
963 | */ | 963 | */ |
964 | 964 | ||
965 | static int daqp_detach(struct comedi_device * dev) | 965 | static int daqp_detach(struct comedi_device *dev) |
966 | { | 966 | { |
967 | printk("comedi%d: detaching daqp\n", dev->minor); | 967 | printk("comedi%d: detaching daqp\n", dev->minor); |
968 | 968 | ||
diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c index 14bb8d19353..93ef401f409 100644 --- a/drivers/staging/comedi/drivers/rti800.c +++ b/drivers/staging/comedi/drivers/rti800.c | |||
@@ -131,8 +131,8 @@ static const struct rti800_board boardtypes[] = { | |||
131 | 131 | ||
132 | #define this_board ((const struct rti800_board *)dev->board_ptr) | 132 | #define this_board ((const struct rti800_board *)dev->board_ptr) |
133 | 133 | ||
134 | static int rti800_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 134 | static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
135 | static int rti800_detach(struct comedi_device * dev); | 135 | static int rti800_detach(struct comedi_device *dev); |
136 | static struct comedi_driver driver_rti800 = { | 136 | static struct comedi_driver driver_rti800 = { |
137 | driver_name:"rti800", | 137 | driver_name:"rti800", |
138 | module:THIS_MODULE, | 138 | module:THIS_MODULE, |
@@ -180,8 +180,8 @@ static irqreturn_t rti800_interrupt(int irq, void *dev) | |||
180 | /* settling delay times in usec for different gains */ | 180 | /* settling delay times in usec for different gains */ |
181 | static const int gaindelay[] = { 10, 20, 40, 80 }; | 181 | static const int gaindelay[] = { 10, 20, 40, 80 }; |
182 | 182 | ||
183 | static int rti800_ai_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 183 | static int rti800_ai_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
184 | struct comedi_insn * insn, unsigned int * data) | 184 | struct comedi_insn *insn, unsigned int *data) |
185 | { | 185 | { |
186 | int i, t; | 186 | int i, t; |
187 | int status; | 187 | int status; |
@@ -233,8 +233,8 @@ static int rti800_ai_insn_read(struct comedi_device * dev, struct comedi_subdevi | |||
233 | return i; | 233 | return i; |
234 | } | 234 | } |
235 | 235 | ||
236 | static int rti800_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 236 | static int rti800_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
237 | struct comedi_insn * insn, unsigned int * data) | 237 | struct comedi_insn *insn, unsigned int *data) |
238 | { | 238 | { |
239 | int i; | 239 | int i; |
240 | int chan = CR_CHAN(insn->chanspec); | 240 | int chan = CR_CHAN(insn->chanspec); |
@@ -245,8 +245,8 @@ static int rti800_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi | |||
245 | return i; | 245 | return i; |
246 | } | 246 | } |
247 | 247 | ||
248 | static int rti800_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 248 | static int rti800_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
249 | struct comedi_insn * insn, unsigned int * data) | 249 | struct comedi_insn *insn, unsigned int *data) |
250 | { | 250 | { |
251 | int chan = CR_CHAN(insn->chanspec); | 251 | int chan = CR_CHAN(insn->chanspec); |
252 | int d; | 252 | int d; |
@@ -265,8 +265,8 @@ static int rti800_ao_insn_write(struct comedi_device * dev, struct comedi_subdev | |||
265 | return i; | 265 | return i; |
266 | } | 266 | } |
267 | 267 | ||
268 | static int rti800_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 268 | static int rti800_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
269 | struct comedi_insn * insn, unsigned int * data) | 269 | struct comedi_insn *insn, unsigned int *data) |
270 | { | 270 | { |
271 | if (insn->n != 2) | 271 | if (insn->n != 2) |
272 | return -EINVAL; | 272 | return -EINVAL; |
@@ -274,8 +274,8 @@ static int rti800_di_insn_bits(struct comedi_device * dev, struct comedi_subdevi | |||
274 | return 2; | 274 | return 2; |
275 | } | 275 | } |
276 | 276 | ||
277 | static int rti800_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 277 | static int rti800_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
278 | struct comedi_insn * insn, unsigned int * data) | 278 | struct comedi_insn *insn, unsigned int *data) |
279 | { | 279 | { |
280 | if (insn->n != 2) | 280 | if (insn->n != 2) |
281 | return -EINVAL; | 281 | return -EINVAL; |
@@ -309,7 +309,7 @@ static int rti800_do_insn_bits(struct comedi_device * dev, struct comedi_subdevi | |||
309 | options[8] - dac1 coding | 309 | options[8] - dac1 coding |
310 | */ | 310 | */ |
311 | 311 | ||
312 | static int rti800_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 312 | static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
313 | { | 313 | { |
314 | unsigned int irq; | 314 | unsigned int irq; |
315 | unsigned long iobase; | 315 | unsigned long iobase; |
@@ -444,7 +444,7 @@ static int rti800_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
444 | return 0; | 444 | return 0; |
445 | } | 445 | } |
446 | 446 | ||
447 | static int rti800_detach(struct comedi_device * dev) | 447 | static int rti800_detach(struct comedi_device *dev) |
448 | { | 448 | { |
449 | printk("comedi%d: rti800: remove\n", dev->minor); | 449 | printk("comedi%d: rti800: remove\n", dev->minor); |
450 | 450 | ||
diff --git a/drivers/staging/comedi/drivers/rti802.c b/drivers/staging/comedi/drivers/rti802.c index cc2c385db0b..ec64c9ee0a5 100644 --- a/drivers/staging/comedi/drivers/rti802.c +++ b/drivers/staging/comedi/drivers/rti802.c | |||
@@ -47,8 +47,8 @@ Configuration Options: | |||
47 | #define RTI802_DATALOW 1 | 47 | #define RTI802_DATALOW 1 |
48 | #define RTI802_DATAHIGH 2 | 48 | #define RTI802_DATAHIGH 2 |
49 | 49 | ||
50 | static int rti802_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 50 | static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
51 | static int rti802_detach(struct comedi_device * dev); | 51 | static int rti802_detach(struct comedi_device *dev); |
52 | static struct comedi_driver driver_rti802 = { | 52 | static struct comedi_driver driver_rti802 = { |
53 | driver_name:"rti802", | 53 | driver_name:"rti802", |
54 | module:THIS_MODULE, | 54 | module:THIS_MODULE, |
@@ -68,8 +68,8 @@ struct rti802_private { | |||
68 | 68 | ||
69 | #define devpriv ((struct rti802_private *)dev->private) | 69 | #define devpriv ((struct rti802_private *)dev->private) |
70 | 70 | ||
71 | static int rti802_ao_insn_read(struct comedi_device * dev, struct comedi_subdevice * s, | 71 | static int rti802_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, |
72 | struct comedi_insn * insn, unsigned int * data) | 72 | struct comedi_insn *insn, unsigned int *data) |
73 | { | 73 | { |
74 | int i; | 74 | int i; |
75 | 75 | ||
@@ -79,8 +79,8 @@ static int rti802_ao_insn_read(struct comedi_device * dev, struct comedi_subdevi | |||
79 | return i; | 79 | return i; |
80 | } | 80 | } |
81 | 81 | ||
82 | static int rti802_ao_insn_write(struct comedi_device * dev, struct comedi_subdevice * s, | 82 | static int rti802_ao_insn_write(struct comedi_device *dev, struct comedi_subdevice *s, |
83 | struct comedi_insn * insn, unsigned int * data) | 83 | struct comedi_insn *insn, unsigned int *data) |
84 | { | 84 | { |
85 | int i, d; | 85 | int i, d; |
86 | int chan = CR_CHAN(insn->chanspec); | 86 | int chan = CR_CHAN(insn->chanspec); |
@@ -96,7 +96,7 @@ static int rti802_ao_insn_write(struct comedi_device * dev, struct comedi_subdev | |||
96 | return i; | 96 | return i; |
97 | } | 97 | } |
98 | 98 | ||
99 | static int rti802_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 99 | static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
100 | { | 100 | { |
101 | struct comedi_subdevice *s; | 101 | struct comedi_subdevice *s; |
102 | int i; | 102 | int i; |
@@ -140,7 +140,7 @@ static int rti802_attach(struct comedi_device * dev, struct comedi_devconfig * i | |||
140 | return 0; | 140 | return 0; |
141 | } | 141 | } |
142 | 142 | ||
143 | static int rti802_detach(struct comedi_device * dev) | 143 | static int rti802_detach(struct comedi_device *dev) |
144 | { | 144 | { |
145 | printk("comedi%d: rti802: remove\n", dev->minor); | 145 | printk("comedi%d: rti802: remove\n", dev->minor); |
146 | 146 | ||
diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c index e419a7c6943..54c24a266fb 100644 --- a/drivers/staging/comedi/drivers/s526.c +++ b/drivers/staging/comedi/drivers/s526.c | |||
@@ -217,8 +217,8 @@ struct s526_private { | |||
217 | * the board, and also about the kernel module that contains | 217 | * the board, and also about the kernel module that contains |
218 | * the device code. | 218 | * the device code. |
219 | */ | 219 | */ |
220 | static int s526_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 220 | static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
221 | static int s526_detach(struct comedi_device * dev); | 221 | static int s526_detach(struct comedi_device *dev); |
222 | static struct comedi_driver driver_s526 = { | 222 | static struct comedi_driver driver_s526 = { |
223 | driver_name:"s526", | 223 | driver_name:"s526", |
224 | module:THIS_MODULE, | 224 | module:THIS_MODULE, |
@@ -247,24 +247,24 @@ static struct comedi_driver driver_s526 = { | |||
247 | num_names:sizeof(s526_boards) / sizeof(struct s526_board), | 247 | num_names:sizeof(s526_boards) / sizeof(struct s526_board), |
248 | }; | 248 | }; |
249 | 249 | ||
250 | static int s526_gpct_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 250 | static int s526_gpct_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
251 | struct comedi_insn * insn, unsigned int * data); | 251 | struct comedi_insn *insn, unsigned int *data); |
252 | static int s526_gpct_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 252 | static int s526_gpct_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
253 | struct comedi_insn * insn, unsigned int * data); | 253 | struct comedi_insn *insn, unsigned int *data); |
254 | static int s526_gpct_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 254 | static int s526_gpct_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
255 | struct comedi_insn * insn, unsigned int * data); | 255 | struct comedi_insn *insn, unsigned int *data); |
256 | static int s526_ai_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 256 | static int s526_ai_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
257 | struct comedi_insn * insn, unsigned int * data); | 257 | struct comedi_insn *insn, unsigned int *data); |
258 | static int s526_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 258 | static int s526_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
259 | struct comedi_insn * insn, unsigned int * data); | 259 | struct comedi_insn *insn, unsigned int *data); |
260 | static int s526_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 260 | static int s526_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
261 | struct comedi_insn * insn, unsigned int * data); | 261 | struct comedi_insn *insn, unsigned int *data); |
262 | static int s526_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 262 | static int s526_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
263 | struct comedi_insn * insn, unsigned int * data); | 263 | struct comedi_insn *insn, unsigned int *data); |
264 | static int s526_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 264 | static int s526_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
265 | struct comedi_insn * insn, unsigned int * data); | 265 | struct comedi_insn *insn, unsigned int *data); |
266 | static int s526_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 266 | static int s526_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
267 | struct comedi_insn * insn, unsigned int * data); | 267 | struct comedi_insn *insn, unsigned int *data); |
268 | 268 | ||
269 | /* | 269 | /* |
270 | * Attach is called by the Comedi core to configure the driver | 270 | * Attach is called by the Comedi core to configure the driver |
@@ -272,7 +272,7 @@ static int s526_dio_insn_config(struct comedi_device * dev, struct comedi_subdev | |||
272 | * in the driver structure, dev->board_ptr contains that | 272 | * in the driver structure, dev->board_ptr contains that |
273 | * address. | 273 | * address. |
274 | */ | 274 | */ |
275 | static int s526_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 275 | static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
276 | { | 276 | { |
277 | struct comedi_subdevice *s; | 277 | struct comedi_subdevice *s; |
278 | int iobase; | 278 | int iobase; |
@@ -468,7 +468,7 @@ static int s526_attach(struct comedi_device * dev, struct comedi_devconfig * it) | |||
468 | * allocated by _attach(). dev->private and dev->subdevices are | 468 | * allocated by _attach(). dev->private and dev->subdevices are |
469 | * deallocated automatically by the core. | 469 | * deallocated automatically by the core. |
470 | */ | 470 | */ |
471 | static int s526_detach(struct comedi_device * dev) | 471 | static int s526_detach(struct comedi_device *dev) |
472 | { | 472 | { |
473 | printk("comedi%d: s526: remove\n", dev->minor); | 473 | printk("comedi%d: s526: remove\n", dev->minor); |
474 | 474 | ||
@@ -478,8 +478,8 @@ static int s526_detach(struct comedi_device * dev) | |||
478 | return 0; | 478 | return 0; |
479 | } | 479 | } |
480 | 480 | ||
481 | static int s526_gpct_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 481 | static int s526_gpct_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
482 | struct comedi_insn * insn, unsigned int * data) | 482 | struct comedi_insn *insn, unsigned int *data) |
483 | { | 483 | { |
484 | int i; /* counts the Data */ | 484 | int i; /* counts the Data */ |
485 | int counter_channel = CR_CHAN(insn->chanspec); | 485 | int counter_channel = CR_CHAN(insn->chanspec); |
@@ -502,8 +502,8 @@ static int s526_gpct_rinsn(struct comedi_device * dev, struct comedi_subdevice * | |||
502 | return i; | 502 | return i; |
503 | } | 503 | } |
504 | 504 | ||
505 | static int s526_gpct_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 505 | static int s526_gpct_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
506 | struct comedi_insn * insn, unsigned int * data) | 506 | struct comedi_insn *insn, unsigned int *data) |
507 | { | 507 | { |
508 | int subdev_channel = CR_CHAN(insn->chanspec); /* Unpack chanspec */ | 508 | int subdev_channel = CR_CHAN(insn->chanspec); /* Unpack chanspec */ |
509 | int i; | 509 | int i; |
@@ -727,8 +727,8 @@ static int s526_gpct_insn_config(struct comedi_device * dev, struct comedi_subde | |||
727 | return insn->n; | 727 | return insn->n; |
728 | } | 728 | } |
729 | 729 | ||
730 | static int s526_gpct_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 730 | static int s526_gpct_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
731 | struct comedi_insn * insn, unsigned int * data) | 731 | struct comedi_insn *insn, unsigned int *data) |
732 | { | 732 | { |
733 | int subdev_channel = CR_CHAN(insn->chanspec); /* Unpack chanspec */ | 733 | int subdev_channel = CR_CHAN(insn->chanspec); /* Unpack chanspec */ |
734 | short value; | 734 | short value; |
@@ -786,8 +786,8 @@ static int s526_gpct_winsn(struct comedi_device * dev, struct comedi_subdevice * | |||
786 | } | 786 | } |
787 | 787 | ||
788 | #define ISR_ADC_DONE 0x4 | 788 | #define ISR_ADC_DONE 0x4 |
789 | static int s526_ai_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 789 | static int s526_ai_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
790 | struct comedi_insn * insn, unsigned int * data) | 790 | struct comedi_insn *insn, unsigned int *data) |
791 | { | 791 | { |
792 | int result = -EINVAL; | 792 | int result = -EINVAL; |
793 | 793 | ||
@@ -819,8 +819,8 @@ static int s526_ai_insn_config(struct comedi_device * dev, struct comedi_subdevi | |||
819 | * "instructions" read/write data in "one-shot" or "software-triggered" | 819 | * "instructions" read/write data in "one-shot" or "software-triggered" |
820 | * mode. | 820 | * mode. |
821 | */ | 821 | */ |
822 | static int s526_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 822 | static int s526_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
823 | struct comedi_insn * insn, unsigned int * data) | 823 | struct comedi_insn *insn, unsigned int *data) |
824 | { | 824 | { |
825 | int n, i; | 825 | int n, i; |
826 | int chan = CR_CHAN(insn->chanspec); | 826 | int chan = CR_CHAN(insn->chanspec); |
@@ -869,8 +869,8 @@ static int s526_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s | |||
869 | return n; | 869 | return n; |
870 | } | 870 | } |
871 | 871 | ||
872 | static int s526_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 872 | static int s526_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
873 | struct comedi_insn * insn, unsigned int * data) | 873 | struct comedi_insn *insn, unsigned int *data) |
874 | { | 874 | { |
875 | int i; | 875 | int i; |
876 | int chan = CR_CHAN(insn->chanspec); | 876 | int chan = CR_CHAN(insn->chanspec); |
@@ -898,8 +898,8 @@ static int s526_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s | |||
898 | 898 | ||
899 | /* AO subdevices should have a read insn as well as a write insn. | 899 | /* AO subdevices should have a read insn as well as a write insn. |
900 | * Usually this means copying a value stored in devpriv. */ | 900 | * Usually this means copying a value stored in devpriv. */ |
901 | static int s526_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 901 | static int s526_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
902 | struct comedi_insn * insn, unsigned int * data) | 902 | struct comedi_insn *insn, unsigned int *data) |
903 | { | 903 | { |
904 | int i; | 904 | int i; |
905 | int chan = CR_CHAN(insn->chanspec); | 905 | int chan = CR_CHAN(insn->chanspec); |
@@ -915,8 +915,8 @@ static int s526_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s | |||
915 | * useful to applications if you implement the insn_bits interface. | 915 | * useful to applications if you implement the insn_bits interface. |
916 | * This allows packed reading/writing of the DIO channels. The | 916 | * This allows packed reading/writing of the DIO channels. The |
917 | * comedi core can convert between insn_bits and insn_read/write */ | 917 | * comedi core can convert between insn_bits and insn_read/write */ |
918 | static int s526_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 918 | static int s526_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
919 | struct comedi_insn * insn, unsigned int * data) | 919 | struct comedi_insn *insn, unsigned int *data) |
920 | { | 920 | { |
921 | if (insn->n != 2) | 921 | if (insn->n != 2) |
922 | return -EINVAL; | 922 | return -EINVAL; |
@@ -940,8 +940,8 @@ static int s526_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevic | |||
940 | return 2; | 940 | return 2; |
941 | } | 941 | } |
942 | 942 | ||
943 | static int s526_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 943 | static int s526_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
944 | struct comedi_insn * insn, unsigned int * data) | 944 | struct comedi_insn *insn, unsigned int *data) |
945 | { | 945 | { |
946 | int chan = CR_CHAN(insn->chanspec); | 946 | int chan = CR_CHAN(insn->chanspec); |
947 | short value; | 947 | short value; |
diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c index 602fa85dc70..23b83500fc7 100644 --- a/drivers/staging/comedi/drivers/serial2002.c +++ b/drivers/staging/comedi/drivers/serial2002.c | |||
@@ -89,8 +89,8 @@ struct serial2002_private { | |||
89 | */ | 89 | */ |
90 | #define devpriv ((struct serial2002_private *)dev->private) | 90 | #define devpriv ((struct serial2002_private *)dev->private) |
91 | 91 | ||
92 | static int serial2002_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 92 | static int serial2002_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
93 | static int serial2002_detach(struct comedi_device * dev); | 93 | static int serial2002_detach(struct comedi_device *dev); |
94 | struct comedi_driver driver_serial2002 = { | 94 | struct comedi_driver driver_serial2002 = { |
95 | driver_name:"serial2002", | 95 | driver_name:"serial2002", |
96 | module:THIS_MODULE, | 96 | module:THIS_MODULE, |
@@ -101,16 +101,16 @@ struct comedi_driver driver_serial2002 = { | |||
101 | num_names:sizeof(serial2002_boards) / sizeof(struct serial2002_board), | 101 | num_names:sizeof(serial2002_boards) / sizeof(struct serial2002_board), |
102 | }; | 102 | }; |
103 | 103 | ||
104 | static int serial2002_di_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 104 | static int serial2002_di_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
105 | struct comedi_insn * insn, unsigned int * data); | 105 | struct comedi_insn *insn, unsigned int *data); |
106 | static int serial2002_do_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 106 | static int serial2002_do_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
107 | struct comedi_insn * insn, unsigned int * data); | 107 | struct comedi_insn *insn, unsigned int *data); |
108 | static int serial2002_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 108 | static int serial2002_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
109 | struct comedi_insn * insn, unsigned int * data); | 109 | struct comedi_insn *insn, unsigned int *data); |
110 | static int serial2002_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 110 | static int serial2002_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
111 | struct comedi_insn * insn, unsigned int * data); | 111 | struct comedi_insn *insn, unsigned int *data); |
112 | static int serial2002_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 112 | static int serial2002_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
113 | struct comedi_insn * insn, unsigned int * data); | 113 | struct comedi_insn *insn, unsigned int *data); |
114 | 114 | ||
115 | struct serial_data { | 115 | struct serial_data { |
116 | enum { is_invalid, is_digital, is_channel } kind; | 116 | enum { is_invalid, is_digital, is_channel } kind; |
@@ -393,7 +393,7 @@ static void serial_write(struct file *f, struct serial_data data) | |||
393 | } | 393 | } |
394 | } | 394 | } |
395 | 395 | ||
396 | static void serial_2002_open(struct comedi_device * dev) | 396 | static void serial_2002_open(struct comedi_device *dev) |
397 | { | 397 | { |
398 | char port[20]; | 398 | char port[20]; |
399 | 399 | ||
@@ -659,15 +659,15 @@ static void serial_2002_open(struct comedi_device * dev) | |||
659 | } | 659 | } |
660 | } | 660 | } |
661 | 661 | ||
662 | static void serial_2002_close(struct comedi_device * dev) | 662 | static void serial_2002_close(struct comedi_device *dev) |
663 | { | 663 | { |
664 | if (!IS_ERR(devpriv->tty) && (devpriv->tty != 0)) { | 664 | if (!IS_ERR(devpriv->tty) && (devpriv->tty != 0)) { |
665 | filp_close(devpriv->tty, 0); | 665 | filp_close(devpriv->tty, 0); |
666 | } | 666 | } |
667 | } | 667 | } |
668 | 668 | ||
669 | static int serial2002_di_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 669 | static int serial2002_di_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
670 | struct comedi_insn * insn, unsigned int * data) | 670 | struct comedi_insn *insn, unsigned int *data) |
671 | { | 671 | { |
672 | int n; | 672 | int n; |
673 | int chan; | 673 | int chan; |
@@ -688,8 +688,8 @@ static int serial2002_di_rinsn(struct comedi_device * dev, struct comedi_subdevi | |||
688 | return n; | 688 | return n; |
689 | } | 689 | } |
690 | 690 | ||
691 | static int serial2002_do_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 691 | static int serial2002_do_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
692 | struct comedi_insn * insn, unsigned int * data) | 692 | struct comedi_insn *insn, unsigned int *data) |
693 | { | 693 | { |
694 | int n; | 694 | int n; |
695 | int chan; | 695 | int chan; |
@@ -706,8 +706,8 @@ static int serial2002_do_winsn(struct comedi_device * dev, struct comedi_subdevi | |||
706 | return n; | 706 | return n; |
707 | } | 707 | } |
708 | 708 | ||
709 | static int serial2002_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 709 | static int serial2002_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
710 | struct comedi_insn * insn, unsigned int * data) | 710 | struct comedi_insn *insn, unsigned int *data) |
711 | { | 711 | { |
712 | int n; | 712 | int n; |
713 | int chan; | 713 | int chan; |
@@ -728,8 +728,8 @@ static int serial2002_ai_rinsn(struct comedi_device * dev, struct comedi_subdevi | |||
728 | return n; | 728 | return n; |
729 | } | 729 | } |
730 | 730 | ||
731 | static int serial2002_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 731 | static int serial2002_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
732 | struct comedi_insn * insn, unsigned int * data) | 732 | struct comedi_insn *insn, unsigned int *data) |
733 | { | 733 | { |
734 | int n; | 734 | int n; |
735 | int chan; | 735 | int chan; |
@@ -747,8 +747,8 @@ static int serial2002_ao_winsn(struct comedi_device * dev, struct comedi_subdevi | |||
747 | return n; | 747 | return n; |
748 | } | 748 | } |
749 | 749 | ||
750 | static int serial2002_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 750 | static int serial2002_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
751 | struct comedi_insn * insn, unsigned int * data) | 751 | struct comedi_insn *insn, unsigned int *data) |
752 | { | 752 | { |
753 | int n; | 753 | int n; |
754 | int chan = CR_CHAN(insn->chanspec); | 754 | int chan = CR_CHAN(insn->chanspec); |
@@ -760,8 +760,8 @@ static int serial2002_ao_rinsn(struct comedi_device * dev, struct comedi_subdevi | |||
760 | return n; | 760 | return n; |
761 | } | 761 | } |
762 | 762 | ||
763 | static int serial2002_ei_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 763 | static int serial2002_ei_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
764 | struct comedi_insn * insn, unsigned int * data) | 764 | struct comedi_insn *insn, unsigned int *data) |
765 | { | 765 | { |
766 | int n; | 766 | int n; |
767 | int chan; | 767 | int chan; |
@@ -782,7 +782,7 @@ static int serial2002_ei_rinsn(struct comedi_device * dev, struct comedi_subdevi | |||
782 | return n; | 782 | return n; |
783 | } | 783 | } |
784 | 784 | ||
785 | static int serial2002_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 785 | static int serial2002_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
786 | { | 786 | { |
787 | struct comedi_subdevice *s; | 787 | struct comedi_subdevice *s; |
788 | 788 | ||
@@ -849,7 +849,7 @@ static int serial2002_attach(struct comedi_device * dev, struct comedi_devconfig | |||
849 | return 1; | 849 | return 1; |
850 | } | 850 | } |
851 | 851 | ||
852 | static int serial2002_detach(struct comedi_device * dev) | 852 | static int serial2002_detach(struct comedi_device *dev) |
853 | { | 853 | { |
854 | struct comedi_subdevice *s; | 854 | struct comedi_subdevice *s; |
855 | int i; | 855 | int i; |
diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c index c7700d134cc..fe49310941d 100644 --- a/drivers/staging/comedi/drivers/skel.c +++ b/drivers/staging/comedi/drivers/skel.c | |||
@@ -154,8 +154,8 @@ struct skel_private { | |||
154 | * the board, and also about the kernel module that contains | 154 | * the board, and also about the kernel module that contains |
155 | * the device code. | 155 | * the device code. |
156 | */ | 156 | */ |
157 | static int skel_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 157 | static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
158 | static int skel_detach(struct comedi_device * dev); | 158 | static int skel_detach(struct comedi_device *dev); |
159 | static struct comedi_driver driver_skel = { | 159 | static struct comedi_driver driver_skel = { |
160 | driver_name:"dummy", | 160 | driver_name:"dummy", |
161 | module:THIS_MODULE, | 161 | module:THIS_MODULE, |
@@ -184,18 +184,18 @@ static struct comedi_driver driver_skel = { | |||
184 | num_names:sizeof(skel_boards) / sizeof(struct skel_board), | 184 | num_names:sizeof(skel_boards) / sizeof(struct skel_board), |
185 | }; | 185 | }; |
186 | 186 | ||
187 | static int skel_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 187 | static int skel_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
188 | struct comedi_insn * insn, unsigned int * data); | 188 | struct comedi_insn *insn, unsigned int *data); |
189 | static int skel_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 189 | static int skel_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
190 | struct comedi_insn * insn, unsigned int * data); | 190 | struct comedi_insn *insn, unsigned int *data); |
191 | static int skel_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 191 | static int skel_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
192 | struct comedi_insn * insn, unsigned int * data); | 192 | struct comedi_insn *insn, unsigned int *data); |
193 | static int skel_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 193 | static int skel_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
194 | struct comedi_insn * insn, unsigned int * data); | 194 | struct comedi_insn *insn, unsigned int *data); |
195 | static int skel_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 195 | static int skel_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
196 | struct comedi_insn * insn, unsigned int * data); | 196 | struct comedi_insn *insn, unsigned int *data); |
197 | static int skel_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 197 | static int skel_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
198 | struct comedi_cmd * cmd); | 198 | struct comedi_cmd *cmd); |
199 | static int skel_ns_to_timer(unsigned int *ns, int round); | 199 | static int skel_ns_to_timer(unsigned int *ns, int round); |
200 | 200 | ||
201 | /* | 201 | /* |
@@ -204,7 +204,7 @@ static int skel_ns_to_timer(unsigned int *ns, int round); | |||
204 | * in the driver structure, dev->board_ptr contains that | 204 | * in the driver structure, dev->board_ptr contains that |
205 | * address. | 205 | * address. |
206 | */ | 206 | */ |
207 | static int skel_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 207 | static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
208 | { | 208 | { |
209 | struct comedi_subdevice *s; | 209 | struct comedi_subdevice *s; |
210 | 210 | ||
@@ -292,7 +292,7 @@ static int skel_attach(struct comedi_device * dev, struct comedi_devconfig * it) | |||
292 | * allocated by _attach(). dev->private and dev->subdevices are | 292 | * allocated by _attach(). dev->private and dev->subdevices are |
293 | * deallocated automatically by the core. | 293 | * deallocated automatically by the core. |
294 | */ | 294 | */ |
295 | static int skel_detach(struct comedi_device * dev) | 295 | static int skel_detach(struct comedi_device *dev) |
296 | { | 296 | { |
297 | printk("comedi%d: skel: remove\n", dev->minor); | 297 | printk("comedi%d: skel: remove\n", dev->minor); |
298 | 298 | ||
@@ -303,8 +303,8 @@ static int skel_detach(struct comedi_device * dev) | |||
303 | * "instructions" read/write data in "one-shot" or "software-triggered" | 303 | * "instructions" read/write data in "one-shot" or "software-triggered" |
304 | * mode. | 304 | * mode. |
305 | */ | 305 | */ |
306 | static int skel_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 306 | static int skel_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
307 | struct comedi_insn * insn, unsigned int * data) | 307 | struct comedi_insn *insn, unsigned int *data) |
308 | { | 308 | { |
309 | int n, i; | 309 | int n, i; |
310 | unsigned int d; | 310 | unsigned int d; |
@@ -351,8 +351,8 @@ static int skel_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s | |||
351 | return n; | 351 | return n; |
352 | } | 352 | } |
353 | 353 | ||
354 | static int skel_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, | 354 | static int skel_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, |
355 | struct comedi_cmd * cmd) | 355 | struct comedi_cmd *cmd) |
356 | { | 356 | { |
357 | int err = 0; | 357 | int err = 0; |
358 | int tmp; | 358 | int tmp; |
@@ -520,8 +520,8 @@ static int skel_ns_to_timer(unsigned int *ns, int round) | |||
520 | return *ns; | 520 | return *ns; |
521 | } | 521 | } |
522 | 522 | ||
523 | static int skel_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s, | 523 | static int skel_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, |
524 | struct comedi_insn * insn, unsigned int * data) | 524 | struct comedi_insn *insn, unsigned int *data) |
525 | { | 525 | { |
526 | int i; | 526 | int i; |
527 | int chan = CR_CHAN(insn->chanspec); | 527 | int chan = CR_CHAN(insn->chanspec); |
@@ -541,8 +541,8 @@ static int skel_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s | |||
541 | 541 | ||
542 | /* AO subdevices should have a read insn as well as a write insn. | 542 | /* AO subdevices should have a read insn as well as a write insn. |
543 | * Usually this means copying a value stored in devpriv. */ | 543 | * Usually this means copying a value stored in devpriv. */ |
544 | static int skel_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, | 544 | static int skel_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, |
545 | struct comedi_insn * insn, unsigned int * data) | 545 | struct comedi_insn *insn, unsigned int *data) |
546 | { | 546 | { |
547 | int i; | 547 | int i; |
548 | int chan = CR_CHAN(insn->chanspec); | 548 | int chan = CR_CHAN(insn->chanspec); |
@@ -558,8 +558,8 @@ static int skel_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s | |||
558 | * useful to applications if you implement the insn_bits interface. | 558 | * useful to applications if you implement the insn_bits interface. |
559 | * This allows packed reading/writing of the DIO channels. The | 559 | * This allows packed reading/writing of the DIO channels. The |
560 | * comedi core can convert between insn_bits and insn_read/write */ | 560 | * comedi core can convert between insn_bits and insn_read/write */ |
561 | static int skel_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, | 561 | static int skel_dio_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, |
562 | struct comedi_insn * insn, unsigned int * data) | 562 | struct comedi_insn *insn, unsigned int *data) |
563 | { | 563 | { |
564 | if (insn->n != 2) | 564 | if (insn->n != 2) |
565 | return -EINVAL; | 565 | return -EINVAL; |
@@ -583,8 +583,8 @@ static int skel_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevic | |||
583 | return 2; | 583 | return 2; |
584 | } | 584 | } |
585 | 585 | ||
586 | static int skel_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s, | 586 | static int skel_dio_insn_config(struct comedi_device *dev, struct comedi_subdevice *s, |
587 | struct comedi_insn * insn, unsigned int * data) | 587 | struct comedi_insn *insn, unsigned int *data) |
588 | { | 588 | { |
589 | int chan = CR_CHAN(insn->chanspec); | 589 | int chan = CR_CHAN(insn->chanspec); |
590 | 590 | ||
diff --git a/drivers/staging/comedi/drivers/ssv_dnp.c b/drivers/staging/comedi/drivers/ssv_dnp.c index c9a8fb5e852..847695a6281 100644 --- a/drivers/staging/comedi/drivers/ssv_dnp.c +++ b/drivers/staging/comedi/drivers/ssv_dnp.c | |||
@@ -88,8 +88,8 @@ struct dnp_private_data { | |||
88 | /* In the following section we define the API of this driver. */ | 88 | /* In the following section we define the API of this driver. */ |
89 | /* ------------------------------------------------------------------------- */ | 89 | /* ------------------------------------------------------------------------- */ |
90 | 90 | ||
91 | static int dnp_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 91 | static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
92 | static int dnp_detach(struct comedi_device * dev); | 92 | static int dnp_detach(struct comedi_device *dev); |
93 | 93 | ||
94 | static struct comedi_driver driver_dnp = { | 94 | static struct comedi_driver driver_dnp = { |
95 | driver_name:"ssv_dnp", | 95 | driver_name:"ssv_dnp", |
@@ -104,11 +104,11 @@ static struct comedi_driver driver_dnp = { | |||
104 | 104 | ||
105 | COMEDI_INITCLEANUP(driver_dnp); | 105 | COMEDI_INITCLEANUP(driver_dnp); |
106 | 106 | ||
107 | static int dnp_dio_insn_bits(struct comedi_device * dev, | 107 | static int dnp_dio_insn_bits(struct comedi_device *dev, |
108 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 108 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); |
109 | 109 | ||
110 | static int dnp_dio_insn_config(struct comedi_device * dev, | 110 | static int dnp_dio_insn_config(struct comedi_device *dev, |
111 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data); | 111 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data); |
112 | 112 | ||
113 | /* ------------------------------------------------------------------------- */ | 113 | /* ------------------------------------------------------------------------- */ |
114 | /* Attach is called by comedi core to configure the driver for a particular */ | 114 | /* Attach is called by comedi core to configure the driver for a particular */ |
@@ -116,7 +116,7 @@ static int dnp_dio_insn_config(struct comedi_device * dev, | |||
116 | /* dev->board_ptr contains that address. */ | 116 | /* dev->board_ptr contains that address. */ |
117 | /* ------------------------------------------------------------------------- */ | 117 | /* ------------------------------------------------------------------------- */ |
118 | 118 | ||
119 | static int dnp_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 119 | static int dnp_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
120 | { | 120 | { |
121 | 121 | ||
122 | struct comedi_subdevice *s; | 122 | struct comedi_subdevice *s; |
@@ -177,7 +177,7 @@ static int dnp_attach(struct comedi_device * dev, struct comedi_devconfig * it) | |||
177 | /* deallocated automatically by the core. */ | 177 | /* deallocated automatically by the core. */ |
178 | /* ------------------------------------------------------------------------- */ | 178 | /* ------------------------------------------------------------------------- */ |
179 | 179 | ||
180 | static int dnp_detach(struct comedi_device * dev) | 180 | static int dnp_detach(struct comedi_device *dev) |
181 | { | 181 | { |
182 | 182 | ||
183 | /* configure all ports as input (default) */ | 183 | /* configure all ports as input (default) */ |
@@ -201,8 +201,8 @@ static int dnp_detach(struct comedi_device * dev) | |||
201 | /* are able to use these instructions as well. */ | 201 | /* are able to use these instructions as well. */ |
202 | /* ------------------------------------------------------------------------- */ | 202 | /* ------------------------------------------------------------------------- */ |
203 | 203 | ||
204 | static int dnp_dio_insn_bits(struct comedi_device * dev, | 204 | static int dnp_dio_insn_bits(struct comedi_device *dev, |
205 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 205 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
206 | { | 206 | { |
207 | 207 | ||
208 | if (insn->n != 2) | 208 | if (insn->n != 2) |
@@ -251,8 +251,8 @@ static int dnp_dio_insn_bits(struct comedi_device * dev, | |||
251 | /* COMEDI_INPUT or COMEDI_OUTPUT. */ | 251 | /* COMEDI_INPUT or COMEDI_OUTPUT. */ |
252 | /* ------------------------------------------------------------------------- */ | 252 | /* ------------------------------------------------------------------------- */ |
253 | 253 | ||
254 | static int dnp_dio_insn_config(struct comedi_device * dev, | 254 | static int dnp_dio_insn_config(struct comedi_device *dev, |
255 | struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data) | 255 | struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) |
256 | { | 256 | { |
257 | 257 | ||
258 | u8 register_buffer; | 258 | u8 register_buffer; |
diff --git a/drivers/staging/comedi/drivers/unioxx5.c b/drivers/staging/comedi/drivers/unioxx5.c index 96284f020be..5b383e6354e 100644 --- a/drivers/staging/comedi/drivers/unioxx5.c +++ b/drivers/staging/comedi/drivers/unioxx5.c | |||
@@ -80,27 +80,27 @@ struct unioxx5_subd_priv { | |||
80 | unsigned char usp_prev_cn_val[3]; /* previous channel value */ | 80 | unsigned char usp_prev_cn_val[3]; /* previous channel value */ |
81 | }; | 81 | }; |
82 | 82 | ||
83 | static int unioxx5_attach(struct comedi_device * dev, struct comedi_devconfig * it); | 83 | static int unioxx5_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
84 | static int unioxx5_subdev_write(struct comedi_device * dev, struct comedi_subdevice * subdev, | 84 | static int unioxx5_subdev_write(struct comedi_device *dev, struct comedi_subdevice *subdev, |
85 | struct comedi_insn * insn, unsigned int * data); | 85 | struct comedi_insn *insn, unsigned int *data); |
86 | static int unioxx5_subdev_read(struct comedi_device * dev, struct comedi_subdevice * subdev, | 86 | static int unioxx5_subdev_read(struct comedi_device *dev, struct comedi_subdevice *subdev, |
87 | struct comedi_insn * insn, unsigned int * data); | 87 | struct comedi_insn *insn, unsigned int *data); |
88 | static int unioxx5_insn_config(struct comedi_device * dev, struct comedi_subdevice * subdev, | 88 | static int unioxx5_insn_config(struct comedi_device *dev, struct comedi_subdevice *subdev, |
89 | struct comedi_insn * insn, unsigned int * data); | 89 | struct comedi_insn *insn, unsigned int *data); |
90 | static int unioxx5_detach(struct comedi_device * dev); | 90 | static int unioxx5_detach(struct comedi_device *dev); |
91 | static int __unioxx5_subdev_init(struct comedi_subdevice * subdev, int subdev_iobase, | 91 | static int __unioxx5_subdev_init(struct comedi_subdevice *subdev, int subdev_iobase, |
92 | int minor); | 92 | int minor); |
93 | static int __unioxx5_digital_write(struct unioxx5_subd_priv * usp, unsigned int * data, | 93 | static int __unioxx5_digital_write(struct unioxx5_subd_priv *usp, unsigned int *data, |
94 | int channel, int minor); | 94 | int channel, int minor); |
95 | static int __unioxx5_digital_read(struct unioxx5_subd_priv * usp, unsigned int * data, | 95 | static int __unioxx5_digital_read(struct unioxx5_subd_priv *usp, unsigned int *data, |
96 | int channel, int minor); | 96 | int channel, int minor); |
97 | /* static void __unioxx5_digital_config(struct unioxx5_subd_priv* usp, int mode); */ | 97 | /* static void __unioxx5_digital_config(struct unioxx5_subd_priv* usp, int mode); */ |
98 | static int __unioxx5_analog_write(struct unioxx5_subd_priv * usp, unsigned int * data, | 98 | static int __unioxx5_analog_write(struct unioxx5_subd_priv *usp, unsigned int *data, |
99 | int channel, int minor); | 99 | int channel, int minor); |
100 | static int __unioxx5_analog_read(struct unioxx5_subd_priv * usp, unsigned int * data, | 100 | static int __unioxx5_analog_read(struct unioxx5_subd_priv *usp, unsigned int *data, |
101 | int channel, int minor); | 101 | int channel, int minor); |
102 | static int __unioxx5_define_chan_offset(int chan_num); | 102 | static int __unioxx5_define_chan_offset(int chan_num); |
103 | static void __unioxx5_analog_config(struct unioxx5_subd_priv * usp, int channel); | 103 | static void __unioxx5_analog_config(struct unioxx5_subd_priv *usp, int channel); |
104 | 104 | ||
105 | static struct comedi_driver unioxx5_driver = { | 105 | static struct comedi_driver unioxx5_driver = { |
106 | driver_name:DRIVER_NAME, | 106 | driver_name:DRIVER_NAME, |
@@ -111,7 +111,7 @@ static struct comedi_driver unioxx5_driver = { | |||
111 | 111 | ||
112 | COMEDI_INITCLEANUP(unioxx5_driver); | 112 | COMEDI_INITCLEANUP(unioxx5_driver); |
113 | 113 | ||
114 | static int unioxx5_attach(struct comedi_device * dev, struct comedi_devconfig * it) | 114 | static int unioxx5_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
115 | { | 115 | { |
116 | int iobase, i, n_subd; | 116 | int iobase, i, n_subd; |
117 | int id, num, ba; | 117 | int id, num, ba; |
@@ -156,8 +156,8 @@ static int unioxx5_attach(struct comedi_device * dev, struct comedi_devconfig * | |||
156 | return 0; | 156 | return 0; |
157 | } | 157 | } |
158 | 158 | ||
159 | static int unioxx5_subdev_read(struct comedi_device * dev, struct comedi_subdevice * subdev, | 159 | static int unioxx5_subdev_read(struct comedi_device *dev, struct comedi_subdevice *subdev, |
160 | struct comedi_insn * insn, unsigned int * data) | 160 | struct comedi_insn *insn, unsigned int *data) |
161 | { | 161 | { |
162 | struct unioxx5_subd_priv *usp = subdev->private; | 162 | struct unioxx5_subd_priv *usp = subdev->private; |
163 | int channel, type; | 163 | int channel, type; |
@@ -176,8 +176,8 @@ static int unioxx5_subdev_read(struct comedi_device * dev, struct comedi_subdevi | |||
176 | return 1; | 176 | return 1; |
177 | } | 177 | } |
178 | 178 | ||
179 | static int unioxx5_subdev_write(struct comedi_device * dev, struct comedi_subdevice * subdev, | 179 | static int unioxx5_subdev_write(struct comedi_device *dev, struct comedi_subdevice *subdev, |
180 | struct comedi_insn * insn, unsigned int * data) | 180 | struct comedi_insn *insn, unsigned int *data) |
181 | { | 181 | { |
182 | struct unioxx5_subd_priv *usp = subdev->private; | 182 | struct unioxx5_subd_priv *usp = subdev->private; |
183 | int channel, type; | 183 | int channel, type; |
@@ -197,8 +197,8 @@ static int unioxx5_subdev_write(struct comedi_device * dev, struct comedi_subdev | |||
197 | } | 197 | } |
198 | 198 | ||
199 | /* for digital modules only */ | 199 | /* for digital modules only */ |
200 | static int unioxx5_insn_config(struct comedi_device * dev, struct comedi_subdevice * subdev, | 200 | static int unioxx5_insn_config(struct comedi_device *dev, struct comedi_subdevice *subdev, |
201 | struct comedi_insn * insn, unsigned int * data) | 201 | struct comedi_insn *insn, unsigned int *data) |
202 | { | 202 | { |
203 | int channel_offset, flags, channel = CR_CHAN(insn->chanspec), type; | 203 | int channel_offset, flags, channel = CR_CHAN(insn->chanspec), type; |
204 | struct unioxx5_subd_priv *usp = subdev->private; | 204 | struct unioxx5_subd_priv *usp = subdev->private; |
@@ -247,7 +247,7 @@ static int unioxx5_insn_config(struct comedi_device * dev, struct comedi_subdevi | |||
247 | return 0; | 247 | return 0; |
248 | } | 248 | } |
249 | 249 | ||
250 | static int unioxx5_detach(struct comedi_device * dev) | 250 | static int unioxx5_detach(struct comedi_device *dev) |
251 | { | 251 | { |
252 | int i; | 252 | int i; |
253 | struct comedi_subdevice *subdev; | 253 | struct comedi_subdevice *subdev; |
@@ -264,7 +264,7 @@ static int unioxx5_detach(struct comedi_device * dev) | |||
264 | } | 264 | } |
265 | 265 | ||
266 | /* initializing subdevice with given address */ | 266 | /* initializing subdevice with given address */ |
267 | static int __unioxx5_subdev_init(struct comedi_subdevice * subdev, int subdev_iobase, | 267 | static int __unioxx5_subdev_init(struct comedi_subdevice *subdev, int subdev_iobase, |
268 | int minor) | 268 | int minor) |
269 | { | 269 | { |
270 | struct unioxx5_subd_priv *usp; | 270 | struct unioxx5_subd_priv *usp; |
@@ -330,7 +330,7 @@ static int __unioxx5_subdev_init(struct comedi_subdevice * subdev, int subdev_io | |||
330 | return 0; | 330 | return 0; |
331 | } | 331 | } |
332 | 332 | ||
333 | static int __unioxx5_digital_write(struct unioxx5_subd_priv * usp, unsigned int * data, | 333 | static int __unioxx5_digital_write(struct unioxx5_subd_priv *usp, unsigned int *data, |
334 | int channel, int minor) | 334 | int channel, int minor) |
335 | { | 335 | { |
336 | int channel_offset, val; | 336 | int channel_offset, val; |
@@ -357,7 +357,7 @@ static int __unioxx5_digital_write(struct unioxx5_subd_priv * usp, unsigned int | |||
357 | } | 357 | } |
358 | 358 | ||
359 | /* function for digital reading */ | 359 | /* function for digital reading */ |
360 | static int __unioxx5_digital_read(struct unioxx5_subd_priv * usp, unsigned int * data, | 360 | static int __unioxx5_digital_read(struct unioxx5_subd_priv *usp, unsigned int *data, |
361 | int channel, int minor) | 361 | int channel, int minor) |
362 | { | 362 | { |
363 | int channel_offset, mask = 1 << (channel & 0x07); | 363 | int channel_offset, mask = 1 << (channel & 0x07); |
@@ -380,7 +380,7 @@ static int __unioxx5_digital_read(struct unioxx5_subd_priv * usp, unsigned int * | |||
380 | } | 380 | } |
381 | 381 | ||
382 | #if 0 /* not used? */ | 382 | #if 0 /* not used? */ |
383 | static void __unioxx5_digital_config(struct unioxx5_subd_priv * usp, int mode) | 383 | static void __unioxx5_digital_config(struct unioxx5_subd_priv *usp, int mode) |
384 | { | 384 | { |
385 | int i, mask; | 385 | int i, mask; |
386 | 386 | ||
@@ -396,7 +396,7 @@ static void __unioxx5_digital_config(struct unioxx5_subd_priv * usp, int mode) | |||
396 | } | 396 | } |
397 | #endif | 397 | #endif |
398 | 398 | ||
399 | static int __unioxx5_analog_write(struct unioxx5_subd_priv * usp, unsigned int * data, | 399 | static int __unioxx5_analog_write(struct unioxx5_subd_priv *usp, unsigned int *data, |
400 | int channel, int minor) | 400 | int channel, int minor) |
401 | { | 401 | { |
402 | int module, i; | 402 | int module, i; |
@@ -431,7 +431,7 @@ static int __unioxx5_analog_write(struct unioxx5_subd_priv * usp, unsigned int * | |||
431 | return 1; | 431 | return 1; |
432 | } | 432 | } |
433 | 433 | ||
434 | static int __unioxx5_analog_read(struct unioxx5_subd_priv * usp, unsigned int * data, | 434 | static int __unioxx5_analog_read(struct unioxx5_subd_priv *usp, unsigned int *data, |
435 | int channel, int minor) | 435 | int channel, int minor) |
436 | { | 436 | { |
437 | int module_no, read_ch; | 437 | int module_no, read_ch; |
@@ -471,7 +471,7 @@ static int __unioxx5_analog_read(struct unioxx5_subd_priv * usp, unsigned int * | |||
471 | } | 471 | } |
472 | 472 | ||
473 | /* configure channels for analog i/o (even to output, odd to input) */ | 473 | /* configure channels for analog i/o (even to output, odd to input) */ |
474 | static void __unioxx5_analog_config(struct unioxx5_subd_priv * usp, int channel) | 474 | static void __unioxx5_analog_config(struct unioxx5_subd_priv *usp, int channel) |
475 | { | 475 | { |
476 | int chan_a, chan_b, conf, channel_offset; | 476 | int chan_a, chan_b, conf, channel_offset; |
477 | 477 | ||