staging: comedi: addi_apci_16xx: remove i_APCI16XX_Reset()

The 'reset' function for this driver doesn't do anything. Remove
it.

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_apci16xx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
index 5958a9cb2a38325435c6e0beea97300a085695d8..e5496019e610fea32804fe340e70f496086aa891 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
@@ -787,21 +787,3 @@ static int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device *dev,
 
        return i_ReturnValue;
 }
-
-/*
-+----------------------------------------------------------------------------+
-| Function   Name   : int i_APCI2200_Reset(struct comedi_device *dev)               |                                                         +----------------------------------------------------------------------------+
-| Task              :resets all the registers                                |
-+----------------------------------------------------------------------------+
-| Input Parameters  : struct comedi_device *dev                                     |
-+----------------------------------------------------------------------------+
-| Output Parameters : -                                                      |
-+----------------------------------------------------------------------------+
-| Return Value      : -                                                      |
-+----------------------------------------------------------------------------+
-*/
-
-static int i_APCI16XX_Reset(struct comedi_device *dev)
-{
-       return 0;
-}

diff --git a/drivers/staging/comedi/drivers/addi_apci_16xx.c b/drivers/staging/comedi/drivers/addi_apci_16xx.c
index 1af5921b773247bf87cc3e35f37d3699d6980438..e384d4c493e710f001312daab76c9e8ebae6e866 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_16xx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_16xx.c
@@ -17,7 +17,6 @@ static const struct addi_board apci16xx_boardtypes[] = {
                .i_IorangeBase0         = 128,
                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
                .i_NbrTTLChannel        = 48,
-               .reset                  = i_APCI16XX_Reset,
                .ttl_config             = i_APCI16XX_InsnConfigInitTTLIO,
                .ttl_bits               = i_APCI16XX_InsnBitsReadTTLIO,
                .ttl_read               = i_APCI16XX_InsnReadTTLIOAllPortValue,
@@ -29,7 +28,6 @@ static const struct addi_board apci16xx_boardtypes[] = {
                .i_IorangeBase0         = 128,
                .i_PCIEeprom            = ADDIDATA_NO_EEPROM,
                .i_NbrTTLChannel        = 96,
-               .reset                  = i_APCI16XX_Reset,
                .ttl_config             = i_APCI16XX_InsnConfigInitTTLIO,
                .ttl_bits               = i_APCI16XX_InsnBitsReadTTLIO,
                .ttl_read               = i_APCI16XX_InsnReadTTLIOAllPortValue,
@@ -46,14 +44,6 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
        return IRQ_RETVAL(1);
 }
 
-static int i_ADDI_Reset(struct comedi_device *dev)
-{
-       const struct addi_board *this_board = comedi_board(dev);
-
-       this_board->reset(dev);
-       return 0;
-}
-
 static const void *addi_find_boardinfo(struct comedi_device *dev,
                                       struct pci_dev *pcidev)
 {
@@ -187,7 +177,6 @@ static int apci16xx_auto_attach(struct comedi_device *dev,
        s = &dev->subdevices[6];
        s->type = COMEDI_SUBD_UNUSED;
 
-       i_ADDI_Reset(dev);
        return 0;
 }
 
@@ -197,8 +186,6 @@ static void apci16xx_detach(struct comedi_device *dev)
        struct addi_private *devpriv = dev->private;
 
        if (devpriv) {
-               if (dev->iobase)
-                       i_ADDI_Reset(dev);
                if (dev->irq)
                        free_irq(dev->irq, dev);
                if (devpriv->dw_AiBase)