staging: comedi: addi_apci_3501: fix digital input 'insn_bits' function

This driver does not follow the comedi API. The digital input 'insn_bits'
function is supposed to return the status of all the input channels in
data[1]. Currently this driver uses the data[0] value passed to the function
to determine if a single input channel status is requested or the status of
all the input channels.

Fix the function so it works like the comedi core expects. The core can
then use the function to emulate the 'insn_read' function for individual
channels.

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/hwdrv_apci3501.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
index 0f03c6e9ffb222618c08b7e00e9f066e36e921e4..5408f0720c92e374e0bac7d96b03bd621954df7f 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
@@ -84,50 +84,15 @@ static struct comedi_lrange range_apci3501_ao = {
        }
 };
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI3501_ReadDigitalInput                    |
-|                        (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Read  value  of the selected channel or port           |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     unsigned int ui_NoOfChannels    : No Of Channels To read       |
-|                     unsigned int *data              : Data Pointer to read status  |
-+----------------------------------------------------------------------------+
-| Output Parameters :  --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                          : FALSE : Error occur. Return the error          |
-|                                                                               |
-+----------------------------------------------------------------------------+
-*/
-
-static int i_APCI3501_ReadDigitalInput(struct comedi_device *dev,
-                                      struct comedi_subdevice *s,
-                                      struct comedi_insn *insn,
-                                      unsigned int *data)
+static int apci3501_di_insn_bits(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);
-       if (ui_Temp == 0) {
-               *data = (*data >> ui_NoOfChannel) & 0x1;
-       }                       /* if  (ui_Temp==0) */
-       else {
-               if (ui_Temp == 1) {
+       data[1] = inl(devpriv->iobase + APCI3501_DIGITAL_IP) & 0x3;
 
-                       *data = *data & 0x3;
-               }               /* if  (ui_Temp==1) */
-               else {
-                       printk("\nSpecified channel not supported \n");
-               }               /* elseif  (ui_Temp==1) */
-       }                       /* elseif  (ui_Temp==0) */
        return insn->n;
 }
 

diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c
index c86f31e585988b570e225b86428408ecc8f04b1b..6477416ff51a886f685b0ffd5027530bee99417c 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3501.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -27,7 +27,7 @@ static const struct addi_board apci3501_boardtypes[] = {
                .reset                  = i_APCI3501_Reset,
                .ao_config              = i_APCI3501_ConfigAnalogOutput,
                .ao_write               = i_APCI3501_WriteAnalogOutput,
-               .di_bits                = i_APCI3501_ReadDigitalInput,
+               .di_bits                = apci3501_di_insn_bits,
                .do_write               = i_APCI3501_WriteDigitalOutput,
                .do_bits                = i_APCI3501_ReadDigitalOutput,
                .timer_config           = i_APCI3501_ConfigTimerCounterWatchdog,