staging: comedi: addi-data: remove devpriv macro

This macro relies on a local variable having a specific name.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
index b59f2d484fd99ecb3c1e7b93053d99bf8cf1ef87..8656d0ef2c8df56a83449a892a9575d86bd3c034 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
@@ -222,7 +222,7 @@ int i_InsnConfig_InitTimer(struct comedi_device *dev,struct comedi_subdevice *s,
 int i_APCI1710_InsnConfigInitTimer(struct comedi_device *dev, struct comedi_subdevice *s,
                                   struct comedi_insn *insn, unsigned int *data)
 {
-
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned char b_ModulNbr;
        unsigned char b_TimerNbr;
@@ -452,6 +452,7 @@ int i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,
                                           struct comedi_subdevice *s,
                                           struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_DummyRead;
        unsigned char b_ModulNbr;
@@ -593,6 +594,7 @@ int i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,struct comedi_sub
 int i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_subdevice *s,
                                     struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned char b_ModulNbr, b_ReadType;
        unsigned int *pul_TimerValueArray;
@@ -764,6 +766,7 @@ int i_APCI1710_ReadTimerValue(struct comedi_device *dev,
                              unsigned char b_ModulNbr, unsigned char b_TimerNbr,
                              unsigned int *pul_TimerValue)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /* Test the module number */
@@ -852,6 +855,7 @@ int i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev,
                                   unsigned char b_ModulNbr, unsigned char b_TimerNbr,
                                   unsigned char *pb_OutputLevel)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_TimerStatus;
 
@@ -931,6 +935,7 @@ int i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,
                                      unsigned char b_ModulNbr, unsigned char b_TimerNbr,
                                      unsigned char *pb_TimerStatus)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_TimerStatus;
 
@@ -1010,6 +1015,7 @@ int i_APCI1710_WriteTimerValue(struct comedi_device *dev,
                               unsigned char b_ModulNbr, unsigned char b_TimerNbr,
                               unsigned int ul_WriteValue)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /* Test the module number */

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
index 482a412aa6524aa6bad2b3838ccfdd9922456ae8..a30fb0ddb749fd41f468a6583bc164c58549b844 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
@@ -134,6 +134,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 int i_APCI1710_InsnConfigInitChrono(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int ul_TimerValue = 0;
        unsigned int ul_TimingInterval = 0;
@@ -843,6 +844,7 @@ struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)                                              |
 int i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned char b_ModulNbr, b_CycleMode, b_InterruptEnable, b_Action;
        b_ModulNbr = CR_AREF(insn->chanspec);
