staging: comedi: addi_apci_1032: remove i_APCI1032_Read1DigitalInput()

This function is the insn_read operation for the digital input subdevice.
This operation can be emulated by the comedi core now that the insn_bits
operation follows the comedi API. Remove this now unnecessary function.

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

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
index aa4f022b9c79db5717137e8472a1e63f7284c522..be3577687b503ca22a64d9205dde1d971ceaa81b 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
@@ -136,49 +136,6 @@ static int i_APCI1032_ConfigDigitalInput(struct comedi_device *dev,
        return insn->n;
 }
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1032_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                |
-|                            unsigned int ui_Channel : Channel number 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_APCI1032_Read1DigitalInput(struct comedi_device *dev,
-                                       struct comedi_subdevice *s,
-                                       struct comedi_insn *insn,
-                                       unsigned int *data)
-{
-       unsigned int ui_TmpValue = 0;
-       unsigned int ui_Channel;
-       ui_Channel = CR_CHAN(insn->chanspec);
-
-       if (ui_Channel <= 31) {
-               ui_TmpValue = inl(dev->iobase + APCI1032_DI_REG);
-/*
-* since only 1 channel reqd to bring it to last bit it is rotated 8
-* +(chan - 1) times then ANDed with 1 for last bit.
-*/
-               *data = (ui_TmpValue >> ui_Channel) & 0x1;
-       }                       /* if(ui_Channel >= 0 && ui_Channel <=31) */
-       else {
-               /* comedi_error(dev," \n chan spec wrong\n"); */
-               return -EINVAL; /*  "sorry channel spec wrong " */
-       }                       /* else if(ui_Channel >= 0 && ui_Channel <=31) */
-       return insn->n;
-}
-
 /*
 +----------------------------------------------------------------------------+
 | Function   Name   : int i_APCI1032_ReadMoreDigitalInput                    |

diff --git a/drivers/staging/comedi/drivers/addi_apci_1032.c b/drivers/staging/comedi/drivers/addi_apci_1032.c
index 717e122ef94b10c8929b86a80300fb3782074632..77e78df65b897ea7c8e89a9888c42c920c0ddb6d 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -74,7 +74,6 @@ static int apci1032_attach_pci(struct comedi_device *dev,
        s->len_chanlist = 32;
        s->range_table  = &range_digital;
        s->insn_config  = i_APCI1032_ConfigDigitalInput;
-       s->insn_read    = i_APCI1032_Read1DigitalInput;
        s->insn_bits    = i_APCI1032_ReadMoreDigitalInput;
 
        /*  Allocate and Initialise DO Subdevice Structures */