staging: comedi: addi_apci_2200: 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 function returns the status in data[0].

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_apci2200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
index 94c884d31b1daf2faf79f21846bd99200003541f..7baccf7a9deb86f4caf41497ce29d12b961cab73 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
@@ -63,99 +63,14 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 #define APCI2200_WATCHDOG_RELOAD_VALUE 4
 #define APCI2200_WATCHDOG_STATUS       16
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2200_Read1DigitalInput                       |
-|                        (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                      struct comedi_insn *insn,unsigned int *data)                     |
-+----------------------------------------------------------------------------+
-| Task              : Return the status of the digital input                 |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                     struct comedi_subdevice *s,   :pointer to subdevice structure
-|                       struct comedi_insn *insn      :pointer to insn structure     |
-|                     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_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);
-               *data = (ui_TmpValue >> ui_Channel) & 0x1;
-       }                       /* if(ui_Channel >= 0 && ui_Channel <=7) */
-       else {
-               printk("\nThe specified channel does not exist\n");
-               return -EINVAL; /*  "sorry channel spec wrong " */
-       }                       /* else if(ui_Channel >= 0 && ui_Channel <=7) */
-
-       return insn->n;
-}
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2200_ReadMoreDigitalInput                    |
-|                        (struct comedi_device *dev,struct comedi_subdevice *s,               |
-|                     struct comedi_insn *insn,unsigned int *data)                      |
-+----------------------------------------------------------------------------+
-| Task              : Return the status of the Requested digital inputs      |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev      : Driver handle                |
-|                      struct comedi_subdevice *s,   :pointer to subdevice structure
-|                       struct comedi_insn *insn      :pointer to insn structure     |
-|                      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_APCI2200_ReadMoreDigitalInput(struct comedi_device *dev,
-                                          struct comedi_subdevice *s,
-                                          struct comedi_insn *insn,
-                                          unsigned int *data)
+static int apci2200_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_PortValue = data[0];
-       unsigned int ui_Mask = 0;
-       unsigned int ui_NoOfChannels;
-
-       ui_NoOfChannels = CR_CHAN(insn->chanspec);
 
-       *data = (unsigned int) inw(devpriv->iobase + APCI2200_DIGITAL_IP);
-       switch (ui_NoOfChannels) {
-       case 2:
-               ui_Mask = 3;
-               *data = (*data >> (2 * ui_PortValue)) & ui_Mask;
-               break;
-       case 4:
-               ui_Mask = 15;
-               *data = (*data >> (4 * ui_PortValue)) & ui_Mask;
-               break;
-       case 7:
-               break;
-
-       default:
-               printk("\nWrong parameters\n");
-               return -EINVAL; /*  "sorry channel spec wrong " */
-               break;
-       }                       /* switch(ui_NoOfChannels) */
+       data[1] = inw(devpriv->iobase + APCI2200_DIGITAL_IP);
 
        return insn->n;
 }

diff --git a/drivers/staging/comedi/drivers/addi_apci_2200.c b/drivers/staging/comedi/drivers/addi_apci_2200.c
index becb2b4d11cd2da08c2430c9c617b01be8a65509..99ce93cca3982eabd7b2ccbaff9b69ff5a136b87 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_2200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2200.c
@@ -21,8 +21,7 @@ static const struct addi_board apci2200_boardtypes[] = {
                .i_NbrDoChannel         = 16,
                .i_Timer                = 1,
                .reset                  = i_APCI2200_Reset,
-               .di_read                = i_APCI2200_Read1DigitalInput,
-               .di_bits                = i_APCI2200_ReadMoreDigitalInput,
+               .di_bits                = apci2200_di_insn_bits,
                .do_config              = i_APCI2200_ConfigDigitalOutput,
                .do_write               = i_APCI2200_WriteDigitalOutput,
                .do_bits                = i_APCI2200_ReadDigitalOutput,