@@ -1093,6 +1095,7 @@ struct comedi_insn *insn,unsigned int *data)                   |
 int i_APCI1710_InsnReadChrono(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned char b_ReadType;
        int i_ReturnValue = insn->n;
 
@@ -1197,6 +1200,7 @@ int i_APCI1710_InsnReadChrono(struct comedi_device *dev, struct comedi_subdevice
 int i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char *pb_ChronoStatus)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_Status;
 
@@ -1359,6 +1363,7 @@ int i_APCI1710_ReadChronoValue(struct comedi_device *dev,
        unsigned char b_ModulNbr,
        unsigned int ui_TimeOut, unsigned char *pb_ChronoStatus, unsigned int *pul_ChronoValue)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_Status;
        unsigned int dw_TimeOut = 0;
@@ -1626,6 +1631,7 @@ int i_APCI1710_ConvertChronoValue(struct comedi_device *dev,
        unsigned char *pb_Second,
        unsigned int *pui_MilliSecond, unsigned int *pui_MicroSecond, unsigned int *pui_NanoSecond)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        double d_Hour;
        double d_Minute;
@@ -1878,6 +1884,7 @@ int i_APCI1710_ConvertChronoValue(struct comedi_device *dev,
 int i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned char b_ModulNbr, b_OutputChannel, b_InputChannel, b_IOType;
        unsigned int dw_Status;

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 07108f9f4a4174c067770b73dc1ed8b12cf91d16..96ca3d26ae6089dd8630c18c83af1bad144a8d53 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
@@ -102,6 +102,7 @@ Activates and deactivates the digital output memory.
 int i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned char b_ModulNbr, b_ChannelAMode, b_ChannelBMode;
        unsigned char b_MemoryOnOff, b_ConfigType;
        int i_ReturnValue = 0;
@@ -296,6 +297,7 @@ int i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, struct comedi_subd
 int i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_StatusReg;
        unsigned char b_ModulNbr, b_InputChannel;
@@ -484,6 +486,7 @@ int i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev,
 int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_WriteValue = 0;
        unsigned char b_ModulNbr, b_OutputChannel;
@@ -734,6 +737,7 @@ int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev,
 int i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_WriteValue = 0;
        unsigned int dw_StatusReg;

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c
index 14b13eae4c5074b923854b0860050fccc5ef1c38..834685b1885f2f2cd26c7fc030b1894f26eab945 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c
@@ -78,8 +78,10 @@ struct comedi_insn *insn,unsigned int *data)
 int i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_ConfigType;
        int i_ReturnValue = 0;
+
        ui_ConfigType = CR_CHAN(insn->chanspec);
 
        printk("\nINC_CPT");
@@ -306,6 +308,7 @@ int i_APCI1710_InitCounter(struct comedi_device *dev,
        unsigned char b_FirstCounterOption,
        unsigned char b_SecondCounterModus, unsigned char b_SecondCounterOption)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /*******************************/
@@ -547,6 +550,7 @@ int i_APCI1710_InitCounter(struct comedi_device *dev,
 
 int i_APCI1710_CounterAutoTest(struct comedi_device *dev, unsigned char *pb_TestStatus)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned char b_ModulCpt = 0;
        int i_ReturnValue = 0;
        unsigned int dw_LathchValue;
@@ -713,6 +717,7 @@ int i_APCI1710_InitIndex(struct comedi_device *dev,
        unsigned char b_ReferenceAction,
        unsigned char b_IndexOperation, unsigned char b_AutoMode, unsigned char b_InterruptEnable)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -1155,6 +1160,7 @@ int i_APCI1710_InitIndex(struct comedi_device *dev,
 int i_APCI1710_InitReference(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char b_ReferenceLevel)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -1280,6 +1286,7 @@ int i_APCI1710_InitReference(struct comedi_device *dev,
 int i_APCI1710_InitExternalStrobe(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char b_ExternalStrobe, unsigned char b_ExternalStrobeLevel)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -1394,6 +1401,7 @@ int i_APCI1710_InitExternalStrobe(struct comedi_device *dev,
 int i_APCI1710_InitCompareLogic(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned int ui_CompareValue)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -1493,6 +1501,7 @@ int i_APCI1710_InitFrequencyMeasurement(struct comedi_device *dev,
        unsigned char b_TimingUnity,
        unsigned int ul_TimingInterval, unsigned int *pul_RealTimingInterval)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int ul_TimerValue = 0;
        double d_RealTimingInterval;
@@ -2018,8 +2027,10 @@ struct comedi_insn *insn,unsigned int *data)                   |
 int i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_BitsType;
        int i_ReturnValue = 0;
+
        ui_BitsType = CR_CHAN(insn->chanspec);
        devpriv->tsk_Current = current; /*  Save the current process task structure */
 
@@ -2093,6 +2104,7 @@ int i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev, struct comedi_subdevice
 
 int i_APCI1710_ClearCounterValue(struct comedi_device *dev, unsigned char b_ModulNbr)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -2153,6 +2165,7 @@ int i_APCI1710_ClearCounterValue(struct comedi_device *dev, unsigned char b_Modu
 
 int i_APCI1710_ClearAllCounterValue(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned char b_ModulCpt = 0;
        int i_ReturnValue = 0;
 
@@ -2300,6 +2313,7 @@ int i_APCI1710_ClearAllCounterValue(struct comedi_device *dev)
 int i_APCI1710_SetInputFilter(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char b_PCIInputClock, unsigned char b_Filter)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_Status = 0;
 
@@ -2564,6 +2578,7 @@ int i_APCI1710_SetInputFilter(struct comedi_device *dev,
 int i_APCI1710_LatchCounter(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char b_LatchReg)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -2661,6 +2676,7 @@ int i_APCI1710_LatchCounter(struct comedi_device *dev,
 int i_APCI1710_SetIndexAndReferenceSource(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char b_SourceSelection)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -2797,6 +2813,7 @@ int i_APCI1710_SetIndexAndReferenceSource(struct comedi_device *dev,
 
 int i_APCI1710_SetDigitalChlOn(struct comedi_device *dev, unsigned char b_ModulNbr)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -2877,6 +2894,7 @@ int i_APCI1710_SetDigitalChlOn(struct comedi_device *dev, unsigned char b_ModulN
 
 int i_APCI1710_SetDigitalChlOff(struct comedi_device *dev, unsigned char b_ModulNbr)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -2954,6 +2972,7 @@ struct comedi_insn *insn,unsigned int *data)                   |
 int i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_WriteType;
        int i_ReturnValue = 0;
 
@@ -3049,6 +3068,7 @@ int i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev, struct comedi_subdevic
 
 int i_APCI1710_EnableLatchInterrupt(struct comedi_device *dev, unsigned char b_ModulNbr)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -3135,6 +3155,7 @@ int i_APCI1710_EnableLatchInterrupt(struct comedi_device *dev, unsigned char b_M
 
 int i_APCI1710_DisableLatchInterrupt(struct comedi_device *dev, unsigned char b_ModulNbr)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -3234,6 +3255,7 @@ int i_APCI1710_DisableLatchInterrupt(struct comedi_device *dev, unsigned char b_
 int i_APCI1710_Write16BitCounterValue(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char b_SelectedCounter, unsigned int ui_WriteValue)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -3319,6 +3341,7 @@ int i_APCI1710_Write16BitCounterValue(struct comedi_device *dev,
 int i_APCI1710_Write32BitCounterValue(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned int ul_WriteValue)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -3385,6 +3408,7 @@ int i_APCI1710_Write32BitCounterValue(struct comedi_device *dev,
 
 int i_APCI1710_EnableIndex(struct comedi_device *dev, unsigned char b_ModulNbr)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int ul_InterruptLatchReg;
 
@@ -3483,6 +3507,7 @@ int i_APCI1710_EnableIndex(struct comedi_device *dev, unsigned char b_ModulNbr)
 
 int i_APCI1710_DisableIndex(struct comedi_device *dev, unsigned char b_ModulNbr)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -3582,6 +3607,7 @@ int i_APCI1710_DisableIndex(struct comedi_device *dev, unsigned char b_ModulNbr)
 
 int i_APCI1710_EnableCompareLogic(struct comedi_device *dev, unsigned char b_ModulNbr)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -3682,6 +3708,7 @@ int i_APCI1710_EnableCompareLogic(struct comedi_device *dev, unsigned char b_Mod
 
 int i_APCI1710_DisableCompareLogic(struct comedi_device *dev, unsigned char b_ModulNbr)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -3792,6 +3819,7 @@ int i_APCI1710_DisableCompareLogic(struct comedi_device *dev, unsigned char b_Mo
 int i_APCI1710_EnableFrequencyMeasurement(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char b_InterruptEnable)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -3938,6 +3966,7 @@ int i_APCI1710_EnableFrequencyMeasurement(struct comedi_device *dev,
 
 int i_APCI1710_DisableFrequencyMeasurement(struct comedi_device *dev, unsigned char b_ModulNbr)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -4052,6 +4081,7 @@ struct comedi_insn *insn,unsigned int *data)                   |
 int i_APCI1710_InsnReadINCCPT(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_ReadType;
        int i_ReturnValue = 0;
 
@@ -4196,6 +4226,7 @@ int i_APCI1710_InsnReadINCCPT(struct comedi_device *dev, struct comedi_subdevice
 int i_APCI1710_ReadLatchRegisterStatus(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char b_LatchReg, unsigned char *pb_LatchStatus)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_LatchReg;
 
@@ -4283,6 +4314,7 @@ int i_APCI1710_ReadLatchRegisterStatus(struct comedi_device *dev,
 int i_APCI1710_ReadLatchRegisterValue(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char b_LatchReg, unsigned int *pul_LatchValue)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -4367,6 +4399,7 @@ int i_APCI1710_ReadLatchRegisterValue(struct comedi_device *dev,
 int i_APCI1710_Read16BitCounterValue(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char b_SelectedCounter, unsigned int *pui_CounterValue)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_LathchValue = 0;
 
@@ -4462,6 +4495,7 @@ int i_APCI1710_Read16BitCounterValue(struct comedi_device *dev,
 int i_APCI1710_Read32BitCounterValue(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned int *pul_CounterValue)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
 
        /**************************/
@@ -4538,6 +4572,7 @@ int i_APCI1710_Read32BitCounterValue(struct comedi_device *dev,
 int i_APCI1710_GetIndexStatus(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char *pb_IndexStatus)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_StatusReg = 0;
 
@@ -4622,6 +4657,7 @@ int i_APCI1710_GetIndexStatus(struct comedi_device *dev,
 int i_APCI1710_GetReferenceStatus(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char *pb_ReferenceStatus)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_StatusReg = 0;
 
@@ -4706,6 +4742,7 @@ int i_APCI1710_GetReferenceStatus(struct comedi_device *dev,
 int i_APCI1710_GetUASStatus(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char *pb_UASStatus)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_StatusReg = 0;
 
@@ -4774,6 +4811,7 @@ int i_APCI1710_GetUASStatus(struct comedi_device *dev,
 int i_APCI1710_GetCBStatus(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char *pb_CBStatus)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_StatusReg = 0;
 
@@ -4856,6 +4894,7 @@ int i_APCI1710_GetCBStatus(struct comedi_device *dev,
 int i_APCI1710_Get16BitCBStatus(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char *pb_CBStatusCounter0, unsigned char *pb_CBStatusCounter1)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_StatusReg = 0;
 
@@ -4969,6 +5008,7 @@ int i_APCI1710_Get16BitCBStatus(struct comedi_device *dev,
 int i_APCI1710_GetUDStatus(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char *pb_UDStatus)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_StatusReg = 0;
 
@@ -5043,6 +5083,7 @@ int i_APCI1710_GetUDStatus(struct comedi_device *dev,
 int i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device *dev,
        unsigned char b_ModulNbr, unsigned char *pb_UDStatus)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_StatusReg = 0;
 
@@ -5149,6 +5190,7 @@ int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device *dev,
        unsigned char b_ModulNbr,
        unsigned char *pb_Status, unsigned char *pb_UDStatus, unsigned int *pul_ReadValue)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int ui_16BitValue;
        unsigned int dw_StatusReg;

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 3f9cfa20d8862a8050723b57e51a41e73de7cca8..3aa80090a07a3c84bafb5194f36aebfb3229978a 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c
@@ -126,9 +126,9 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 int i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_IntRegister;
-
        unsigned char b_ModulNbr;
        unsigned char b_PulseEncoderNbr;
        unsigned char b_InputLevelSelection;
@@ -417,6 +417,7 @@ int i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device *dev,
 int i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned char b_ModulNbr;
        unsigned char b_PulseEncoderNbr;
@@ -711,6 +712,7 @@ int i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev,
 int i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_StatusRegister;
        unsigned char b_ModulNbr;
@@ -837,6 +839,7 @@ int i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device *dev,
 int i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
 
        data[0] = devpriv->s_InterruptParameters.
                s_FIFOInterruptParameters[devpriv->

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c
index 8883e66621158bb3b73a7e058c9a681e1263783f..9a01ea05b40efb89a8c26b938d5667e7ce6550af 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c
@@ -188,6 +188,7 @@ int i_APCI1710_InitPWM(struct comedi_device *dev,
        unsigned int ul_HighTiming,
        unsigned int *pul_RealLowTiming, unsigned int *pul_RealHighTiming)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int ul_LowTimerValue = 0;
        unsigned int ul_HighTimerValue = 0;
@@ -1545,6 +1546,7 @@ int i_APCI1710_GetPWMInitialisation(struct comedi_device *dev,
        unsigned char *pb_StopLevel,
        unsigned char *pb_ExternGate, unsigned char *pb_InterruptEnable, unsigned char *pb_Enable)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_Status;
        unsigned int dw_Command;
@@ -1813,6 +1815,7 @@ int i_APCI1710_EnablePWM(struct comedi_device *dev,
        unsigned char b_StopMode,
        unsigned char b_StopLevel, unsigned char b_ExternGate, unsigned char b_InterruptEnable)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_Status;
        unsigned int dw_Command;
@@ -2064,6 +2067,7 @@ int i_APCI1710_EnablePWM(struct comedi_device *dev,
 
 int i_APCI1710_DisablePWM(struct comedi_device *dev, unsigned char b_ModulNbr, unsigned char b_PWM)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_Status;
 
@@ -2193,6 +2197,7 @@ int i_APCI1710_SetNewPWMTiming(struct comedi_device *dev,
        unsigned char b_ModulNbr,
        unsigned char b_PWM, unsigned char b_TimingUnit, unsigned int ul_LowTiming, unsigned int ul_HighTiming)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned char b_ClockSelection;
        int i_ReturnValue = 0;
        unsigned int ul_LowTimerValue = 0;
@@ -3463,9 +3468,9 @@ int i_APCI1710_SetNewPWMTiming(struct comedi_device *dev,
 int i_APCI1710_InsnReadGetPWMStatus(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_Status;
-
        unsigned char b_ModulNbr;
        unsigned char b_PWM;
        unsigned char *pb_PWMOutputStatus;
@@ -3564,6 +3569,8 @@ int i_APCI1710_InsnReadGetPWMStatus(struct comedi_device *dev, struct comedi_sub
 int i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        data[0] = devpriv->s_InterruptParameters.
                s_FIFOInterruptParameters[devpriv->
                s_InterruptParameters.ui_Read].b_OldModuleMask;

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
index c13b00274923bf55ea09a4c52fe63a1a7e30f09d..298ea485da9a61ecceb56b19975c0fa9e48303fb 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
@@ -122,6 +122,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 int i_APCI1710_InsnConfigInitSSI(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int ui_TimerValue;
        unsigned char b_ModulNbr, b_SSIProfile, b_PositionTurnLength, b_TurnCptLength,
@@ -389,6 +390,7 @@ pul_Position        =       (unsigned int *) &data[0];
 int i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned char b_Cpt;
        unsigned char b_Length;
@@ -722,6 +724,7 @@ int i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, struct comedi_subdevi
 int i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_StatusReg;
        unsigned char b_ModulNbr;
@@ -729,6 +732,7 @@ int i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device *dev, struct comedi_sub
        unsigned char *pb_ChannelStatus;
        unsigned char *pb_InputStatus;
        unsigned char b_IOType;
+
        i_ReturnValue = insn->n;
        b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
        b_IOType = (unsigned char) data[0];

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
index 0e6affd95962379534b8ba54d1667b59335385fa..28322fbfc1d664128af7b2eab70fe1e91f1694f2 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
@@ -133,6 +133,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 int i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int ul_TimerValue = 0;
        unsigned int dw_Command;
@@ -990,6 +991,7 @@ int i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev,
 int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_Status;
        unsigned int dw_DummyRead;
@@ -1463,6 +1465,7 @@ int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev,
 int i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_Status;
        unsigned char b_ModulNbr;
@@ -1703,10 +1706,10 @@ int i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev,
 int i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_Status;
        unsigned int dw_TimeOut = 0;
-
        unsigned char b_ModulNbr;
        unsigned char b_TorCounter;
        unsigned char b_ReadType;

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c
index 9e177f4af861fe67cc7a769f666d99b79086e523..4f71a4ce3fbc9093422cbf0fa61ae02a874e2b14 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c
@@ -103,6 +103,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 int i_APCI1710_InsnConfigInitTTLIO(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned char b_ModulNbr;
        unsigned char b_InitType;
@@ -409,6 +410,7 @@ APCI1710_TTL_READCHANNEL
 int i_APCI1710_InsnBitsReadTTLIO(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_StatusReg;
        unsigned char b_ModulNbr;
@@ -658,6 +660,7 @@ int i_APCI1710_InsnBitsReadTTLIO(struct comedi_device *dev, struct comedi_subdev
 int i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_StatusReg;
        unsigned char b_ModulNbr;
@@ -828,6 +831,7 @@ int i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,struct comedi
 int i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = 0;
        unsigned int dw_StatusReg = 0;
        unsigned char b_ModulNbr;

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 99a96bd96716b960e0d7732c226eba315e6a6e49..1d4ecfec447f90709ddda8987d3d29f820215277 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -76,7 +76,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 /* Update-0.7.57->0.7.68MODULE_DESCRIPTION("Comedi ADDI-DATA module"); */
 /* Update-0.7.57->0.7.68MODULE_LICENSE("GPL"); */
 
-#define devpriv ((struct addi_private *)dev->private)
 #define this_board ((const struct addi_board *)dev->board_ptr)
 
 #if defined(CONFIG_APCI_1710) || defined(CONFIG_APCI_3200) || defined(CONFIG_APCI_3300)
@@ -1472,6 +1471,7 @@ module_exit(driver_addi_cleanup_module);
 
 static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+       struct addi_private *devpriv;
        struct comedi_subdevice *s;
        int ret, pages, i, n_subdevices;
        unsigned int dw_Dummy;
@@ -1482,9 +1482,10 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
        unsigned char pci_bus, pci_slot, pci_func;
        int i_Dma = 0;
 
-       ret = alloc_private(dev, sizeof(struct addi_private));
-       if (ret < 0)
-               return -ENOMEM;
+       ret = alloc_private(dev, sizeof(*devpriv));
+       if (ret)
+               return ret;
+       devpriv = dev->private;
 
        if (!pci_list_builded) {
                v_pci_card_list_init(this_board->i_VendorId, 1);        /* 1 for displaying the list.. */
@@ -1817,7 +1818,9 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static void i_ADDI_Detach(struct comedi_device *dev)
 {
-       if (dev->private) {
+       struct addi_private *devpriv = dev->private;
+
+       if (devpriv) {
                if (devpriv->b_ValidDriver)
                        i_ADDI_Reset(dev);
                if (dev->irq)
@@ -1923,6 +1926,7 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
 static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned short w_Data;
        unsigned short w_Address;
        w_Address = CR_CHAN(insn->chanspec);    /*  address to be read as 0,1,2,3...255 */

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
index 3a9339b926101fc83f4fffaf6bf15438c3327594..0883fe0a930bc0a4879275982646f726e44d28aa 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
@@ -805,6 +805,7 @@ void v_EepromCs76Read(unsigned int dw_Address, unsigned short w_offset, unsigned
 int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress,
        char *pc_PCIChipInformation, struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned short w_Temp, i, w_Count = 0;
        unsigned int ui_Temp;
        struct str_MainHeader s_MainHeader;

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
index f9a8937be8ed160a2051b3f1d8cfd6940b824c4e..057ef4eb8db7e76cf981808accc5ceabbc1813c7 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
@@ -201,6 +201,7 @@ void v_APCI1710_Interrupt(int irq, void *d);
 
 int i_APCI1710_Reset(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
        int ret;
        unsigned int dw_Dummy;
 
@@ -250,6 +251,7 @@ int i_APCI1710_Reset(struct comedi_device *dev)
 void v_APCI1710_Interrupt(int irq, void *d)
 {
        struct comedi_device *dev = d;
+       struct addi_private *devpriv = dev->private;
        unsigned char b_ModuleCpt = 0;
        unsigned char b_InterruptFlag = 0;
        unsigned char b_PWMCpt = 0;

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
index 5997b2f504ad34f9e5238c62f2796db06ea3d8dd..0fde7a39302339a04b860a7a402390edf25da1d6 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
@@ -112,9 +112,11 @@ static int i_Flag = 1;
 int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Status = 0;
        unsigned int ui_Command = 0;
        unsigned int ui_Mode = 0;
+
        i_Temp = 0;
        devpriv->tsk_Current = current;
        devpriv->b_TimerSelectMode = data[0];
@@ -281,8 +283,10 @@ int i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev, struct comedi_subde
 int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Command = 0;
        int i_Count = 0;
+
        if (data[0] == 1) {
                ui_Command =
                        inl(devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 12);
@@ -396,7 +400,9 @@ int i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
 int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Status = 0;     /*  Status register */
+
        i_WatchdogNbr = insn->unused[0];
 
        /******************/
@@ -456,6 +462,8 @@ int i_APCI035_ReadTimerWatchdog(struct comedi_device *dev, struct comedi_subdevi
 int i_APCI035_ConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        devpriv->tsk_Current = current;
        outl(0x200 | 0, devpriv->iobase + 128 + 0x4);
        outl(0, devpriv->iobase + 128 + 0);
@@ -493,7 +501,9 @@ int i_APCI035_ConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevi
 int i_APCI035_ReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_CommandRegister = 0;
+
 /******************/
 /*  Set the start */
 /******************/
@@ -527,7 +537,9 @@ int i_APCI035_ReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice
 */
 int i_APCI035_Reset(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
        int i_Count = 0;
+
        for (i_Count = 1; i_Count <= 4; i_Count++) {
                i_WatchdogNbr = i_Count;
                outl(0x0, devpriv->iobase + ((i_WatchdogNbr - 1) * 32) + 0);    /* stop all timers */
@@ -557,11 +569,13 @@ int i_APCI035_Reset(struct comedi_device *dev)
 static void v_APCI035_Interrupt(int irq, void *d)
 {
        struct comedi_device *dev = d;
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_StatusRegister1 = 0;
        unsigned int ui_StatusRegister2 = 0;
        unsigned int ui_ReadCommand = 0;
        unsigned int ui_ChannelNumber = 0;
        unsigned int ui_DigitalTemperature = 0;
+
        if (i_Temp == 1) {
                i_WatchdogNbr = i_Flag;
                i_Flag = i_Flag + 1;

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
index bab7b61a53bcb4a6bfe018d4d13fa7cc252837f4..b209cfa0374e2a212f97888485e81c1a89fbfdc0 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
@@ -87,10 +87,11 @@ static unsigned int ui_InterruptStatus;
 int i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_TmpValue;
-
        unsigned int ul_Command1 = 0;
        unsigned int ul_Command2 = 0;
+
        devpriv->tsk_Current = current;
 
   /*******************************/
@@ -147,9 +148,11 @@ int i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subde
 int i_APCI1032_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_TmpValue = 0;
        unsigned int ui_Channel;
        ui_Channel = CR_CHAN(insn->chanspec);
+
        if (ui_Channel <= 31) {
                ui_TmpValue = (unsigned int) inl(devpriv->iobase + APCI1032_DIGITAL_IP);
 /*
@@ -188,6 +191,7 @@ int i_APCI1032_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdev
 int i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_PortValue = data[0];
        unsigned int ui_Mask = 0;
        unsigned int ui_NoOfChannels;
@@ -248,8 +252,9 @@ int i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub
 static void v_APCI1032_Interrupt(int irq, void *d)
 {
        struct comedi_device *dev = d;
-
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp;
+
        /* disable the interrupt */
        ui_Temp = inl(devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
        outl(ui_Temp & APCI1032_DIGITAL_IP_INTERRUPT_DISABLE,
@@ -279,6 +284,8 @@ static void v_APCI1032_Interrupt(int irq, void *d)
 
 int i_APCI1032_Reset(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
+
        outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);   /* disable the interrupts */
        inl(devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_STATUS);    /* Reset the interrupt status register */
        outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_MODE1);       /* Disable the and/or interrupt */

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
index 62f421a06f0517dbc988cbd689689563c3c51b03..cc47821a7457b64c6200a0bdf2016ef976dcec40 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
@@ -141,6 +141,7 @@ static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
                                              struct comedi_insn *insn,
                                              unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_PatternPolarity = 0, i_PatternTransition = 0, i_PatternMask = 0;
        int i_MaxChannel = 0, i_Count = 0, i_EventMask = 0;
        int i_PatternTransitionCount = 0, i_RegValue;
@@ -525,8 +526,10 @@ static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
                                          struct comedi_insn *insn,
                                          unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_Event1InterruptStatus = 0, i_Event2InterruptStatus =
                0, i_RegValue;
+
        switch (data[0]) {
        case START:
              /*************************/
@@ -792,7 +795,9 @@ static int i_APCI1500_Initialisation(struct comedi_device *dev,
                                     struct comedi_insn *insn,
                                     unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_DummyRead = 0;
+
     /******************/
        /* Software reset */
     /******************/
@@ -966,6 +971,7 @@ static int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev,
                                           struct comedi_insn *insn,
                                           unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_PortValue = data[1];
        unsigned int ui_Mask = 0;
        unsigned int ui_Channel;
@@ -1051,6 +1057,8 @@ static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *de
                                                        struct comedi_insn *insn,
                                                        unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        devpriv->b_OutputMemoryStatus = data[0];
        return insn->n;
 }
@@ -1079,9 +1087,9 @@ static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev,
                                         struct comedi_insn *insn,
                                         unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        static unsigned int ui_Temp = 0;
        unsigned int ui_Temp1;
-
        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
 
        if (!devpriv->b_OutputMemoryStatus) {
@@ -1274,6 +1282,7 @@ static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
                                                 struct comedi_insn *insn,
                                                 unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_TimerCounterMode, i_MasterConfiguration;
 
        devpriv->tsk_Current = current;
@@ -1875,6 +1884,7 @@ static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device
                                                           struct comedi_insn *insn,
                                                           unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_CommandAndStatusValue;
 
        switch (data[0]) {
@@ -2198,7 +2208,9 @@ static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
                                               struct comedi_insn *insn,
                                               unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_CommandAndStatusValue;
+
        switch (data[0]) {
        case COUNTER1:
                /* Read counter/timer1 */
@@ -2421,9 +2433,11 @@ static int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev,
                                         struct comedi_insn *insn,
                                         unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Status;
        int i_RegValue;
        int i_Constant;
+
        devpriv->tsk_Current = current;
        outl(0x0, devpriv->i_IobaseAmcc + 0x38);
        if (data[0] == 1) {
@@ -2597,6 +2611,7 @@ static void v_APCI1500_Interrupt(int irq, void *d)
 {
 
        struct comedi_device *dev = d;
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_InterruptStatus = 0;
        int i_RegValue = 0;
        i_InterruptMask = 0;
@@ -2840,7 +2855,9 @@ static void v_APCI1500_Interrupt(int irq, void *d)
 */
 static int i_APCI1500_Reset(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
        int i_DummyRead = 0;
+
        i_TimerCounter1Init = 0;
        i_TimerCounter2Init = 0;
        i_WatchdogCounter3Init = 0;

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
index 8a584a014b0b8d51b1ae5148e1fbc7cdda9ee1cf..04a87453818ca6edf9c17201e7c21521083967e8 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
@@ -76,8 +76,10 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 int i_APCI1516_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_TmpValue = 0;
        unsigned int ui_Channel;
+
        ui_Channel = CR_CHAN(insn->chanspec);
        if (ui_Channel <= 7) {
                ui_TmpValue = (unsigned int) inw(devpriv->iobase + APCI1516_DIGITAL_IP);
@@ -117,7 +119,7 @@ int i_APCI1516_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdev
 int i_APCI1516_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
-
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_PortValue = data[0];
        unsigned int ui_Mask = 0;
        unsigned int ui_NoOfChannels;
@@ -174,6 +176,8 @@ int i_APCI1516_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub
 int i_APCI1516_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        devpriv->b_OutputMemoryStatus = data[0];
        return insn->n;
 }
@@ -202,6 +206,7 @@ int i_APCI1516_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subd
 int i_APCI1516_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp, ui_Temp1;
        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
 
@@ -363,8 +368,10 @@ int i_APCI1516_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
        struct comedi_insn *insn, unsigned int *data)
 {
 
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp;
        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
+
        ui_Temp = data[0];
        *data = inw(devpriv->iobase + APCI1516_DIGITAL_OP_RW);
        if (ui_Temp == 0) {
@@ -422,6 +429,8 @@ int i_APCI1516_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
 int i_APCI1516_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        if (data[0] == 0) {
                /* Disable the watchdog */
                outw(0x0,
@@ -468,6 +477,8 @@ int i_APCI1516_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice
 int i_APCI1516_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        switch (data[0]) {
        case 0:         /* stop the watchdog */
                outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_ENABLEDISABLE);    /* disable the watchdog */
@@ -513,6 +524,8 @@ int i_APCI1516_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_s
 int i_APCI1516_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        data[0] = inw(devpriv->i_IobaseAddon + APCI1516_WATCHDOG_STATUS) & 0x1;
        return insn->n;
 }
@@ -534,6 +547,8 @@ int i_APCI1516_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *
 
 int i_APCI1516_Reset(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
+
        outw(0x0, devpriv->iobase + APCI1516_DIGITAL_OP);       /* RESETS THE DIGITAL OUTPUTS */
        outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_ENABLEDISABLE);
        outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_RELOAD_VALUE);

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
index 5b92e45c9ae34560784d2fd7a64220d8648b22b5..393d6d198024d433e61481124a03ca0cf5ee1f63 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
@@ -89,6 +89,8 @@ static unsigned int ui_InterruptData, ui_Type;
 int i_APCI1564_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        devpriv->tsk_Current = current;
    /*******************************/
        /* Set the digital input logic */
@@ -150,6 +152,7 @@ int i_APCI1564_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subde
 int i_APCI1564_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_TmpValue = 0;
        unsigned int ui_Channel;
 
@@ -192,6 +195,7 @@ int i_APCI1564_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdev
 int i_APCI1564_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_PortValue = data[0];
        unsigned int ui_Mask = 0;
        unsigned int ui_NoOfChannels;
@@ -260,6 +264,7 @@ int i_APCI1564_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub
 int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ul_Command = 0;
 
        if ((data[0] != 0) && (data[0] != 1)) {
@@ -317,6 +322,7 @@ int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subd
 int i_APCI1564_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp, ui_Temp1;
        unsigned int ui_NoOfChannel;
 
@@ -491,6 +497,7 @@ int i_APCI1564_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
 int i_APCI1564_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp;
        unsigned int ui_NoOfChannel;
 
@@ -569,7 +576,9 @@ int i_APCI1564_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
 int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ul_Command1 = 0;
+
        devpriv->tsk_Current = current;
        if (data[0] == ADDIDATA_WATCHDOG) {
                devpriv->b_TimerSelectMode = ADDIDATA_WATCHDOG;
@@ -723,7 +732,9 @@ int i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
 int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ul_Command1 = 0;
+
        if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) {
                switch (data[1]) {
                case 0: /* stop the watchdog */
@@ -818,6 +829,7 @@ int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
 int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ul_Command1 = 0;
 
        if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) {
@@ -921,10 +933,12 @@ int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev, struct comedi_subd
 static void v_APCI1564_Interrupt(int irq, void *d)
 {
        struct comedi_device *dev = d;
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_DO, ui_DI;
        unsigned int ui_Timer;
        unsigned int ui_C1, ui_C2, ui_C3, ui_C4;
        unsigned int ul_Command2 = 0;
+
        ui_DI = inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP +
                APCI1564_DIGITAL_IP_IRQ) & 0x01;
        ui_DO = inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_OP +
@@ -1106,6 +1120,8 @@ static void v_APCI1564_Interrupt(int irq, void *d)
 
 int i_APCI1564_Reset(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
+
        outl(0x0, devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_IRQ);     /* disable the interrupts */
        inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_INTERRUPT_STATUS);      /* Reset the interrupt status register */
        outl(0x0, devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_INTERRUPT_MODE1); /* Disable the and/or interrupt */

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
index 00a088f820a737ec7c58972b67676bb15a744d38..859c593f95a2e5c6d06ee2eadc7e309f60716715 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
@@ -93,6 +93,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = insn->n;
        unsigned char b_Command = 0;
        unsigned char b_Cpt = 0;
@@ -286,6 +287,7 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device *dev,
 int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = insn->n;
        unsigned char b_Command = 0;
        unsigned char b_NumberOfPort =
@@ -433,6 +435,7 @@ int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device *dev,
 int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned char b_Command = (unsigned char) CR_AREF(insn->chanspec);
        int i_ReturnValue = insn->n;
        unsigned char b_Cpt = 0;
@@ -573,6 +576,7 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
 int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = insn->n;
        unsigned char b_Command = 0;
        unsigned char b_NumberOfPort =

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
index 49dcbe24fcd36e03c819c7dae67dc3d0ba8147c1..b8721dd16cb38960228b591bf4e40342ef291bc8 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
@@ -78,6 +78,8 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 int i_APCI2016_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        if ((data[0] != 0) && (data[0] != 1)) {
                comedi_error(dev,
                        "Not a valid Data !!! ,Data should be 1 or 0\n");
@@ -114,8 +116,10 @@ int i_APCI2016_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subd
 int i_APCI2016_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_NoOfChannel;
        unsigned int ui_Temp, ui_Temp1;
+
        ui_NoOfChannel = CR_CHAN(insn->chanspec);
        if (ui_NoOfChannel > 15) {
                comedi_error(dev,
@@ -269,8 +273,10 @@ int i_APCI2016_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
 int i_APCI2016_BitsDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp;
        unsigned int ui_NoOfChannel;
+
        ui_NoOfChannel = CR_CHAN(insn->chanspec);
        if (ui_NoOfChannel > 15) {
                comedi_error(dev,
@@ -340,6 +346,7 @@ int i_APCI2016_BitsDigitalOutput(struct comedi_device *dev, struct comedi_subdev
 int i_APCI2016_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
 
        if (data[0] == 0) {
                /* Disable the watchdog */
@@ -383,6 +390,7 @@ int i_APCI2016_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice
 int i_APCI2016_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
 
        switch (data[0]) {
        case 0:         /* stop the watchdog */
@@ -430,6 +438,8 @@ int i_APCI2016_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_s
 int i_APCI2016_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        udelay(5);
        data[0] = inw(devpriv->i_IobaseAddon + APCI2016_WATCHDOG_STATUS) & 0x1;
        return insn->n;
@@ -452,6 +462,8 @@ int i_APCI2016_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *
 
 int i_APCI2016_Reset(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
+
        outw(0x0, devpriv->iobase + APCI2016_DIGITAL_OP);       /*  Resets the digital output channels */
        outw(0x0, devpriv->i_IobaseAddon + APCI2016_WATCHDOG_ENABLEDISABLE);
        outw(0x0, devpriv->i_IobaseAddon + APCI2016_WATCHDOG_RELOAD_VALUE);

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
index 002297dfe33f2fd76fa0fcb30ee3df8276d30c73..ad57f02b5b24552087412e5ffea3d7d3ad035179 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
@@ -82,7 +82,9 @@ static unsigned int ui_InterruptData, ui_Type;
 int i_APCI2032_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ul_Command = 0;
+
        devpriv->tsk_Current = current;
 
        if ((data[0] != 0) && (data[0] != 1)) {
@@ -137,8 +139,10 @@ int i_APCI2032_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subd
 int i_APCI2032_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp, ui_Temp1;
        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
+
        if (devpriv->b_OutputMemoryStatus) {
                ui_Temp = inl(devpriv->iobase + APCI2032_DIGITAL_OP);
 
@@ -316,8 +320,10 @@ int i_APCI2032_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
 int i_APCI2032_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp;
        unsigned int ui_NoOfChannel;
+
        ui_NoOfChannel = CR_CHAN(insn->chanspec);
        ui_Temp = data[0];
        *data = inl(devpriv->iobase + APCI2032_DIGITAL_OP_RW);
@@ -383,6 +389,8 @@ int i_APCI2032_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
 int i_APCI2032_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        if (data[0] == 0) {
                /* Disable the watchdog */
                outl(0x0,
@@ -424,6 +432,8 @@ int i_APCI2032_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice
 int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        switch (data[0]) {
        case 0:         /* stop the watchdog */
                outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG + APCI2032_TCW_PROG);  /* disable the watchdog */
@@ -469,6 +479,7 @@ int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_s
 int i_APCI2032_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
 
        data[0] =
                inl(devpriv->iobase + APCI2032_DIGITAL_OP_WATCHDOG +
@@ -496,6 +507,7 @@ int i_APCI2032_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *
 void v_APCI2032_Interrupt(int irq, void *d)
 {
        struct comedi_device *dev = d;
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_DO;
 
        ui_DO = inl(devpriv->iobase + APCI2032_DIGITAL_OP_IRQ) & 0x1;   /* Check if VCC OR CC interrupt has occurred. */
@@ -569,6 +581,8 @@ int i_APCI2032_ReadInterruptStatus(struct comedi_device *dev, struct comedi_subd
 
 int i_APCI2032_Reset(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
+
        devpriv->b_DigitalOutputRegister = 0;
        ui_Type = 0;
        outl(0x0, devpriv->iobase + APCI2032_DIGITAL_OP);       /* Resets the output channels */

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
index 3d378b5ecbcef0d8086195b70605d6c166ed8eed..db74f774a91a93ae0ad5c743dfdb8888166b1b83 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
@@ -76,8 +76,10 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 int i_APCI2200_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_TmpValue = 0;
        unsigned int ui_Channel;
+
        ui_Channel = CR_CHAN(insn->chanspec);
        if (ui_Channel <= 7) {
                ui_TmpValue = (unsigned int) inw(devpriv->iobase + APCI2200_DIGITAL_IP);
@@ -115,7 +117,7 @@ int i_APCI2200_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdev
 int i_APCI2200_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
-
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_PortValue = data[0];
        unsigned int ui_Mask = 0;
        unsigned int ui_NoOfChannels;
@@ -172,6 +174,8 @@ int i_APCI2200_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub
 int i_APCI2200_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        devpriv->b_OutputMemoryStatus = data[0];
        return insn->n;
 }
@@ -200,8 +204,10 @@ int i_APCI2200_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subd
 int i_APCI2200_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp, ui_Temp1;
        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
+
        if (devpriv->b_OutputMemoryStatus) {
                ui_Temp = inw(devpriv->iobase + APCI2200_DIGITAL_OP);
 
@@ -357,9 +363,10 @@ int i_APCI2200_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
 int i_APCI2200_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
-
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp;
        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
+
        ui_Temp = data[0];
        *data = inw(devpriv->iobase + APCI2200_DIGITAL_OP);
        if (ui_Temp == 0) {
@@ -421,6 +428,8 @@ int i_APCI2200_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
 int i_APCI2200_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        if (data[0] == 0) {
                /* Disable the watchdog */
                outw(0x0,
@@ -467,6 +476,8 @@ int i_APCI2200_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice
 int i_APCI2200_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        switch (data[0]) {
        case 0:         /* stop the watchdog */
                outw(0x0, devpriv->iobase + APCI2200_WATCHDOG + APCI2200_WATCHDOG_ENABLEDISABLE);       /* disable the watchdog */
@@ -512,6 +523,8 @@ int i_APCI2200_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_s
 int i_APCI2200_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        data[0] =
                inw(devpriv->iobase + APCI2200_WATCHDOG +
                APCI2200_WATCHDOG_STATUS) & 0x1;
@@ -535,6 +548,8 @@ int i_APCI2200_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *
 
 int i_APCI2200_Reset(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
+
        outw(0x0, devpriv->iobase + APCI2200_DIGITAL_OP);       /* RESETS THE DIGITAL OUTPUTS */
        outw(0x0,
                devpriv->iobase + APCI2200_WATCHDOG +

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index f406dfb2a677d80d2ba24554e1e5e8b7d8623680..0f7c8260264c07de8e23219fd524c43399e4b152 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -77,6 +77,7 @@ static unsigned int ui_Temp;
 int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int i;
 
        if ((data[0] != APCI3120_EOC_MODE) && (data[0] != APCI3120_EOS_MODE))
@@ -146,6 +147,7 @@ int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev, struct comedi_su
 int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned short us_ConvertTiming, us_TmpValue, i;
        unsigned char b_Tmp;
 
@@ -407,6 +409,8 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subd
 
 int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+       struct addi_private *devpriv = dev->private;
+
        /*  Disable A2P Fifo write and AMWEN signal */
        outw(0, devpriv->i_IobaseAddon + 4);
 
@@ -478,6 +482,7 @@ int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_su
 int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_cmd *cmd)
 {
+       struct addi_private *devpriv = dev->private;
        int err = 0;
 
        /* Step 1 : check if triggers are trivially valid */
@@ -604,6 +609,7 @@ int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_s
 
 int i_APCI3120_CommandAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+       struct addi_private *devpriv = dev->private;
        struct comedi_cmd *cmd = &s->async->cmd;
 
        /* loading private structure with cmd structure inputs */
@@ -678,6 +684,7 @@ int i_APCI3120_CommandAnalogInput(struct comedi_device *dev, struct comedi_subde
 int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev,
        struct comedi_subdevice *s)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned char b_Tmp;
        unsigned int ui_Tmp, ui_DelayTiming = 0, ui_TimerValue1 = 0, dmalen0 =
                0, dmalen1 = 0, ui_TimerValue2 =
@@ -1211,6 +1218,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev,
 
 int i_APCI3120_Reset(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int i;
        unsigned short us_TmpValue;
 
@@ -1292,6 +1300,7 @@ int i_APCI3120_Reset(struct comedi_device *dev)
 int i_APCI3120_SetupChannelList(struct comedi_device *dev, struct comedi_subdevice *s,
        int n_chan, unsigned int *chanlist, char check)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int i;         /* , differencial=0, bipolar=0; */
        unsigned int gain;
        unsigned short us_TmpValue;
@@ -1354,6 +1363,7 @@ int i_APCI3120_SetupChannelList(struct comedi_device *dev, struct comedi_subdevi
 
 int i_APCI3120_ExttrigEnable(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
 
        devpriv->us_OutputRegister |= APCI3120_ENABLE_EXT_TRIGGER;
        outw(devpriv->us_OutputRegister, dev->iobase + APCI3120_WR_ADDRESS);
@@ -1379,6 +1389,8 @@ int i_APCI3120_ExttrigEnable(struct comedi_device *dev)
 
 int i_APCI3120_ExttrigDisable(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
+
        devpriv->us_OutputRegister &= ~APCI3120_ENABLE_EXT_TRIGGER;
        outw(devpriv->us_OutputRegister, dev->iobase + APCI3120_WR_ADDRESS);
        return 0;
@@ -1414,13 +1426,13 @@ int i_APCI3120_ExttrigDisable(struct comedi_device *dev)
 void v_APCI3120_Interrupt(int irq, void *d)
 {
        struct comedi_device *dev = d;
+       struct addi_private *devpriv = dev->private;
        unsigned short int_daq;
-
        unsigned int int_amcc, ui_Check, i;
        unsigned short us_TmpValue;
        unsigned char b_DummyRead;
-
        struct comedi_subdevice *s = &dev->subdevices[0];
+
        ui_Check = 1;
 
        int_daq = inw(dev->iobase + APCI3120_RD_STATUS) & 0xf000;       /*  get IRQ reasons */
@@ -1624,6 +1636,7 @@ void v_APCI3120_Interrupt(int irq, void *d)
 
 int i_APCI3120_InterruptHandleEos(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
        int n_chan, i;
        struct comedi_subdevice *s = &dev->subdevices[0];
        int err = 1;
@@ -1667,11 +1680,12 @@ int i_APCI3120_InterruptHandleEos(struct comedi_device *dev)
 void v_APCI3120_InterruptDma(int irq, void *d)
 {
        struct comedi_device *dev = d;
+       struct addi_private *devpriv = dev->private;
        struct comedi_subdevice *s = &dev->subdevices[0];
        unsigned int next_dma_buf, samplesinbuf;
        unsigned long low_word, high_word, var;
-
        unsigned int ui_Tmp;
+
        samplesinbuf =
                devpriv->ui_DmaBufferUsesize[devpriv->ui_DmaActualBuffer] -
                inl(devpriv->i_IobaseAmcc + AMCC_OP_REG_MWTC);
@@ -1837,6 +1851,8 @@ void v_APCI3120_InterruptDma(int irq, void *d)
 void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev,
        struct comedi_subdevice *s, short *dma_buffer, unsigned int num_samples)
 {
+       struct addi_private *devpriv = dev->private;
+
        devpriv->ui_AiActualScan +=
                (s->async->cur_chan + num_samples) / devpriv->ui_AiScanLength;
        s->async->cur_chan += num_samples;
@@ -1879,7 +1895,7 @@ void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev,
 int i_APCI3120_InsnConfigTimer(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
-
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Timervalue2;
        unsigned short us_TmpValue;
        unsigned char b_Tmp;
@@ -2037,7 +2053,7 @@ int i_APCI3120_InsnConfigTimer(struct comedi_device *dev, struct comedi_subdevic
 int i_APCI3120_InsnWriteTimer(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
-
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Timervalue2 = 0;
        unsigned short us_TmpValue;
        unsigned char b_Tmp;
@@ -2221,6 +2237,7 @@ int i_APCI3120_InsnWriteTimer(struct comedi_device *dev, struct comedi_subdevice
 int i_APCI3120_InsnReadTimer(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned char b_Tmp;
        unsigned short us_TmpValue, us_TmpValue_2, us_StatusValue;
 
@@ -2296,6 +2313,7 @@ int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev,
                                    struct comedi_insn *insn,
                                    unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Chan, ui_TmpValue;
 
        ui_Chan = CR_CHAN(insn->chanspec);      /*  channel specified */
@@ -2340,7 +2358,9 @@ int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev,
 int i_APCI3120_InsnBitsDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_TmpValue;
+
        ui_TmpValue = (unsigned int) inw(devpriv->iobase + APCI3120_RD_STATUS);
        /*****  state of 4 channels  in the 11, 10, 9, 8   bits of status reg
                        rotated right 8 times to bring them to last four bits
@@ -2379,6 +2399,7 @@ int i_APCI3120_InsnBitsDigitalInput(struct comedi_device *dev, struct comedi_sub
 int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
 
        if ((data[0] != 0) && (data[0] != 1)) {
                comedi_error(dev,
@@ -2426,6 +2447,8 @@ int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device *dev,
                                     struct comedi_insn *insn,
                                     unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        if ((data[0] > devpriv->s_EeParameters.i_DoMaxdata) || (data[0] < 0)) {
 
                comedi_error(dev, "Data is not valid !!! \n");
@@ -2479,9 +2502,8 @@ int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev,
                                      struct comedi_insn *insn,
                                      unsigned int *data)
 {
-
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp1;
-
        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
 
        if ((data[0] != 0) && (data[0] != 1)) {
@@ -2558,6 +2580,7 @@ int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev,
                                     struct comedi_insn *insn,
                                     unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Range, ui_Channel;
        unsigned short us_TmpValue;
 

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
index 38ab49917d7e39a85903319c28b1ed679125b931..7f5efa39cb76987d1b700836b72c8a55ac895f68 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
@@ -548,8 +548,10 @@ int i_APCI3200_GetChannelCalibrationValue(struct comedi_device *dev,
 int i_APCI3200_ReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp = 0;
        unsigned int ui_NoOfChannel = 0;
+
        ui_NoOfChannel = CR_CHAN(insn->chanspec);
        ui_Temp = data[0];
        *data = inl(devpriv->i_IobaseReserved);
@@ -606,6 +608,7 @@ int i_APCI3200_ReadDigitalInput(struct comedi_device *dev, struct comedi_subdevi
 int i_APCI3200_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
 
        if ((data[0] != 0) && (data[0] != 1)) {
                comedi_error(dev,
@@ -651,8 +654,10 @@ int i_APCI3200_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subd
 int i_APCI3200_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp = 0, ui_Temp1 = 0;
        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
+
        if (devpriv->b_OutputMemoryStatus) {
                ui_Temp = inl(devpriv->i_IobaseAddon);
 
@@ -764,8 +769,10 @@ int i_APCI3200_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
 int i_APCI3200_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp;
        unsigned int ui_NoOfChannel;
+
        ui_NoOfChannel = CR_CHAN(insn->chanspec);
        ui_Temp = data[0];
        *data = inl(devpriv->i_IobaseAddon);
@@ -872,7 +879,7 @@ int i_APCI3200_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
 int i_APCI3200_ConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
-
+       struct addi_private *devpriv = dev->private;
        unsigned int ul_Config = 0, ul_Temp = 0;
        unsigned int ui_ChannelNo = 0;
        unsigned int ui_Dummy = 0;
@@ -1649,6 +1656,7 @@ int i_APCI3200_ReadAnalogInput(struct comedi_device *dev, struct comedi_subdevic
 int i_APCI3200_Read1AnalogInputChannel(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_EOC = 0;
        unsigned int ui_ChannelNo = 0;
        unsigned int ui_CommandRegister = 0;
@@ -1773,6 +1781,7 @@ int i_APCI3200_Read1AnalogInputChannel(struct comedi_device *dev,
 */
 int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device *dev, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp = 0, ui_EOC = 0;
        unsigned int ui_CommandRegister = 0;
 
@@ -1909,6 +1918,7 @@ int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device *dev, unsigned in
 */
 int i_APCI3200_ReadCalibrationGainValue(struct comedi_device *dev, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_EOC = 0;
        int ui_CommandRegister = 0;
 
@@ -2045,6 +2055,7 @@ int i_APCI3200_ReadCalibrationGainValue(struct comedi_device *dev, unsigned int
 
 int i_APCI3200_ReadCJCValue(struct comedi_device *dev, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_EOC = 0;
        int ui_CommandRegister = 0;
 
@@ -2164,8 +2175,10 @@ int i_APCI3200_ReadCJCValue(struct comedi_device *dev, unsigned int *data)
 */
 int i_APCI3200_ReadCJCCalOffset(struct comedi_device *dev, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_EOC = 0;
        int ui_CommandRegister = 0;
+
   /*******************************************/
        /*Read calibration offset value for the CJC */
   /*******************************************/
@@ -2280,8 +2293,10 @@ int i_APCI3200_ReadCJCCalOffset(struct comedi_device *dev, unsigned int *data)
 */
 int i_APCI3200_ReadCJCCalGain(struct comedi_device *dev, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_EOC = 0;
        int ui_CommandRegister = 0;
+
   /*******************************/
        /* Set the convert timing unit */
   /*******************************/
@@ -2402,8 +2417,10 @@ int i_APCI3200_ReadCJCCalGain(struct comedi_device *dev, unsigned int *data)
 int i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Configuration = 0;
        int i_Temp;             /* ,i_TimeUnit; */
+
        /* if(i_Initialised==0) */
 
        if (s_BoardInfos[dev->minor].i_Initialised == 0) {
@@ -2736,7 +2753,9 @@ int i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_s
 
 int i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Configuration = 0;
+
        /* i_InterruptFlag=0; */
        /* i_Initialised=0; */
        /* i_Count=0; */
@@ -2786,6 +2805,7 @@ int i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_su
 
 int i_APCI3200_CommandAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s)
 {
+       struct addi_private *devpriv = dev->private;
        struct comedi_cmd *cmd = &s->async->cmd;
        unsigned int ui_Configuration = 0;
        /* INT  i_CurrentSource = 0; */
@@ -2798,6 +2818,7 @@ int i_APCI3200_CommandAnalogInput(struct comedi_device *dev, struct comedi_subde
        unsigned int ui_DelayTime = 0;
        unsigned int ui_DelayTimeBase = 0;
        unsigned int ui_DelayMode = 0;
+
        /* i_FirstChannel=cmd->chanlist[0]; */
        /* i_LastChannel=cmd->chanlist[1]; */
        s_BoardInfos[dev->minor].i_FirstChannel = cmd->chanlist[0];
@@ -2973,8 +2994,10 @@ int i_APCI3200_CommandAnalogInput(struct comedi_device *dev, struct comedi_subde
 
 int i_APCI3200_Reset(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
        int i_Temp;
        unsigned int dw_Dummy;
+
        /* i_InterruptFlag=0; */
        /* i_Initialised==0; */
        /* i_Count=0; */
@@ -3030,6 +3053,7 @@ int i_APCI3200_Reset(struct comedi_device *dev)
 void v_APCI3200_Interrupt(int irq, void *d)
 {
        struct comedi_device *dev = d;
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_StatusRegister = 0;
        unsigned int ui_ChannelNumber = 0;
        int i_CalibrationFlag = 0;
@@ -3038,7 +3062,6 @@ void v_APCI3200_Interrupt(int irq, void *d)
        unsigned int ui_DigitalTemperature = 0;
        unsigned int ui_DigitalInput = 0;
        int i_ConvertCJCCalibration;
-
        /* BEGIN JK TEST */
        int i_ReturnValue = 0;
        /* END JK TEST */
@@ -3471,6 +3494,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
 */
 int i_APCI3200_InterruptHandleEos(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_StatusRegister = 0;
        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 acaceb01629a80bf616b5d0924b6de7b898e112d..a730a4a52cb959aac3fd16a3365fa9e55c657db2 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
@@ -76,8 +76,10 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 int i_APCI3501_ReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp;
        unsigned int ui_NoOfChannel;
+
        ui_NoOfChannel = CR_CHAN(insn->chanspec);
        ui_Temp = data[0];
        *data = inl(devpriv->iobase + APCI3501_DIGITAL_IP);
@@ -124,6 +126,7 @@ int i_APCI3501_ReadDigitalInput(struct comedi_device *dev, struct comedi_subdevi
 int i_APCI3501_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
 
        if ((data[0] != 0) && (data[0] != 1)) {
                comedi_error(dev,
@@ -164,8 +167,10 @@ int i_APCI3501_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subd
 int i_APCI3501_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp, ui_Temp1;
        unsigned int ui_NoOfChannel = CR_CHAN(insn->chanspec);  /*  get the channel */
+
        if (devpriv->b_OutputMemoryStatus) {
                ui_Temp = inl(devpriv->iobase + APCI3501_DIGITAL_OP);
        }                       /* if(devpriv->b_OutputMemoryStatus ) */
@@ -251,6 +256,7 @@ int i_APCI3501_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
 int i_APCI3501_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Temp;
        unsigned int ui_NoOfChannel;
 
@@ -301,6 +307,8 @@ int i_APCI3501_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdev
 int i_APCI3501_ConfigAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
+
        outl(data[0],
                devpriv->iobase + APCI3501_ANALOG_OUTPUT +
                APCI3501_AO_VOLT_MODE);
@@ -339,6 +347,7 @@ int i_APCI3501_ConfigAnalogOutput(struct comedi_device *dev, struct comedi_subde
 int i_APCI3501_WriteAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s,
        struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ul_Command1 = 0, ul_Channel_no, ul_Polarity, ul_DAC_Ready = 0;
 
        ul_Channel_no = CR_CHAN(insn->chanspec);
@@ -413,7 +422,9 @@ int i_APCI3501_WriteAnalogOutput(struct comedi_device *dev, struct comedi_subdev
 int i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ul_Command1 = 0;
+
        devpriv->tsk_Current = current;
        if (data[0] == ADDIDATA_WATCHDOG) {
 
@@ -514,8 +525,10 @@ int i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev,
 int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned int ul_Command1 = 0;
        int i_Temp;
+
        if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) {
 
                if (data[1] == 1) {
@@ -616,6 +629,7 @@ int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
 int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev,
        struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
 
        if (devpriv->b_TimerSelectMode == ADDIDATA_WATCHDOG) {
                data[0] =
@@ -656,8 +670,10 @@ int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev,
 
 int i_APCI3501_Reset(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
        int i_Count = 0, i_temp = 0;
        unsigned int ul_Command1 = 0, ul_Polarity, ul_DAC_Ready = 0;
+
        outl(0x0, devpriv->iobase + APCI3501_DIGITAL_OP);
        outl(1, devpriv->iobase + APCI3501_ANALOG_OUTPUT +
                APCI3501_AO_VOLT_MODE);
@@ -709,8 +725,10 @@ void v_APCI3501_Interrupt(int irq, void *d)
 {
        int i_temp;
        struct comedi_device *dev = d;
+       struct addi_private *devpriv = dev->private;
        unsigned int ui_Timer_AOWatchdog;
        unsigned long ul_Command1;
+
        /*  Disable Interrupt */
        ul_Command1 =
                inl(devpriv->iobase + APCI3501_WATCHDOG + APCI3501_TCW_PROG);

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
index fff99df51e927f7519cd68909351901fcb2dc533..431df5c90ce9df26fb89af425279b566041da07b 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
@@ -69,6 +69,8 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 */
 static int i_APCI3XXX_TestConversionStarted(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
+
        if ((readl(devpriv->dw_AiBase + 8) & 0x80000UL) == 0x80000UL)
                return 1;
        else
@@ -108,6 +110,7 @@ static int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device *dev,
                                                     struct comedi_insn *insn,
                                                     unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = insn->n;
        unsigned char b_TimeBase = 0;
        unsigned char b_SingleDiff = 0;
@@ -358,6 +361,7 @@ static int i_APCI3XXX_InsnReadAnalogInput(struct comedi_device *dev,
                                          struct comedi_insn *insn,
                                          unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = insn->n;
        unsigned char b_Configuration = (unsigned char) CR_RANGE(insn->chanspec);
        unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec);
@@ -571,6 +575,7 @@ static int i_APCI3XXX_InsnReadAnalogInput(struct comedi_device *dev,
 static void v_APCI3XXX_Interrupt(int irq, void *d)
 {
        struct comedi_device *dev = d;
+       struct addi_private *devpriv = dev->private;
        unsigned char b_CopyCpt = 0;
        unsigned int dw_Status = 0;
 
@@ -651,6 +656,7 @@ static int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device *dev,
                                            struct comedi_insn *insn,
                                            unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned char b_Range = (unsigned char) CR_RANGE(insn->chanspec);
        unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec);
        unsigned int dw_Status = 0;
@@ -755,6 +761,7 @@ static int i_APCI3XXX_InsnConfigInitTTLIO(struct comedi_device *dev,
                                          struct comedi_insn *insn,
                                          unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = insn->n;
        unsigned char b_Command = 0;
 
@@ -884,6 +891,7 @@ static int i_APCI3XXX_InsnBitsTTLIO(struct comedi_device *dev,
                                    struct comedi_insn *insn,
                                    unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = insn->n;
        unsigned char b_ChannelCpt = 0;
        unsigned int dw_ChannelMask = 0;
@@ -1040,6 +1048,7 @@ static int i_APCI3XXX_InsnReadTTLIO(struct comedi_device *dev,
                                    struct comedi_insn *insn,
                                    unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec);
        int i_ReturnValue = insn->n;
        unsigned int *pls_ReadData = data;
@@ -1154,6 +1163,7 @@ static int i_APCI3XXX_InsnWriteTTLIO(struct comedi_device *dev,
                                     struct comedi_insn *insn,
                                     unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = insn->n;
        unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec);
        unsigned char b_State = 0;
@@ -1267,6 +1277,7 @@ static int i_APCI3XXX_InsnReadDigitalInput(struct comedi_device *dev,
                                           struct comedi_insn *insn,
                                           unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = insn->n;
        unsigned char b_Channel = (unsigned char) CR_CHAN(insn->chanspec);
        unsigned int dw_Temp = 0;
@@ -1327,6 +1338,7 @@ static int i_APCI3XXX_InsnBitsDigitalInput(struct comedi_device *dev,
                                           struct comedi_insn *insn,
                                           unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = insn->n;
        unsigned int dw_Temp = 0;
 
@@ -1382,6 +1394,7 @@ static int i_APCI3XXX_InsnBitsDigitalOutput(struct comedi_device *dev,
                                            struct comedi_insn *insn,
                                            unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = insn->n;
        unsigned char b_ChannelCpt = 0;
        unsigned int dw_ChannelMask = 0;
@@ -1480,6 +1493,7 @@ static int i_APCI3XXX_InsnWriteDigitalOutput(struct comedi_device *dev,
                                             struct comedi_insn *insn,
                                             unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = insn->n;
        unsigned char b_Channel = CR_CHAN(insn->chanspec);
        unsigned char b_State = 0;
@@ -1557,6 +1571,7 @@ static int i_APCI3XXX_InsnReadDigitalOutput(struct comedi_device *dev,
                                            struct comedi_insn *insn,
                                            unsigned int *data)
 {
+       struct addi_private *devpriv = dev->private;
        int i_ReturnValue = insn->n;
        unsigned char b_Channel = CR_CHAN(insn->chanspec);
        unsigned int dw_Status = 0;
@@ -1614,6 +1629,7 @@ static int i_APCI3XXX_InsnReadDigitalOutput(struct comedi_device *dev,
 
 static int i_APCI3XXX_Reset(struct comedi_device *dev)
 {
+       struct addi_private *devpriv = dev->private;
        unsigned char b_Cpt = 0;
 
        /*************************/