staging: comedi: addi_apci_1516: remove i_APCI1516_ConfigDigitalOutput()

The digital outputs of the board supported by this driver are not
configurable. This driver abuses the comedi API and uses the 'insn_config'
function of the digital output subdevice to enable/disable writing to
the eeprom on the board. Remove this function.

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_apci1516.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
index d9edaaf8ccdc66ee7a98dc7b9eec512f431e1fb6..48e58a3154e37ea69c5829e83b4ca910b283746b 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
@@ -77,42 +77,6 @@ static int apci1516_di_insn_bits(struct comedi_device *dev,
        return insn->n;
 }
 
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI1516_ConfigDigitalOutput (struct comedi_device *dev,
-|                    struct comedi_subdevice *s struct comedi_insn *insn,unsigned int *data)    |
-|                                                                                   |
-+----------------------------------------------------------------------------+
-| Task              : Configures The Digital Output Subdevice.               |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev : Driver handle                     |
-|                     unsigned int *data         : Data Pointer contains         |
-|                                          configuration parameters as below |
-|                      struct comedi_subdevice *s,   :pointer to subdevice structure
-|                      struct comedi_insn *insn      :pointer to insn structure                                                           |
-|                                        data[0]  :1:Memory on                          |
-|                                                  0:Memory off                         |
-|                                                                                                           |
-|                                                                                                                                       |
-+----------------------------------------------------------------------------+
-| Output Parameters :  --                                                                                                       |
-+----------------------------------------------------------------------------+
-| Return Value      : TRUE  : No error occur                                 |
-|                          : FALSE : Error occur. Return the error          |
-|                                                                               |
-+----------------------------------------------------------------------------+
-*/
-static 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;
-}
-
 static int apci1516_do_insn_bits(struct comedi_device *dev,
                                 struct comedi_subdevice *s,
                                 struct comedi_insn *insn,

diff --git a/drivers/staging/comedi/drivers/addi_apci_1516.c b/drivers/staging/comedi/drivers/addi_apci_1516.c
index 395e99cd19313f3bc5bf0f488bab5520eb4cc76b..e5b8c11cb7b413f0520e476df0dc2ececa6b3e7b 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1516.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -23,7 +23,6 @@ static const struct addi_board apci1516_boardtypes[] = {
                .i_Timer                = 1,
                .reset                  = i_APCI1516_Reset,
                .di_bits                = apci1516_di_insn_bits,
-               .do_config              = i_APCI1516_ConfigDigitalOutput,
                .do_bits                = apci1516_do_insn_bits,
                .timer_config           = i_APCI1516_ConfigWatchdog,
                .timer_write            = i_APCI1516_StartStopWriteWatchdog,